# HG changeset patch # User mikaruus # Date 1287483380 -10800 # Node ID 8486d82aef45515b192623d76e52bb4f6cf65356 # Parent 6295dc2169f362a9d0fb22b149afe29a402a9ce3 modemadaptation release 2010wk40 diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/bcaiscadapter/bcatoisc_dll/group/bcatoisc.mmp --- a/adaptationlayer/bcaiscadapter/bcatoisc_dll/group/bcatoisc.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/bcaiscadapter/bcatoisc_dll/group/bcatoisc.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -26,6 +26,7 @@ UID 0x1000008D 0x102857A0 VENDORID VID_DEFAULT +FEATUREVARIANT SOURCEPATH ../src SOURCE bcatoisc.cpp SOURCE bcatoiscfactory.cpp @@ -39,7 +40,7 @@ LIBRARY euser.lib LIBRARY iscapi.lib LIBRARY commsdat.lib - +LIBRARY isimessage.lib // Do not add the non-callable exports to the DEF files // Remove this line temporarily if we need to add new exports diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/bcaiscadapter/bcatoisc_dll/inc/bcatoisc.h --- a/adaptationlayer/bcaiscadapter/bcatoisc_dll/inc/bcatoisc.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/bcaiscadapter/bcatoisc_dll/inc/bcatoisc.h Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-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" @@ -19,15 +19,16 @@ #ifndef BCATOISC_H #define BCATOISC_H + #include #include #include #include #include - - - +#include +const TUint8 KMaxChannelNbr = 11; +const TUint8 KNameLen = 4; /** * BCATOISC Panic code. @@ -61,6 +62,7 @@ CNotifyFlowControlMonitor(RIscApi& aIscApi); void NotifyFlowControlStatus(); void RequestFlowcontrolChange( TRequestStatus& aClientStatus ); + void CompleteFlowcontrolChangeWithCancel(); void RunL(); void DoCancel(); TInt GetFlowControlState(); @@ -82,7 +84,7 @@ CNotifyWriteStatusMonitor(CBcaToIsc& aUser, RIscApi& aIscApi); void Write( TRequestStatus& aStatus, const TDesC8& aBuf ); - void SendAndComplete(); + void SendAndComplete(TInt error); void RunL(); void DoCancel(); ~CNotifyWriteStatusMonitor(); @@ -100,10 +102,11 @@ /** * The interface between NIF and Isc Bearer Transport. */ - NONSHARABLE_CLASS(CBcaToIsc): public CBase, - public MBca // BCA is accessed via this interface by clients. + NONSHARABLE_CLASS(CBcaToIsc): + public CActive, + public MBca // BCA is accessed via this interface by clients. { - + public: CBcaToIsc(); @@ -125,21 +128,46 @@ virtual void Ioctl(TRequestStatus& aStatus, TUint aOptLevel, TUint aOptName, TDes8& aOpt); virtual void CancelIoctl(); - + + TInt SendNameAddReq( TUint16& aObjId, TUint16& aClientObjId ); + TInt SendNameRemoveReq(); + TInt SendPepCtrlResp( + TUint8 aTrId, + TUint8 aReceiverDev, + TUint8 aReceiverObj, + TUint8 aPipeHandle, + TUint8 aPepCtrlId, + TUint8 aPepType, + TUint8 aResult ); + void HandleReceivedMsg( const TIsiReceiveC& aIsiMsg ); + void HandleNameServiceMsg( const TIsiReceiveC& aIsiMsg ); + void HandlePipeMsg( const TIsiReceiveC& aIsiMsg ); + void HandlePepCtrlReq( const TIsiReceiveC& aIsiMsg ); // Ownership CNotifyWriteStatusMonitor* iWriteStatusMonitor; CNotifyFlowControlMonitor* iFlowControlMonitor; - + + protected: + + // from CActive + void RunL(); + void DoCancel(); private: RIscApi iIscApi; // no ownership TRequestStatus* iClientShutdownStatus; + TRequestStatus* iClientOpenStatus; + + HBufC8* iReceivedMessageBuffer; + TPtr8 iMessageBufferPtr; + TBuf8 iName; + TBuf16 iChannelList; + TUint16 iReadLength; TUint16 iChannelNumber; - }; } // namespace BasebandChannelAdaptation diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/bcaiscadapter/bcatoisc_dll/src/bcatoisc.cpp --- a/adaptationlayer/bcaiscadapter/bcatoisc_dll/src/bcatoisc.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/bcaiscadapter/bcatoisc_dll/src/bcatoisc.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-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" @@ -22,27 +22,59 @@ #include "iscdefinitions.h" #include +#include +#include +#include +#include +#include "pep_bca_types.h" + + +const TUint8 KDataLength = 7; +const TUint8 KStatusIndex = 0; +const TUint8 KDevIdIndex = 5; +const TUint8 KObjIdIndex = 6; +const TUint8 KPadding = 0; +const TUint KDefaultReceiveBufferSize = 2048; + using namespace BasebandChannelAdaptation; +/** +* Utility function to complete a pending request and NULL request pointer. +*/ + +static void CompleteRequest(TRequestStatus* &aReqStatus, const TInt aError) + { + if(( aReqStatus ) && + ( *aReqStatus == KRequestPending )) + { + // Only realy need to trace if we actually complete the request. + C_TRACE( (_T("CompleteRequest completing client request with aError %d ->"), aError ) ); + + //Complete clients request + User::RequestComplete( aReqStatus, aError ); + + aReqStatus = NULL; + } + } + /** * Default constructor to create a CNotifyFlowControlMonitor instance. */ CNotifyFlowControlMonitor::CNotifyFlowControlMonitor(RIscApi& aIscApi) - :CActive(EPriorityStandard), - iIscApi(aIscApi) + :CActive(EPriorityHigh), + iIscApi(aIscApi), + iWriteStatus(NULL) { - C_TRACE( (_T("CNotifyFlowControlMonitor::CNotifyFlowControlMonitor RIscAapi 0x%x ->"), &aIscApi ) ); - + C_TRACE( (_T("CNotifyFlowControlMonitor::CNotifyFlowControlMonitor RIscApi 0x%x ->"), &aIscApi ) ); CActiveScheduler::Add(this); - C_TRACE( (_T("CNotifyFlowControlMonitor::CNotifyFlowControlMonitor <-") ) ); } void CNotifyFlowControlMonitor::NotifyFlowControlStatus() { C_TRACE( (_T("CNotifyFlowControlMonitor::NotifyFlowControlStatus() ->") ) ); - + ASSERT(!IsActive()); iFlowControlValue = iIscApi.FlowControlStatus(); @@ -58,47 +90,54 @@ void CNotifyFlowControlMonitor::RequestFlowcontrolChange( TRequestStatus& aStatus ) { C_TRACE( (_T("CNotifyFlowControlMonitor::RequestFlowcontrolChange ->") ) ); - iWriteStatus = &aStatus; *iWriteStatus = KRequestPending; - - C_TRACE( (_T("CNotifyFlowControlMonitor::RequestFlowcontrolChange <-") ) ); } +void CNotifyFlowControlMonitor::CompleteFlowcontrolChangeWithCancel() + { + C_TRACE( (_T("CNotifyFlowControlMonitor::CompleteFlowcontrolChangeWithCancel() ->") ) ); + // If pending request, complete as cancelled + CompleteRequest(iWriteStatus, KErrCancel); + C_TRACE( (_T("CNotifyFlowControlMonitor::CompleteFlowcontrolChangeWithCancel() <-") ) ); + } + void CNotifyFlowControlMonitor::RunL() { C_TRACE( (_T("CNotifyFlowControlMonitor::RunL() iStatus %d ->"), iStatus.Int() ) ); - iFlowControlValue = iIscApi.FlowControlStatus(); + ASSERT( iStatus.Int() == KErrNone); - + iFlowControlValue = iIscApi.FlowControlStatus(); + C_TRACE( (_T("CNotifyFlowControlMonitor::RunL flow control Value has changed and is now: (%d)"), iFlowControlValue ) ); - if( *iWriteStatus == KRequestPending ) - { - User::RequestComplete(iWriteStatus, KErrNone); - } - - if( iStatus == KErrNone ) + if( iFlowControlValue == EIscFlowControlOff) { - //Check for further flow control status changes - iIscApi.NotifyFlowControl(iStatus, iFlowControlValue); - SetActive(); + // If pending request, complete it as flow control is now OFF + CompleteRequest(iWriteStatus,KErrNone); } - + + //Check for further flow control status changes + iIscApi.NotifyFlowControl(iStatus, iFlowControlValue); + SetActive(); C_TRACE( (_T("CNotifyFlowControlMonitor::RunL() <-") ) ); } TInt CNotifyFlowControlMonitor::GetFlowControlState() { + C_TRACE( (_T("CNotifyFlowControlMonitor::GetFlowControlState() flowcontrol value %d <->"), iFlowControlValue ) ); return iFlowControlValue; } void CNotifyFlowControlMonitor::DoCancel() { C_TRACE( (_T("CNotifyFlowControlMonitor::DoCancel() ->") ) ); - + // If pending request, complete it as cancelled + CompleteRequest(iWriteStatus, KErrCancel); + C_TRACE( (_T("CNotifyFlowControlMonitor::DoCancel() req is completed") ) ); + iIscApi.NotifyFlowControlCancel(); C_TRACE( (_T("CNotifyFlowControlMonitor::DoCancel() <-") ) ); @@ -109,18 +148,17 @@ C_TRACE( (_T("CNotifyFlowControlMonitor::~CNotifyFlowControlMonitor() ->") ) ); Cancel(); - + C_TRACE( (_T("CNotifyFlowControlMonitor::~CNotifyFlowControlMonitor() <-") ) ); } CNotifyWriteStatusMonitor::CNotifyWriteStatusMonitor( CBcaToIsc& aUser, RIscApi& aIscApi ) - :CActive(EPriorityHigh), + :CActive(EPriorityStandard), iUser(aUser), iIscApi(aIscApi) { C_TRACE( (_T("CNotifyWriteStatusMonitor::CNotifyWriteStatusMonitor ->") ) ); - // iBuf = new TPtr8( NULL, 0, 0 ); CActiveScheduler::Add(this); C_TRACE( (_T("CNotifyWriteStatusMonitor::CNotifyWriteStatusMonitor <-") ) ); } @@ -128,44 +166,48 @@ void CNotifyWriteStatusMonitor::Write( TRequestStatus& aStatus, const TDesC8& aBuf ) { - + C_TRACE( (_T("CNotifyWriteStatusMonitor::Write ->") ) ); iBuf = &aBuf; iClientStatus = &aStatus; *iClientStatus = KRequestPending; if( iUser.iFlowControlMonitor->GetFlowControlState() == EIscFlowControlOff ) { - //iIscApi.DataSend( aStatus, aBuf ); - SendAndComplete(); + SendAndComplete(KErrNone); } else //flow control on { - - //iBuf = &aBuf; - // iBuf->Set( const_cast(aBuf.Ptr()), aBuf.Length(), aBuf.Length() ); - // iClientStatus = &aStatus; - // *iClientStatus = KRequestPending; iUser.iFlowControlMonitor->RequestFlowcontrolChange( iStatus ); SetActive(); } - + C_TRACE( (_T("CNotifyWriteStatusMonitor::Write <-") ) ); } + void CNotifyWriteStatusMonitor::RunL() - { - C_TRACE( (_T("CNotifyWriteStatusMonitor::RunL() iStatus %d ->"), iStatus.Int() ) ); - - SendAndComplete(); - //iIscApi.DataSend( *iClientStatus, *iBuf ); + { + C_TRACE( (_T("CNotifyWriteStatusMonitor::RunL() iStatus %d ->"), iStatus.Int() ) ); +// KARI ei kutsu IASC apin data sendiä jos erksa OK? + SendAndComplete(iStatus.Int()); C_TRACE( (_T("CNotifyWriteStatusMonitor::RunL() <-") ) ); } -void CNotifyWriteStatusMonitor::SendAndComplete() +void CNotifyWriteStatusMonitor::SendAndComplete(TInt aError) { - TInt error = KErrGeneral; + C_TRACE( (_T("CNotifyWriteStatusMonitor::SendAndComplete() ->"))); - error = iIscApi.DataSend( *iBuf ); - User::RequestComplete(iClientStatus, error); + // We may have had the request cancelled, in which case do not send the write data + if (aError == KErrNone) + { + C_TRACE( (_T("CNotifyWriteStatusMonitor::SendAndComplete() iIscApi.DataSend "))); + aError = iIscApi.DataSend( *iBuf ); + } + + // If pending request, complete it as specified by the error status + // This could be OK or canncelled + CompleteRequest(iClientStatus, aError); + + C_TRACE( (_T("CNotifyWriteStatusMonitor::SendAndComplete() <-") ) ); } @@ -173,12 +215,10 @@ { C_TRACE( (_T("CNotifyWriteStatusMonitor::DoCancel() ->") ) ); - if( *iClientStatus == KRequestPending ) - { - C_TRACE( (_T("CNotifyWriteStatusMonitor::DoCancel completing client request with KErrCancel ->") ) ); - //Complete clients request - User::RequestComplete( iClientStatus, KErrCancel ); - } + iUser.iFlowControlMonitor->CompleteFlowcontrolChangeWithCancel(); + + // If pending request, complete it as cancelled + CompleteRequest(iClientStatus, KErrCancel); C_TRACE( (_T("CNotifyWriteStatusMonitor::DoCancel() <-") ) ); } @@ -198,7 +238,11 @@ /** * Default constructor to create a CBcaToIsc instance. */ -CBcaToIsc::CBcaToIsc() : iReadLength(0), iChannelNumber( 0xffff ) +CBcaToIsc::CBcaToIsc() : + CActive( EPriorityStandard ), + iMessageBufferPtr( 0,0 ), + iReadLength(0), + iChannelNumber( 0xffff ) { C_TRACE( (_T("CBcaToIsc::CBcaToIsc() ->") ) ); @@ -216,6 +260,14 @@ __ASSERT_DEBUG(!iWriteStatusMonitor, User::Panic(_L("BcaToIsc.dll"), EMonitorAlreadyExists)); iFlowControlMonitor = new (ELeave)CNotifyFlowControlMonitor(iIscApi); iWriteStatusMonitor = new (ELeave)CNotifyWriteStatusMonitor(*this, iIscApi); + iReceivedMessageBuffer = HBufC8::NewL(KDefaultReceiveBufferSize); + iMessageBufferPtr.Set( iReceivedMessageBuffer->Des() ); + iMessageBufferPtr.FillZ(); + iChannelList.Append( EIscNokiaNifPep5 ); + iChannelList.Append( EIscNokiaNifPep6 ); + iChannelList.Append( EIscNokiaNifPep7 ); + iChannelList.Append( EIscNokiaNifPep8 ); + CActiveScheduler::Add( this ); C_TRACE( (_T("CBcaToIsc::ConstructL() this 0x%x <-"), this ) ); } @@ -236,11 +288,18 @@ { delete iWriteStatusMonitor; } + + if( iReceivedMessageBuffer ) + { + delete iReceivedMessageBuffer; + } + iClientShutdownStatus = NULL; + iClientOpenStatus = NULL; C_TRACE( (_T("CBcaToIsc::~CBcaToIsc() <-") ) ); } - +// remove loan / returnloan deadcode from lower layers /** This method deletes the BCA itself.*/ void CBcaToIsc::Release() { @@ -257,11 +316,14 @@ * @param aStatus complete status, KErrNone if successful, error code otherwise. * @param aChannelId comm port name. -*/ +*/ void CBcaToIsc::Open(TRequestStatus& aStatus, const TDesC& aChannelId) { C_TRACE( (_T("CBcaToIsc::Open aStatus %d aChannelId descriptor %S ->"), aStatus.Int(), &aChannelId ) ); + iClientOpenStatus = &aStatus; + *iClientOpenStatus = KRequestPending; + // Expected form either Int_ (i.e. 100Int_3) or Int!!! TUint16 channelid( 0xffff ); TInt error( KErrGeneral ); @@ -282,16 +344,56 @@ error = channelParser.Val(channelid, EDecimal); } ASSERT( KErrNone == error ); + C_TRACE( (_T("CBcaToIsc::Open parsed channel id: 0x%x"), channelid ) ); if( error == KErrNone ) { - error = iIscApi.Loan( channelid ); - iChannelNumber = error == KErrNone ? channelid : iChannelNumber; + TInt index( 0 ); + TBool channelOpened( EFalse ); + TRequestStatus status( KRequestPending ); + for( index = 0; index < iChannelList.Length(); index++ ) + { + status = KRequestPending; + iIscApi.Open( iChannelList[index], status, EOwnerThread ); + User::WaitForRequest( status ); + if( KErrNone == status.Int() ) + { + C_TRACE( (_T("CBcaToIsc::Open channel 0x%x opened"), iChannelList[index] ) ); + channelOpened = ETrue; + break; + } + } + + if( !channelOpened ) + { + C_TRACE( (_T("CBcaToIsc::Open channel opening failed") ) ); + User::RequestComplete( iClientOpenStatus, KErrGeneral ); + iClientOpenStatus = NULL; + } + else if( KErrNone == SendNameAddReq( iChannelList[index], channelid ) ) + { + iFlowControlMonitor->NotifyFlowControlStatus(); + iChannelNumber = status.Int() == KErrNone ? iChannelList[index] : iChannelNumber; + + iMessageBufferPtr.SetLength( 0 ); + iStatus = KRequestPending; + iIscApi.Receive( iStatus, iMessageBufferPtr, iReadLength ); + SetActive(); + } + else + { + C_TRACE( (_T("CBcaToIsc::Open sending of PNS_NAME_ADD_REQ failed") ) ); + iIscApi.Close(); + User::RequestComplete( iClientOpenStatus, KErrGeneral ); + iClientOpenStatus = NULL; + } } - ASSERT( KErrNone == error ); - TRequestStatus* request = &aStatus; - User::RequestComplete( request, error ); + else + { + User::RequestComplete( iClientOpenStatus, error ); + iClientOpenStatus = NULL; + } + C_TRACE( (_T("CBcaToIsc::Open <-") ) ); - } /** @@ -309,10 +411,23 @@ iWriteStatusMonitor->Cancel(); iFlowControlMonitor->Cancel(); iIscApi.DataReceiveCancel(); - iIscApi.ReturnLoan( iChannelNumber ); - User::RequestComplete(iClientShutdownStatus, KErrNone); + + if( KErrNone == SendNameRemoveReq() ) + { + iMessageBufferPtr.SetLength( 0 ); + iStatus = KRequestPending; + iIscApi.Receive( iStatus, iMessageBufferPtr, iReadLength ); + SetActive(); + } + else + { + C_TRACE( (_T("CBcaToIsc::Shutdown sending of PNS_NAME_REMOVE_REQ failed") ) ); + iIscApi.Close(); + User::RequestComplete(iClientShutdownStatus, KErrGeneral); + iClientShutdownStatus = NULL; + } + C_TRACE( (_T("CBcaToIsc::Shutdown <-") ) ); - } /** @@ -337,7 +452,8 @@ C_TRACE( (_T("CBcaToIsc::Close() iChannelNumber=0x%x 4"), iChannelNumber ) ); iIscApi.DataSendCancel(); C_TRACE( (_T("CBcaToIsc::Close() iChannelNumber=0x%x 5"), iChannelNumber ) ); - iIscApi.ReturnLoan( iChannelNumber ); + + iIscApi.Close(); C_TRACE( (_T("CBcaToIsc::Close() <-") ) ); @@ -369,10 +485,9 @@ void CBcaToIsc::Write( TRequestStatus& aStatus, const TDesC8& aBuf ) { C_TRACE( (_T("CBcaToIsc::Write aStatus %d aBuf %S ->"), aStatus.Int(), &aBuf ) ); - //write requesti pitää jäädä odottamaan jos flow controlli päälä. - - iWriteStatusMonitor->Write(aStatus, aBuf); - + + iWriteStatusMonitor->Write(aStatus, aBuf); + C_TRACE( (_T("CBcaToIsc::Write <-") ) ); } @@ -433,3 +548,407 @@ } +/** +* Sends PNS_NAME_ADD_REQ + +* @param aObjId object id for the name to be added +* @return KErrNone if message sent succesfully, otherwise error code +*/ +TInt CBcaToIsc::SendNameAddReq( TUint16& aObjId, TUint16& aClientObjId ) + { + C_TRACE( (_T("CBcaToIsc::SendNameAddReq() ->") ) ); + + HBufC8* message = HBufC8::New( ISI_HEADER_SIZE + SIZE_PNS_NAME_ADD_REQ ); + TInt err( KErrGeneral ); + + if( message ) + { + TPtr8 messageptr = message->Des(); + messageptr.FillZ(); + + // Add 32bit name (Big-endian) + iName.Append( aClientObjId ); + iName.Append( PN_PEP_SUB_TYPE_SYMBIAN_INTERNAL ); + iName.Append( PN_PEP_TYPE_COMMON ); + iName.Append( PN_PIPE ); + TUint8 nameOffset( ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY ); + + TIsiSend isimessage( messageptr, ISI_HEADER_SIZE + SIZE_PNS_NAME_ADD_REQ ); + isimessage.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_NAMESERVICE ); + isimessage.Set8bit( ISI_HEADER_OFFSET_TRANSID, 0 ); + isimessage.Set8bit( ISI_HEADER_OFFSET_MESSAGEID, PNS_NAME_ADD_REQ ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_RESERVED1, KPadding ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_RESERVED2, KPadding ); + isimessage.Set8bit( nameOffset, iName[0] ); + isimessage.Set8bit( nameOffset + 1, iName[1] ); + isimessage.Set8bit( nameOffset + 2, iName[2] ); + isimessage.Set8bit( nameOffset + 3, iName[3] ); + isimessage.Set8bit( nameOffset + PN_NAME_SRV_ITEM_STR_OFFSET_DEV, THIS_DEVICE ); + isimessage.Set8bit( nameOffset + PN_NAME_SRV_ITEM_STR_OFFSET_OBJ, aObjId ); + isimessage.Set8bit( nameOffset + PN_NAME_SRV_ITEM_STR_OFFSET_FLAGS, PN_NAME_UNDEF ); + isimessage.Set8bit( nameOffset + PN_NAME_SRV_ITEM_STR_OFFSET_RESERVED, KPadding ); + isimessage.Complete(); + + err = iIscApi.Send( messageptr ); + C_TRACE( (_T("CBcaToIsc::SendNameAddReq() success: 0x%x"), err ) ); + delete message; + } + else + { + C_TRACE( (_T("CBcaToIsc::SendNameAddReq() memory allocation failed") ) ); + ASSERT(0); + } + + C_TRACE( (_T("CBcaToIsc::SendNameAddReq() <-") ) ); + return err; + } + +/** +* Sends PNS_NAME_REMOVE_REQ + +* @return KErrNone if message sent succesfully, otherwise error code +*/ +TInt CBcaToIsc::SendNameRemoveReq() + { + C_TRACE( (_T("CBcaToIsc::SendNameRemoveReq() ->") ) ); + + HBufC8* message = HBufC8::New( ISI_HEADER_SIZE + SIZE_PNS_NAME_REMOVE_REQ ); + TInt err( KErrGeneral ); + if( message ) + { + TPtr8 messageptr = message->Des(); + messageptr.FillZ(); + TUint8 nameOffset( ISI_HEADER_SIZE + PNS_NAME_REMOVE_REQ_OFFSET_NAME ); + + TIsiSend isimessage( messageptr, ISI_HEADER_SIZE + SIZE_PNS_NAME_REMOVE_REQ ); + isimessage.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_NAMESERVICE ); + isimessage.Set8bit( ISI_HEADER_OFFSET_TRANSID , 0 ); + isimessage.Set8bit( ISI_HEADER_OFFSET_MESSAGEID, PNS_NAME_REMOVE_REQ ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_NAME_REMOVE_REQ_OFFSET_RESERVED1, KPadding ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_NAME_REMOVE_REQ_OFFSET_RESERVED2, KPadding ); + isimessage.Set8bit( nameOffset, iName[0] ); + isimessage.Set8bit( nameOffset + 1, iName[1] ); + isimessage.Set8bit( nameOffset + 2, iName[2] ); + isimessage.Set8bit( nameOffset + 3, iName[3] ); + isimessage.Complete(); + err = iIscApi.Send( messageptr ); + C_TRACE( (_T("CBcaToIsc::SendNameRemoveReq() success: 0x%x"), err ) ); + delete message; + } + else + { + C_TRACE( (_T("CBcaToIsc::SendNameRemoveReq() memory allocation failed") ) ); + ASSERT(0); + } + + C_TRACE( (_T("CBcaToIsc::SendNameRemoveReq() <-") ) ); + return err; + } + +/** +* Sends PNS_PEP_CTRL_RESP + +* @return KErrNone if message sent succesfully, otherwise error code +*/ +TInt CBcaToIsc::SendPepCtrlResp( + TUint8 aTrId, + TUint8 aReceiverDev, + TUint8 aReceiverObj, + TUint8 aPipeHandle, + TUint8 aPepCtrlId, + TUint8 aPepType, + TUint8 aResult ) + { + C_TRACE( (_T("CBcaToIsc::SendPepCtrlResp() ->") ) ); + + HBufC8* message = HBufC8::New( ISI_HEADER_SIZE + SIZE_PNS_PEP_CTRL_RESP ); + TInt err( KErrGeneral ); + + if( message ) + { + TPtr8 messageptr = message->Des(); + messageptr.FillZ(); + + TIsiSend isimessage( messageptr, ISI_HEADER_SIZE + SIZE_PNS_PEP_CTRL_RESP ); + isimessage.Set8bit( ISI_HEADER_OFFSET_RECEIVERDEVICE, aReceiverDev); + isimessage.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_PIPE); + isimessage.Set8bit( ISI_HEADER_OFFSET_RECEIVEROBJECT, aReceiverObj); + isimessage.Set8bit( ISI_HEADER_OFFSET_TRANSID , aTrId); + isimessage.Set8bit( ISI_HEADER_OFFSET_MESSAGEID, PNS_PEP_CTRL_RESP ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_RESP_OFFSET_PIPEHANDLE, aPipeHandle ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_RESP_OFFSET_PEPCTRLID, aPepCtrlId ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_RESP_OFFSET_PEPTYPE, aPepType ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_RESP_OFFSET_ERRORCODE, aResult ); + isimessage.Complete(); + err = iIscApi.Send( messageptr ); + C_TRACE( (_T("CBcaToIsc::SendPepCtrlResp() success: 0x%x"), err ) ); + delete message; + } + else + { + C_TRACE( (_T("CBcaToIsc::SendPepCtrlResp() memory allocation failed") ) ); + ASSERT(0); + } + + C_TRACE( (_T("CBcaToIsc::SendPepCtrlResp() <-") ) ); + return err; + } + +/** +* Handles received messages + +* @param aObjId object id for the name to be added +* @return KErrNone if message sent succesfully, otherwise error code +*/ +void CBcaToIsc::RunL() + { + C_TRACE( (_T("CBcaToIsc::RunL() ->") ) ); + + if ( KErrNone == iStatus.Int() ) + { + HandleReceivedMsg( TIsiReceiveC( iMessageBufferPtr ) ); + } + else + { + C_TRACE( (_T("CBcaToIsc::RunL() error occured: 0x%x"), iStatus.Int() ) ); + ASSERT(0); + } + + C_TRACE( (_T("CBcaToIsc::RunL() <-") ) ); + } + +/** +* Handles cancel operation for this active object + +*/ +void CBcaToIsc::DoCancel() + { + C_TRACE( (_T("CBcaToIsc::DoCancel() ->") ) ); + iIscApi.ReceiveCancel(); + C_TRACE( (_T("CBcaToIsc::DoCancel() <-") ) ); + } + +/** +* Handles received message + +*/ +void CBcaToIsc::HandleReceivedMsg( const TIsiReceiveC& aIsiMsg ) + { + C_TRACE( (_T("CBcaToIsc::HandleReceivedMsg() ->") ) ); + + TInt resource( aIsiMsg.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) ); + + switch( resource ) + { + case PN_NAMESERVICE: + { + HandleNameServiceMsg( aIsiMsg ); + break; + } + case PN_PIPE: + { + HandlePipeMsg( aIsiMsg ); + break; + } + default: + { + C_TRACE( (_T("CBcaToIsc::HandleReceivedMsg() unknown resource 0x%x"), resource ) ); + ASSERT(0); + break; + } + } + + C_TRACE( (_T("CBcaToIsc::HandleReceivedMsg() <-") ) ); + } + +/** +* Handles received messages from resource PN_NAME + +*/ +void CBcaToIsc::HandleNameServiceMsg( const TIsiReceiveC& aIsiMsg ) + { + C_TRACE( (_T("CBcaToIsc::HandleNameServiceMsg() ->") ) ); + + TInt msgId( aIsiMsg.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); + switch( msgId ) + { + case PNS_NAME_ADD_RESP: + { + C_TRACE( (_T("CBcaToIsc::HandleNameServiceMsg() PNS_NAME_ADD_RESP") ) ); + TUint8 reason( aIsiMsg.Get8bit( + ISI_HEADER_SIZE + PNS_NAME_ADD_RESP_OFFSET_REASON ) ); + if( PN_NAME_OK != reason ) + { + C_TRACE( (_T("CBcaToIsc::HandleNameServiceMsg() Name adding failed: 0x%x"), reason ) ); + if( iClientOpenStatus ) + { + C_TRACE( (_T("CBcaToIsc::HandleNameServiceMsg() completing open") ) ); + User::RequestComplete( iClientOpenStatus, KErrGeneral ); + iClientOpenStatus = NULL; + iIscApi.Close(); + } + // no else + } + else + { + C_TRACE( (_T("CBcaToIsc::HandleNameServiceMsg() Name added succesfully") ) ); + iMessageBufferPtr.SetLength( 0 ); + iStatus = KRequestPending; + iIscApi.Receive( iStatus, iMessageBufferPtr, iReadLength ); + SetActive(); + } + break; + } + case PNS_NAME_REMOVE_RESP: + { + C_TRACE( (_T("CBcaToIsc::HandleNameServiceMsg() PNS_NAME_REMOVE_RESP") ) ); + TUint8 reason( aIsiMsg.Get8bit( + ISI_HEADER_SIZE + PNS_NAME_ADD_RESP_OFFSET_REASON ) ); + if( PN_NAME_OK != reason ) + { + C_TRACE( (_T("CBcaToIsc::HandleNameServiceMsg() Name removing failed: 0x%x"), reason ) ); + ASSERT(0); + if( iClientShutdownStatus ) + { + C_TRACE( (_T("CBcaToIsc::HandleNameServiceMsg() completing shutdown") ) ); + User::RequestComplete(iClientShutdownStatus, KErrGeneral ); + iClientShutdownStatus = NULL; + } + } + else + { + C_TRACE( (_T("CBcaToIsc::HandleNameServiceMsg() Name removed succesfully") ) ); + iName.Zero(); + iMessageBufferPtr.SetLength( 0 ); + iStatus = KRequestPending; + iIscApi.Receive( iStatus, iMessageBufferPtr, iReadLength ); + SetActive(); + } + break; + } + default: + { + C_TRACE( (_T("CBcaToIsc::HandleNameServiceMsg() unknown msg 0x%x"), msgId ) ); + break; + } + } + + C_TRACE( (_T("CBcaToIsc::HandleNameServiceMsg() <-") ) ); + } + +/** +* Handles received messages from resource PN_PIPE + +*/ +void CBcaToIsc::HandlePipeMsg( const TIsiReceiveC& aIsiMsg ) + { + C_TRACE( (_T("CBcaToIsc::HandlePipeMsg() ->") ) ); + + TInt msgId( aIsiMsg.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); + switch( msgId ) + { + case PNS_PEP_CTRL_REQ: + { + C_TRACE( (_T("CBcaToIsc::HandlePipeMsg() PNS_PEP_CTRL_REQ") ) ); + HandlePepCtrlReq( aIsiMsg ); + break; + } + default: + { + C_TRACE( (_T("CBcaToIsc::HandlePipeMsg() unknown msg 0x%x"), msgId ) ); + ASSERT(0); + break; + } + } + + C_TRACE( (_T("CBcaToIsc::HandlePipeMsg() <-") ) ); + } + +/** +* Handles PNS_PEP_CTRL_REQ + +*/ +void CBcaToIsc::HandlePepCtrlReq( const TIsiReceiveC& aIsiMsg ) + { + C_TRACE( (_T("CBcaToIsc::HandlePepCtrlReq() ->") ) ); + + TUint8 pipeHandle( aIsiMsg.Get8bit( + ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PIPEHANDLE ) ); + TUint8 pepCtrlId( aIsiMsg.Get8bit( + ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPCTRLID ) ); + TUint8 pepType( aIsiMsg.Get8bit( + ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPTYPE ) ); + TUint8 result( PN_PIPE_ERR_NOT_SUPPORTED ); + + TUint8 trId( aIsiMsg.Get8bit( + ISI_HEADER_OFFSET_TRANSID ) ); + // Get sender device + TUint8 senderDevice( aIsiMsg.Get8bit( + ISI_HEADER_OFFSET_SENDERDEVICE ) ); + // Get sender object + TUint8 senderObject( aIsiMsg.Get8bit( + ISI_HEADER_OFFSET_SENDEROBJECT ) ); + + C_TRACE( (_T("CBcaToIsc::HandlePepCtrlReq() pipe handle: 0x%x"), pipeHandle ) ); + C_TRACE( (_T("CBcaToIsc::HandlePepCtrlReq() pep ctrl id: 0x%x"), pepCtrlId ) ); + C_TRACE( (_T("CBcaToIsc::HandlePepCtrlReq() pep type: 0x%x"), pepType ) ); + + TBuf8 data( aIsiMsg.GetData( + ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPCTRLDATA, + KDataLength ) ); + + TUint8 devId( data[KDevIdIndex] ); + TUint8 objId( data[KObjIdIndex] ); + C_TRACE( (_T("CBcaToIsc::HandlePepCtrlReq() dev id: 0x%x"), devId ) ); + C_TRACE( (_T("CBcaToIsc::HandlePepCtrlReq() obj id: 0x%x"), objId ) ); + C_TRACE( (_T("CBcaToIsc::HandlePepCtrlReq() iChannelNumber: 0x%x"), iChannelNumber ) ); + + if( PN_PEP_TYPE_BCA == pepType && + THIS_DEVICE == devId && + iChannelNumber == objId ) + { + C_TRACE( (_T("CBcaToIsc::HandlePepCtrlReq() PNS_PEP_CTRL_REQ for this PEP") ) ); + result = PN_PIPE_NO_ERROR; + TInt ret( KErrNone ); + + if( PEP_BCA_OK != data[KStatusIndex] ) + { + C_TRACE( (_T("CBcaToIsc::HandlePepCtrlReq() PNS_PEP_CTRL_REQ with error 0x%x"), data[KStatusIndex] ) ); + ret = KErrGeneral; + } + + if( PEP_CTRL_ID_LOAN == pepCtrlId ) + { + C_TRACE( (_T("CBcaToIsc::HandlePepCtrlReq() ctrl id PEP_CTRL_ID_LOAN") ) ); + if( iClientOpenStatus ) + { + C_TRACE( (_T("CBcaToIsc::HandlePepCtrlReq() completing open") ) ); + User::RequestComplete( iClientOpenStatus, ret ); + iClientOpenStatus = NULL; + } + } + else if( PEP_CTRL_ID_RETURNLOAN == pepCtrlId ) + { + C_TRACE( (_T("CBcaToIsc::HandlePepCtrlReq() ctrl id PEP_CTRL_ID_RETURNLOAN") ) ); + if( iClientShutdownStatus ) + { + C_TRACE( (_T("CBcaToIsc::HandlePepCtrlReq() completing shutdown") ) ); + User::RequestComplete(iClientShutdownStatus, ret); + iClientShutdownStatus = NULL; + } + } + } + + SendPepCtrlResp( + trId, + senderDevice, + senderObject, + pipeHandle, + pepCtrlId, + pepType, + result ); + + C_TRACE( (_T("CBcaToIsc::HandlePepCtrlReq() <-") ) ); + } + + diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/bcaiscadapter/group/bld.inf --- a/adaptationlayer/bcaiscadapter/group/bld.inf Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/bcaiscadapter/group/bld.inf Tue Oct 19 13:16:20 2010 +0300 @@ -25,6 +25,7 @@ PRJ_EXPORTS ../rom/bcaiscadapter.iby NON_FOUNDATION_CORE_ADAPT_LAYER_IBY_EXPORT_PATH(bcaiscadapter.iby) +../bcatoisc_dll/inc/pep_bca_types.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(pep_bca_types.h) PRJ_MMPFILES ../bcatoisc_dll/group/bcatoisc.mmp diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/dataport/dataport_csy/group/dataport_csy.mmp --- a/adaptationlayer/dataport/dataport_csy/group/dataport_csy.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/dataport/dataport_csy/group/dataport_csy.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -28,9 +28,15 @@ VENDORID VID_DEFAULT +SMPSAFE + // inhibit generation of dataport.lib NOEXPORTLIBRARY + +macro PIPECAMP_DATAPORT_PNS_PEP_STATUS_IND_PHONET_ADDRESS_FROM_PNS_PEP_CTRL_REQ // 20100523_1300 + + SOURCEPATH ../src SOURCE dpdataport.cpp diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/dataport/dataport_csy/group/dataportlib_csy.mmp --- a/adaptationlayer/dataport/dataport_csy/group/dataportlib_csy.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/dataport/dataport_csy/group/dataportlib_csy.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -30,4 +30,5 @@ VENDORID VID_DEFAULT CAPABILITY ALL -Tcb +SMPSAFE diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/dataport/dataport_csy/inc/dppif.h --- a/adaptationlayer/dataport/dataport_csy/inc/dppif.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/dataport/dataport_csy/inc/dppif.h Tue Oct 19 13:16:20 2010 +0300 @@ -98,6 +98,15 @@ */ inline void SetPipeState( const TDpPipeState aPipeState ); +#ifdef PIPECAMP_DATAPORT_PNS_PEP_STATUS_IND_PHONET_ADDRESS_FROM_PNS_PEP_CTRL_REQ // 20100523_1300 + inline void SetPipeControllerDeviceIdentifier( const TUint8 aDeviceId ); + + inline void SetPipeControllerObjectIdentifier( const TUint8 aObjectId ); + + inline TUint8 GetPipeControllerDeviceIdentifier(); + + inline TUint8 GetPipeControllerObjectIdentifier(); +#endif /** * This method registers DataPort to Name Service. * @param aUnit: Port unit number @@ -169,7 +178,10 @@ // Pipe handle TUint8 iPipeHandle; - +#ifdef PIPECAMP_DATAPORT_PNS_PEP_STATUS_IND_PHONET_ADDRESS_FROM_PNS_PEP_CTRL_REQ // 20100523_1300 + TUint8 iPipeControllerDevId; + TUint8 iPipeControllerObjId; +#endif // PIF state TDpPifState iPifState; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/dataport/dataport_csy/inc/dppif.inl --- a/adaptationlayer/dataport/dataport_csy/inc/dppif.inl Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/dataport/dataport_csy/inc/dppif.inl Tue Oct 19 13:16:20 2010 +0300 @@ -48,6 +48,29 @@ iPipeHandle = aPipeHandle; } +#ifdef PIPECAMP_DATAPORT_PNS_PEP_STATUS_IND_PHONET_ADDRESS_FROM_PNS_PEP_CTRL_REQ // 20100523_1300 +inline void CDpPif::SetPipeControllerDeviceIdentifier( + const TUint8 aDeviceId ) + { + iPipeControllerDevId = aDeviceId; + } + +inline void CDpPif::SetPipeControllerObjectIdentifier( + const TUint8 aObjectId ) + { + iPipeControllerObjId = aObjectId; + } + +inline TUint8 CDpPif::GetPipeControllerDeviceIdentifier() + { + return iPipeControllerDevId; + } + +inline TUint8 CDpPif::GetPipeControllerObjectIdentifier() + { + return iPipeControllerObjId; + } +#endif // --------------------------------------------------------- // CDpPif::SetPipeState // This method sets pipe state. diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/dataport/dataport_csy/src/dpbreak.cpp --- a/adaptationlayer/dataport/dataport_csy/src/dpbreak.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/dataport/dataport_csy/src/dpbreak.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -191,6 +191,10 @@ TInt ret = #endif iDataPort.Mif().SendMessage( +#ifdef PIPECAMP_DATAPORT_PNS_PEP_STATUS_IND_PHONET_ADDRESS_FROM_PNS_PEP_CTRL_REQ // 20100523_1300 + iDataPort.Pif().GetPipeControllerDeviceIdentifier(), + iDataPort.Pif().GetPipeControllerObjectIdentifier(), +#endif PN_PIPE, iDataPort.CreateTransactionId(), PNS_PEP_STATUS_IND, diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/dataport/dataport_csy/src/dpdataconfig.cpp --- a/adaptationlayer/dataport/dataport_csy/src/dpdataconfig.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/dataport/dataport_csy/src/dpdataconfig.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -427,6 +427,10 @@ // Send messages TInt result = iDataPort.Mif().SendMessage( +#ifdef PIPECAMP_DATAPORT_PNS_PEP_STATUS_IND_PHONET_ADDRESS_FROM_PNS_PEP_CTRL_REQ // 20100523_1300 + iDataPort.Pif().GetPipeControllerDeviceIdentifier(), + iDataPort.Pif().GetPipeControllerObjectIdentifier(), +#endif PN_PIPE, iDataPort.CreateTransactionId(), PNS_PEP_STATUS_IND, @@ -694,6 +698,43 @@ noSignalChanged = ETrue; } } + else if ( PEP_COMM_SIGNAL_DSR_ON == pepParam.new_state ) + { + LOG(" PEP_COMM_SIGNAL_DSR_ON"); + OstTrace0( TRACE_NORMAL, DUP7_CDPDATACONFIG_MAPSIGNALSCMT2EPOC, "CDpDataConfig:: PEP_COMM_SIGNAL_DSR_ON" ); + + if ( ( signalsC32 & KSignalDSR ) != KSignalDSR ) + { + LOG("DSR_ON"); + OstTrace0( TRACE_NORMAL, DUP8_CDPDATACONFIG_MAPSIGNALSCMT2EPOC, "CDpDataConfig:: DSR_ON" ); + + signalsC32 |= KSignalDSR | KDSRChanged; + } + else + { + // No signals has changed + noSignalChanged = ETrue; + } + } + else if ( PEP_COMM_SIGNAL_DSR_OFF == pepParam.new_state ) + { + LOG(" PEP_COMM_SIGNAL_DSR_OFF"); + OstTrace0( TRACE_NORMAL, DUP9_CDPDATACONFIG_MAPSIGNALSCMT2EPOC, "CDpDataConfig:: PEP_COMM_SIGNAL_DSR_OFF" ); + + if ( ( signalsC32 & KSignalDSR ) == KSignalDSR ) + { + LOG("DSR_OFF"); + OstTrace0( TRACE_NORMAL, DUP10_CDPDATACONFIG_MAPSIGNALSCMT2EPOC, "CDpDataConfig:: DSR_OFF" ); + + signalsC32 &= ~KSignalDSR; + signalsC32 |= KDSRChanged; + } + else + { + // No signals has changed + noSignalChanged = ETrue; + } + } else { // No signals has changed diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/dataport/dataport_csy/src/dpdataport.cpp --- a/adaptationlayer/dataport/dataport_csy/src/dpdataport.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/dataport/dataport_csy/src/dpdataport.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1967,19 +1967,19 @@ #ifdef USE_FILE_DEBUG - OstTrace0( TRACE_DETAILED, DUP1_CDPDATAPORT_WRITESTATELOG, "CDpDataPort:: --- DATA LOG: ----------------------------------------------" ); - OstTraceExt2( TRACE_DETAILED, DUP2_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugDteWrites= %d iDebugBytesFromDte= %d", iDebugDteWrites, iDebugBytesFromDte ); - OstTraceExt2( TRACE_DETAILED, DUP3_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugDteReads= %d iDebugBytesToDte= %d", iDebugDteReads, iDebugBytesToDte ); - OstTraceExt2( TRACE_DETAILED, DUP4_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugPnWrites= %d iDebugBytesToPn= %d", iDebugPnWrites, iDebugBytesToPn ); - OstTraceExt2( TRACE_DETAILED, DUP5_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugPnReads= %d iDebugBytesFromPn= %d", iDebugPnReads, iDebugBytesFromPn ); - OstTrace0( TRACE_DETAILED, DUP6_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|" ); - OstTraceExt2( TRACE_DETAILED, DUP7_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|rxlen= %d txlen= %d", rxlen, txlen ); - OstTrace0( TRACE_DETAILED, DUP8_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|" ); - OstTraceExt2( TRACE_DETAILED, DUP9_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iRx->iHead= %d iRx->iTail= %d", iRx->iHead, iRx->iTail ); - OstTraceExt2( TRACE_DETAILED, DUP10_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iRx->iTailWrp= %d iRx->iEnd= %d", iRx->iTailWhenWrappedAround, iRx->iEnd ); - OstTraceExt2( TRACE_DETAILED, DUP11_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iTx->iHead= %d iTx->iTail= %d", iTx->iHead, iTx->iTail ); - OstTraceExt2( TRACE_DETAILED, DUP12_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iTx->iTailWrp= %d iTx->iEnd= %d", iTx->iTailWhenWrappedAround, iTx->iEnd ); - OstTrace0( TRACE_DETAILED, DUP13_CDPDATAPORT_WRITESTATELOG, "CDpDataPort:: ------------------------------------------------------------" ); + OstTrace0( TRACE_INTERNALS, DUP1_CDPDATAPORT_WRITESTATELOG, "CDpDataPort:: --- DATA LOG: ----------------------------------------------" ); + OstTraceExt2( TRACE_INTERNALS, DUP2_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugDteWrites= %d iDebugBytesFromDte= %d", iDebugDteWrites, iDebugBytesFromDte ); + OstTraceExt2( TRACE_INTERNALS, DUP3_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugDteReads= %d iDebugBytesToDte= %d", iDebugDteReads, iDebugBytesToDte ); + OstTraceExt2( TRACE_INTERNALS, DUP4_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugPnWrites= %d iDebugBytesToPn= %d", iDebugPnWrites, iDebugBytesToPn ); + OstTraceExt2( TRACE_INTERNALS, DUP5_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugPnReads= %d iDebugBytesFromPn= %d", iDebugPnReads, iDebugBytesFromPn ); + OstTrace0( TRACE_INTERNALS, DUP6_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|" ); + OstTraceExt2( TRACE_INTERNALS, DUP7_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|rxlen= %d txlen= %d", rxlen, txlen ); + OstTrace0( TRACE_INTERNALS, DUP8_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|" ); + OstTraceExt2( TRACE_INTERNALS, DUP9_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iRx->iHead= %d iRx->iTail= %d", iRx->iHead, iRx->iTail ); + OstTraceExt2( TRACE_INTERNALS, DUP10_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iRx->iTailWrp= %d iRx->iEnd= %d", iRx->iTailWhenWrappedAround, iRx->iEnd ); + OstTraceExt2( TRACE_INTERNALS, DUP11_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iTx->iHead= %d iTx->iTail= %d", iTx->iHead, iTx->iTail ); + OstTraceExt2( TRACE_INTERNALS, DUP12_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iTx->iTailWrp= %d iTx->iEnd= %d", iTx->iTailWhenWrappedAround, iTx->iEnd ); + OstTrace0( TRACE_INTERNALS, DUP13_CDPDATAPORT_WRITESTATELOG, "CDpDataPort:: ------------------------------------------------------------" ); BDEBUG("\n DATA LOG:------------------------------------------------"); BFDEBUG2("|iDebugDteWrites= %d\tiDebugBytesFromDte= %d", @@ -2008,20 +2008,20 @@ #if ( defined USE_SERIAL_DEBUG || defined USE_TRUST_DEBUG ) - OstTrace0( TRACE_DETAILED, DUP14_CDPDATAPORT_WRITESTATELOG, "CDpDataPort:: --- DATA LOG: ----------------------------------------------" ); - OstTrace1( TRACE_DETAILED, DUP15_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugDteWrites= %d", iDebugDteWrites ); - OstTrace1( TRACE_DETAILED, DUP16_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugBytesFromDte= %d", iDebugBytesFromDte ); - OstTrace1( TRACE_DETAILED, DUP17_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugDteReads= %d", iDebugDteReads ); - OstTrace1( TRACE_DETAILED, DUP18_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugBytesToDte= %d", iDebugBytesToDte ); - OstTrace1( TRACE_DETAILED, DUP19_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugPnWrites= %d", iDebugPnWrites ); - OstTrace1( TRACE_DETAILED, DUP20_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugBytesToPn= %d", iDebugBytesToPn ); - OstTrace1( TRACE_DETAILED, DUP21_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugPnReads= %d", iDebugPnReads ); - OstTrace1( TRACE_DETAILED, DUP22_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugBytesFromPn= %d", iDebugBytesFromPn ); - OstTrace0( TRACE_DETAILED, DUP23_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|" ); - OstTrace1( TRACE_DETAILED, DUP24_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|rxlen= %d", rxlen ); - OstTrace1( TRACE_DETAILED, DUP25_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|txlen= %d", txlen ); - OstTrace0( TRACE_DETAILED, DUP26_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|" ); - OstTrace0( TRACE_DETAILED, DUP27_CDPDATAPORT_WRITESTATELOG, "CDpDataPort:: ------------------------------------------------------------" ); + OstTrace0( TRACE_INTERNALS, DUP14_CDPDATAPORT_WRITESTATELOG, "CDpDataPort:: --- DATA LOG: ----------------------------------------------" ); + OstTrace1( TRACE_INTERNALS, DUP15_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugDteWrites= %d", iDebugDteWrites ); + OstTrace1( TRACE_INTERNALS, DUP16_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugBytesFromDte= %d", iDebugBytesFromDte ); + OstTrace1( TRACE_INTERNALS, DUP17_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugDteReads= %d", iDebugDteReads ); + OstTrace1( TRACE_INTERNALS, DUP18_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugBytesToDte= %d", iDebugBytesToDte ); + OstTrace1( TRACE_INTERNALS, DUP19_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugPnWrites= %d", iDebugPnWrites ); + OstTrace1( TRACE_INTERNALS, DUP20_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugBytesToPn= %d", iDebugBytesToPn ); + OstTrace1( TRACE_INTERNALS, DUP21_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugPnReads= %d", iDebugPnReads ); + OstTrace1( TRACE_INTERNALS, DUP22_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|iDebugBytesFromPn= %d", iDebugBytesFromPn ); + OstTrace0( TRACE_INTERNALS, DUP23_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|" ); + OstTrace1( TRACE_INTERNALS, DUP24_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|rxlen= %d", rxlen ); + OstTrace1( TRACE_INTERNALS, DUP25_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|txlen= %d", txlen ); + OstTrace0( TRACE_INTERNALS, DUP26_CDPDATAPORT_WRITESTATELOG, "CDpDataPort::|" ); + OstTrace0( TRACE_INTERNALS, DUP27_CDPDATAPORT_WRITESTATELOG, "CDpDataPort:: ------------------------------------------------------------" ); RDEBUG("\n DATA LOG:------------------------------------------------"); FRDEBUG("|iDebugDteWrites= %d", iDebugDteWrites ); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/dataport/dataport_csy/src/dpescdetect.cpp --- a/adaptationlayer/dataport/dataport_csy/src/dpescdetect.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/dataport/dataport_csy/src/dpescdetect.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -150,6 +150,10 @@ TInt ret = #endif iDataPort.Mif().SendMessage( +#ifdef PIPECAMP_DATAPORT_PNS_PEP_STATUS_IND_PHONET_ADDRESS_FROM_PNS_PEP_CTRL_REQ // 20100523_1300 + iDataPort.Pif().GetPipeControllerDeviceIdentifier(), + iDataPort.Pif().GetPipeControllerObjectIdentifier(), +#endif PN_PIPE, iDataPort.CreateTransactionId(), PNS_PEP_STATUS_IND, diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/dataport/dataport_csy/src/dpmif.cpp --- a/adaptationlayer/dataport/dataport_csy/src/dpmif.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/dataport/dataport_csy/src/dpmif.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -18,6 +18,7 @@ // INCLUDE FILES +#include // For RDebug #include #include // isi name #include // isi pipe @@ -144,6 +145,10 @@ OstTrace0( TRACE_NORMAL, CDPMIF_CONSTRUCTL, "CDpMif::ConstructL" ); LOGM(" CDpMif::ConstructL"); +#ifdef PIPECAMP_DATAPORT_PNS_PEP_STATUS_IND_PHONET_ADDRESS_FROM_PNS_PEP_CTRL_REQ + RDebug::Print( _L("PIPECAMP_DATAPORT_PNS_PEP_STATUS_IND_PHONET_ADDRESS_FROM_PNS_PEP_CTRL_REQ") ); +#endif + iMsgReceiveBuffer = HBufC8::NewL( ISI_HEADER_SIZE + KDpMaxMsgReceiveSize ); _LIT(KPanicStr, "Dataport - CDpMif::ConstructL"); __ASSERT_ALWAYS( iMsgReceiveBuffer, @@ -486,7 +491,10 @@ // Get sender object TUint8 senderObject( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_SENDEROBJECT ) ); - +#ifdef PIPECAMP_DATAPORT_PNS_PEP_STATUS_IND_PHONET_ADDRESS_FROM_PNS_PEP_CTRL_REQ + iPifDcs.SetPipeControllerDeviceIdentifier( senderDevice ); + iPifDcs.SetPipeControllerObjectIdentifier( senderObject ); +#endif // E32 return value TInt return_E32( KErrNone ); // PN_PIPE return value @@ -800,7 +808,7 @@ // Add Object id messageData.Append( obj ); // Add Record flags - messageData.Append( PN_NAME_CLEARED ); + messageData.Append( PN_NAME_UNDEF/**PN_NAME_CLEARED**/ ); //fill messageData.Append( KDpPadding ); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/devicemodecontroller/dmc_ext/eabi/dmc.def --- a/adaptationlayer/devicemodecontroller/dmc_ext/eabi/dmc.def Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/devicemodecontroller/dmc_ext/eabi/dmc.def Tue Oct 19 13:16:20 2010 +0300 @@ -1,3 +1,9 @@ EXPORTS _Z19CreateLogicalDevicev @ 1 NONAME + _ZN11DmcKernelIf12CancelEventsEPFvRNS_6TEventEE @ 2 NONAME + _ZN11DmcKernelIf13GenerateResetENS_18TTargetStartupModeE @ 3 NONAME + _ZN11DmcKernelIf13IsHiddenResetERi @ 4 NONAME + _ZN11DmcKernelIf13ReceiveEventsEPFvRNS_6TEventEE @ 5 NONAME + _ZN11DmcKernelIf14GetStartUpModeERNS_18TTargetStartupModeE @ 6 NONAME + _ZN11DmcKernelIf8PowerOffEv @ 7 NONAME diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/devicemodecontroller/dmc_ext/group/dmc.mmp --- a/adaptationlayer/devicemodecontroller/dmc_ext/group/dmc.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/devicemodecontroller/dmc_ext/group/dmc.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -50,6 +50,7 @@ SOURCEPATH ../src SOURCE dmc_extension.cpp +SOURCE dmc_kernel_if.cpp SOURCE dmc_logical_channel.cpp SOURCE dmc_logical_device.cpp SOURCE dmc_event_handler_ape_cent.cpp diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/devicemodecontroller/dmc_ext/inc/dmc_event_handler_ape_cent.h --- a/adaptationlayer/devicemodecontroller/dmc_ext/inc/dmc_event_handler_ape_cent.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/devicemodecontroller/dmc_ext/inc/dmc_event_handler_ape_cent.h Tue Oct 19 13:16:20 2010 +0300 @@ -10,8 +10,8 @@ * Nokia Corporation - initial contribution. * * Contributors: -* -* Description: +* +* Description: * DMC APE centric event handler class declaration. * */ @@ -33,7 +33,7 @@ /** * INPUT EVENTS: * This constanst defines event types / inputs to this event handler. -* +* * * Kernel events (KERNEL_*) can be one of the following: * - ISI messages @@ -49,18 +49,28 @@ #define KERNEL_EVENT_PWR_HANDLER 0x01 // IAD Modem connection lost #define KERNEL_EVENT_MODEM_CONNECTION_NOT_OK 0x02 +// Get the type of the event to be sent to kernel side client +#define KERNEL_GET_EVENT_TYPE 0x03 +// Used through DMC kernel IF +#define KERNEL_IF_GET_STARTUP_MODE 0x04 +// Get hidden reset status, used through DMC kernel IF +#define KERNEL_IF_GET_HIDDEN_RESET_STATUS 0x05 +// Generate reset requested from kernel side +#define KERNEL_IF_GENERATE_RESET 0x06 +// Power off the device +#define KERNEL_IF_POWER_OFF 0x07 // Used for detecting the event type -#define KERNEL_LAST_KERNEL_EVENT KERNEL_EVENT_MODEM_CONNECTION_NOT_OK -// Get target startup mode -#define USER_GET_TARGET_STARTUP_MODE 0x03 +#define KERNEL_LAST_KERNEL_EVENT KERNEL_IF_POWER_OFF // Get target startup mode -#define USER_GENERATE_RESET 0x04 -// Get target startup mode -#define USER_POWER_OFF 0x05 -// Get target startup mode -#define USER_GET_HIDDEN_RESET_STATUS 0x07 +#define USER_GET_TARGET_STARTUP_MODE 0x08 +// Generate reset requested from user side +#define USER_GENERATE_RESET 0x09 +// Power off the device +#define USER_POWER_OFF 0x0A +// Get hidden reset status +#define USER_GET_HIDDEN_RESET_STATUS 0x0B // Get the type of the event to be sent to user side client -#define USER_GET_EVENT_TYPE 0x08 +#define USER_GET_EVENT_TYPE 0x0C #define LAST_EVENT (USER_GET_EVENT_TYPE + 1) #define NO_EVENTS_DEFINED 0x00 @@ -74,39 +84,49 @@ * orginated controlled or uncontrolled power off / reset. */ // Modem or PC SW orginated power off. -#define USER_CLIENT_POWER_OFF_EVENT 0x01 +#define DMC_CLIENT_POWER_OFF_EVENT 0x01 // Modem or PC SW orginated resest. -#define USER_CLIENT_RESET_EVENT 0x02 +#define DMC_CLIENT_RESET_EVENT 0x02 // No event requested -#define USER_CLIENT_NO_EVENT 0x00 +#define DMC_CLIENT_NO_EVENT 0x00 + -// MACROS -// DATA TYPES +/** +* CLIENT TYPE: +* A type of the client that request services. +*/ +#define DMC_USER_BIT 0x01 +#define DMC_KERNEL_BIT 0x02 + +// MACROS +// DATA TYPES // EXTERNAL DATA STRUCTURES -// FUNCTION PROTOTYPES +// FUNCTION PROTOTYPES // FORWARD DECLARATIONS class DDmcExtension; class DMutex; +class TDfc; NONSHARABLE_CLASS(DmcEvHandApeCent) { public: // Event handler new public functions - + /** * Init the event handler * * @param *aDmcExt A pointer to the DMC kernel extension. - * @return None + * @return None */ static void Init(DDmcExtension* const aDmcExt); /** * Subscribe events. * - * @param *aUserEventDfcPtr A pointer to DMC logical device TDfc queue. + * @param aTypeBitMask DMC_USER_BIT or/and DMC_KERNEL_BIT + * @param *aReceiveEventDfcPtr A pointer to TDfc queue. * @return None */ - static void SubscribeEvents(TDfc* const aUserEventDfcPtr); + static void SubscribeEvents(const TUint8 aTypeBitMask, TDfc* const aReceiveEventDfcPtr); /** * Unsubscribe events. @@ -124,10 +144,10 @@ * dmc_event_handler_ape_cent.cpp-file defines allowed values. * @param *aKernMsgPtr A pointer to a incoming kernel message. * @param *aUsrMsgPtr A pointer to a incoming user message. - * @return KErrNone or one of the system wide error + * @return KErrNone or one of the system wide error */ static TInt HandleEvent(const TUint8 aType, - const TUint8* const aKernMsgPtr, + TUint8* const aKernMsgPtr, TUint* const aUsrMsgPtr); private: // Event handler new private functions @@ -152,7 +172,7 @@ inline static void Unlock(); /** - * This function process an ANY-state. + * This function process an ANY-state. * There are events, which always must be handled regardless of * an ongoing transaction. These type of events are handled in the state ANY. * @@ -160,10 +180,10 @@ * dmc_event_handler_ape_cent.cpp-file defines allowed values. * @param *aKernMsgPtr A pointer to a incoming kernel message. * @param *aUsrMsgPtr A pointer to a incoming user message. - * @return KErrNone or one of the system wide error + * @return KErrNone or one of the system wide error */ static TInt StateAny(const TUint8 aEventType, - const TUint8* const aKernMsgPtr, + TUint8* const aKernMsgPtr, TUint* const aUsrMsgPtr); /** @@ -174,7 +194,7 @@ * dmc_event_handler_ape_cent.cpp-file defines allowed values. * @param *aKernMsgPtr A pointer to a incoming kernel message. * @param *aUsrMsgPtr A pointer to a incoming user message. - * @return KErrNone or one of the system wide error + * @return KErrNone or one of the system wide error */ static TInt StateIdle(const TUint8 aEventType, const TUint8* const aKernMsgPtr, @@ -187,7 +207,7 @@ * dmc_event_handler_ape_cent.cpp-file defines allowed values. * @param *aKernMsgPtr A pointer to a incoming kernel message. * @param *aUsrMsgPtr A pointer to a incoming user message. - * @return KErrNone or one of the system wide error + * @return KErrNone or one of the system wide error */ static TInt StateApePwrOff(const TUint8 aEventType, const TUint8* const aKernMsgPtr, @@ -200,7 +220,7 @@ * dmc_event_handler_ape_cent.cpp-file defines allowed values. * @param *aKernMsgPtr A pointer to a incoming kernel message. * @param *aUsrMsgPtr A pointer to a incoming user message. - * @return KErrNone or one of the system wide error + * @return KErrNone or one of the system wide error */ static TInt StateApeReset(const TUint8 aEventType, const TUint8* const aKernMsgPtr, @@ -213,7 +233,7 @@ * dmc_event_handler_ape_cent.cpp-file defines allowed values. * @param *aKernMsgPtr A pointer to a incoming kernel message. * @param *aUsrMsgPtr A pointer to a incoming user message. - * @return KErrNone or one of the system wide error + * @return KErrNone or one of the system wide error */ static TInt StateModemPwrOff(const TUint8 aEventType, const TUint8* const aKernMsgPtr, @@ -226,7 +246,7 @@ * dmc_event_handler_ape_cent.cpp-file defines allowed values. * @param *aKernMsgPtr A pointer to a incoming kernel message. * @param *aUsrMsgPtr A pointer to a incoming user message. - * @return KErrNone or one of the system wide error + * @return KErrNone or one of the system wide error */ static TInt StateModemControlledReset(const TUint8 aEventType, const TUint8* const aKernMsgPtr, @@ -239,12 +259,13 @@ * dmc_event_handler_ape_cent.cpp-file defines allowed values. * @param *aKernMsgPtr A pointer to a incoming kernel message. * @param *aUsrMsgPtr A pointer to a incoming user message. - * @return KErrNone or one of the system wide error + * @return KErrNone or one of the system wide error */ static TInt StateModemUncontrolledReset(const TUint8 aEventType, const TUint8* const aKernMsgPtr, TUint* const aUsrMsgPtr); + /** * A function to handle a MCE_MODEM_STATE_QUERY_RESP * @@ -253,6 +274,18 @@ */ static void HandleMceModemStateQueryResp(const TUint8* const aMsgPtr); + + /** + * This function Generates an event for user and kernel side clients. + * The event is generated only if events are subscribed. + * + * @param aToWhomBitMask Defines whom to generate an event. + * DMC_USER_BIT or/and DMC_KERNEL_BIT + * @return None + */ + static void GenerateEvent(const TUint8 aToWhomBitMask); + + /** * Handles a state transition of the DMC Event Handler. * This function also checks if the a required state transition is allowed. @@ -273,7 +306,7 @@ * @param aEventType Type of the message. A table "EVENTS" in the * dmc_event_handler_ape_cent.cpp-file. * @param aKernMsgPtr Pointer to Kernel event - * @return 1: Bit set to indicate that a requested event is part of the any state. + * @return 1: Bit set to indicate that a requested event is part of the any state. * 0: Bit not set to indicate that a requested event is not part of the any state. */ static TUint8 IsAnyStateEvent(const TUint8 aEventType, const TUint8* const aKernMsgPtr); @@ -283,32 +316,52 @@ /** * A pointer to DMC extension. * DMC extension owns this pointer. - * + * */ static DDmcExtension* iDmcExtPtr; /** * A pointer to mutex. * This class owns this pointer. - * + * */ static DMutex* iMutexPtr; /** - * A pointer to DMC user / kernel Dfc-queue. + * A pointer to DMC user Dfc-queue. * This class does not own this pointer. - * + * */ static TDfc* iUserEventDfcPtr; /** - * A target start-up mode. + * A pointer to DMC kernel Dfc-queue. + * This class does not own this pointer. + * + */ + static TDfc* iKernelEventDfcPtr; + + /** + * Event for signaling upstairs to start power off + * + */ + static TRawEvent iSwitchOffEvent; + + /** + * Event for signaling upstairs to start reset + * + */ + static TRawEvent iResetEvent; + + + /** + * A target start-up mode. * Values in the boot_reason_api.h-file. */ static TBootReason::TStartupMode iTargetStartupMode; /** - * A hidden reset status. + * A hidden reset status. * Values in the boot_reason_api.h-file. * * ETrue if the reset is hidden, otherwise EFalse. @@ -325,13 +378,13 @@ * This variable is needed to detect whether the Power Handler * PowerDown() has been called. * - * DMC needs this information to know if the Power Handler + * DMC needs this information to know if the Power Handler * PowerDownDone must be called in case the modem connection - * is lost and there is an ongoing transaction. + * is lost and there is an ongoing transaction. * * If there is no ongoing transaction, the modem connection * lost is handled as a "MODEM_UNCONTROLLED_RESET". - * + * * Only one transaction is allowed, thus if there is already * ongoing transaction, the modem connection is handled as * below. @@ -345,26 +398,26 @@ * PowerDown() is called and then * acknowledge back immediately by * calling PowerDownDone(). - * + * * Allowed values: TRUE / FALSE */ static TUint8 iPowerDownCalled; /** - * Modem action bit map. - * + * Modem action bit map. + * * This bit map defines actions that have * been happend in the Modem state transition * and a modem connection. - * + * * Action information is needed to find a correct * slot to acknowledge the Power Handler PowerDownDone. */ static TUint8 iModemActionBitMap; /** - * A current modem state. - * + * A current modem state. + * * Values from mceisi.h-file. */ static TUint8 iModemCurrentState; @@ -376,7 +429,7 @@ * user side client. The event type is used in case * PC SW or Modem orginated power off or reset or * in case of uncontrolled Modem reset.. - * + * * Values from OUTPUT EVENTS: defined beginning of this file. */ static TUint8 iEventType; @@ -392,6 +445,7 @@ * This table defines allowed state transitions. */ static const TUint8 iStateTransitionMap[]; + }; #endif // DMC_EVENT_HANDLER_APE_CENT_H diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/devicemodecontroller/dmc_ext/src/dmc_event_handler_ape_cent.cpp --- a/adaptationlayer/devicemodecontroller/dmc_ext/src/dmc_event_handler_ape_cent.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/devicemodecontroller/dmc_ext/src/dmc_event_handler_ape_cent.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -10,8 +10,8 @@ * Nokia Corporation - initial contribution. * * Contributors: -* -* Description: +* +* Description: * Implementation of DMC event handler. * */ @@ -42,8 +42,8 @@ #include "dmc_event_handler_ape_centTraces.h" #endif -// EXTERNAL DATA STRUCTURES -// EXTERNAL FUNCTION PROTOTYPES +// EXTERNAL DATA STRUCTURES +// EXTERNAL FUNCTION PROTOTYPES // FORWARD DECLARATIONS // CONSTANTS @@ -63,7 +63,7 @@ #else // USE_MTC_SERVER -/** +/** * Define MCE init state and action values because an ISI API does not provide them. */ #define MCE_STATE_INIT_VALUE static_cast(static_cast(~(MCE_NORMAL | MCE_LOCAL | MCE_SW_RESET | MCE_POWER_OFF))) @@ -89,7 +89,7 @@ */ #define IDLE 0x00 // All transactions begins in the IDLE-state. #define BUSY 0x01 // Used while checking an incoming transaction request. -#define APE_PWR_OFF 0x02 // Handling APE orginated power off request. +#define APE_PWR_OFF 0x02 // Handling APE(through user or kernel if) orginated power off request. #define MODEM_PWR_OFF 0x03 // Handling Modem orginated power off request. #define APE_RESET 0x04 // Handling APE orginated reset. #define MODEM_CONTROLLED_RESET 0x05 // Handling Modem controlled reset. @@ -103,13 +103,16 @@ DDmcExtension* DmcEvHandApeCent::iDmcExtPtr(NULL); DMutex* DmcEvHandApeCent::iMutexPtr(NULL); TDfc* DmcEvHandApeCent::iUserEventDfcPtr(NULL); +TDfc* DmcEvHandApeCent::iKernelEventDfcPtr(NULL); +TRawEvent DmcEvHandApeCent::iSwitchOffEvent; +TRawEvent DmcEvHandApeCent::iResetEvent; TBootReason::TStartupMode DmcEvHandApeCent::iTargetStartupMode(TBootReason::EStartupModeNone); TBool DmcEvHandApeCent::iHiddenStatus(EFalse); // Init with no valid state value TUint8 DmcEvHandApeCent::iModemCurrentState(MCE_STATE_INIT_VALUE); TUint8 DmcEvHandApeCent::iModemActionBitMap(MODEM_NO_ACTIONS); TUint8 DmcEvHandApeCent::iPowerDownCalled(FALSE); -TUint8 DmcEvHandApeCent::iEventType(USER_CLIENT_NO_EVENT); +TUint8 DmcEvHandApeCent::iEventType(DMC_CLIENT_NO_EVENT); TUint8 DmcEvHandApeCent::iCurrentState(IDLE); // This table defines allowed state transitions. @@ -141,13 +144,16 @@ TO((NO_STATES_DEFINED)), }; -/* This bitmap defines user events that are handled in an any-state. Kernel event any - state checking is based on the resource ID and message ID.*/ -const TUint32 DmcEvHandApeCent::iAnyStateMap((1 << USER_GET_TARGET_STARTUP_MODE | - 1 << USER_GET_HIDDEN_RESET_STATUS | +/* This bitmap defines events that are handled in an any-state. ISI event any + state checking is based on the resource ID and message ID.*/ +const TUint32 DmcEvHandApeCent::iAnyStateMap((1 << KERNEL_IF_GET_STARTUP_MODE | + 1 << KERNEL_IF_GET_HIDDEN_RESET_STATUS | + 1 << KERNEL_GET_EVENT_TYPE | + 1 << USER_GET_TARGET_STARTUP_MODE | + 1 << USER_GET_HIDDEN_RESET_STATUS | 1 << USER_GET_EVENT_TYPE)); -// LOCAL FUNCTION PROTOTYPES +// LOCAL FUNCTION PROTOTYPES // ==================== LOCAL FUNCTIONS ==================== @@ -217,6 +223,9 @@ DMC_TRACE((("DMC:EH_APE_CEN: Init() - MutexCreate, err: %d "), err)); DMC_TRACE_ASSERT_RESET(err == KErrNone , "Kern::MutexCreate failed", err); + iSwitchOffEvent.Set(TRawEvent::ESwitchOff); + iResetEvent.Set(TRawEvent::ERestartSystem); + #if _DEBUG /* Print the bitmap(HW_CONF_RECORD) whom boot_reason_api uses in the target startup decision. Values of the HW_CONF_RECORD can be found in the "Loader Chipset API" specification. */ @@ -231,11 +240,19 @@ #endif // _DEBUG DmcEvHandApeCent::Lock(); - /* Get and set the target startup mode in which a device is started. - This is needed in case of device crash. */ + /* Get the target startup mode in which a device is started. */ TBootReason::GetStartupMode(iTargetStartupMode); + + /* If we do not get a target startup mode do a brutal reset because + we do not know to which mode to boot up. It's a fatal error if the + target startup mode has not been updated. */ + DMC_TRACE_ASSERT_RESET(iTargetStartupMode, "DMC:EH_APE_CEN: TStartupMode -> EStartupModeNone", + KErrCorrupt); + + /* Set the target startup mode in which a device is started. + This is needed in case of device crash. */ TBootReason::SetTargetStartupMode(iTargetStartupMode); - + // Get a hidden reset status. iHiddenStatus = TBootReason::IsHiddenReset(); DmcEvHandApeCent::Unlock(); @@ -250,7 +267,7 @@ iHiddenStatus); DMC_TRACE((("DMC:KERN_EXTEN: Init() - iHiddenStatus: %d"), iHiddenStatus)); - + // Get Modem current state MceIsi::MceModemStateQueryReq(); @@ -265,43 +282,79 @@ // Set the user logical device dfc-queue available for modem events. // ----------------------------------------------------------------------------- // -void DmcEvHandApeCent::SubscribeEvents(TDfc* const aUserEventDfcPtr) +void DmcEvHandApeCent::SubscribeEvents(const TUint8 aTypeBitMask, TDfc* const aReceiveEventDfcPtr) { - OstTrace1(TRACE_ENTRY_EXIT, DMC_EVENT_HAND_APE_SUBSCRIBE_EVENTS_ENTRY, - "DMC:EH_APE_CEN: SubscribeEvents() # IN - aUserEventDfcPtr: 0x%x", - aUserEventDfcPtr); - DMC_TRACE((("DMC:EH_APE_CEN: SubscribeEvents() # IN - aUserEventDfcPtr: 0x%x "), - aUserEventDfcPtr)); - - DMC_TRACE_ASSERT_RESET(aUserEventDfcPtr, "DMC:EH_APE_CEN: aUserEventDfcPtr, NULL pointer", + OstTraceExt2(TRACE_ENTRY_EXIT, DMC_EVENT_HAND_APE_SUBSCRIBE_EVENTS_ENTRY, + "DMC:EH_APE_CEN: SubscribeEvents() # IN - aTypeBitMask: %d, aReceiveEventDfcPtr: 0x%x", + aTypeBitMask, (TUint)aReceiveEventDfcPtr); + DMC_TRACE((("DMC:EH_APE_CEN: SubscribeEvents() # IN - aTypeBitMask: %d, aReceiveEventDfcPtr: 0x%x "), + aTypeBitMask, aReceiveEventDfcPtr)); + + DMC_TRACE_ASSERT_RESET(aReceiveEventDfcPtr, "DMC:EH_APE_CEN: aUserEventDfcPtr, NULL pointer", KErrNoMemory); - iUserEventDfcPtr = aUserEventDfcPtr; - - // Check if there are pending events. - if (iEventType != USER_CLIENT_NO_EVENT) + // Registration is done only when a first client does the it for both side. + if (aTypeBitMask & DMC_USER_BIT) { - OstTrace1(TRACE_FLOW, DMC_EVENT_HAND_APE_SUBSCRIBE_EVENTS_1, - "DMC:EH_APE_CEN: SubscribeEvents() - Pending event, iEventType: %d", - iEventType); - - if (NKern::CurrentContext() == NKern::EInterrupt) - { - iUserEventDfcPtr->Add(); - } - else + OstTrace0(TRACE_FLOW, DMC_EVENT_HAND_APE_SUBSCRIBE_EVENTS_1, + "DMC:EH_APE_CEN: SubscribeEvents() - DMC_USER_BIT"); + DMC_TRACE((("DMC:EH_APE_CEN: SubscribeEvents() - DMC_USER_BIT"))); + + iUserEventDfcPtr = aReceiveEventDfcPtr; + + // Check if there are pending events. + if (iEventType != DMC_CLIENT_NO_EVENT) { - iUserEventDfcPtr->Enque(); - } + OstTrace1(TRACE_FLOW, DMC_EVENT_HAND_APE_SUBSCRIBE_EVENTS_2, + "DMC:EH_APE_CEN: SubscribeEvents() - Pending event deliver to user, iEventType: %d", + iEventType); + DMC_TRACE((("DMC:EH_APE_CEN: SubscribeEvents() - Pending event deliver to user, iEventType: %d"), + iEventType)); + + if (NKern::CurrentContext() == NKern::EInterrupt) + { + iUserEventDfcPtr->Add(); + } + else + { + iUserEventDfcPtr->Enque(); + } + } } - - OstTrace1(TRACE_ENTRY_EXIT, DMC_EVENT_HAND_APE_SUBSCRIBE_EVENTS_RETURN, - "DMC:EH_APE_CEN: SubscribeEvents() # OUT - iUserEventDfcPtr: 0x%x", - iUserEventDfcPtr); - DMC_TRACE((("DMC:EH_APE_CEN: SubscribeEvents() # OUT - iUserEventDfcPtr: 0x%x"), - iUserEventDfcPtr)); + else if (aTypeBitMask & DMC_KERNEL_BIT) + { + OstTrace0(TRACE_FLOW, DMC_EVENT_HAND_APE_SUBSCRIBE_EVENTS_3, + "DMC:EH_APE_CEN: SubscribeEvents() - DMC_KERNEL_BIT"); + DMC_TRACE((("DMC:EH_APE_CEN: SubscribeEvents() - DMC_KERNEL_BIT"))); + + iKernelEventDfcPtr = aReceiveEventDfcPtr; + + // Check if there are pending events. + if (iEventType != DMC_CLIENT_NO_EVENT) + { + OstTrace1(TRACE_FLOW, DMC_EVENT_HAND_APE_SUBSCRIBE_EVENTS_4, + "DMC:EH_APE_CEN: SubscribeEvents() - Pending event deliver to kernel, iEventType: %d", + iEventType); + DMC_TRACE((("DMC:EH_APE_CEN: SubscribeEvents() - Pending event deliver to user, iEventType: %d"), + iEventType)); + + if (NKern::CurrentContext() == NKern::EInterrupt) + { + iKernelEventDfcPtr->Add(); + } + else + { + iKernelEventDfcPtr->Enque(); + } + } + }// else not needed + + OstTrace0(TRACE_ENTRY_EXIT, DMC_EVENT_HAND_APE_SUBSCRIBE_EVENTS_RETURN, + "DMC:EH_APE_CEN: SubscribeEvents() # OUT"); + DMC_TRACE((("DMC:EH_APE_CEN: SubscribeEvents() # OUT"))); } + // ----------------------------------------------------------------------------- // DDmcExtension::UnsubscribeEvents // ----------------------------------------------------------------------------- @@ -329,12 +382,12 @@ // ----------------------------------------------------------------------------- // DDmcExtension::HandleEvent -// This function is the only entry point to access to the DMC Ape Centric +// This function is the only entry point to access to the DMC Ape Centric // Event Handler. // ----------------------------------------------------------------------------- // TInt DmcEvHandApeCent::HandleEvent(const TUint8 aEventType, - const TUint8* const aKernMsgPtr, + TUint8* const aKernMsgPtr, TUint* const aUsrMsgPtr) { OstTraceExt3(TRACE_ENTRY_EXIT, DMC_EVENT_HAND_HANDLE_EVENT_ENTRY, @@ -370,9 +423,9 @@ OstTrace0(TRACE_FLOW, DMC_EVENT_HAND_HANDLE_EVENT_IDLE_1, "DMC:EH_APE_CEN: HandleEvent() - IDLE"); DMC_TRACE(("DMC:EH_APE_CEN: HandleEvent() - IDLE")); - + StateIdle(aEventType, aKernMsgPtr, aUsrMsgPtr); - + ret = KErrNone; } break; @@ -386,7 +439,7 @@ DMC_TRACE(("DMC:EH_APE_CEN: HandleEvent() - BUSY")); } break; - + case APE_PWR_OFF: { OstTrace0(TRACE_FLOW, DMC_EVENT_HAND_HANDLE_EVENT_APE_PWR_OFF_1, @@ -463,7 +516,7 @@ // ----------------------------------------------------------------------------- // TInt DmcEvHandApeCent::StateAny(const TUint8 aEventType, - const TUint8* const aKernMsgPtr, + TUint8* const aKernMsgPtr, TUint* const aUsrMsgPtr) { OstTraceExt3(TRACE_ENTRY_EXIT, DMC_EVENT_HAND_STATE_ANY_ENTRY, @@ -473,14 +526,14 @@ aEventType, aKernMsgPtr, aUsrMsgPtr)); TInt ret(KErrNone); - + // Supported events in the state ANY. No state transitions are executed from state ANY. switch (aEventType) { case KERNEL_EVENT_ISI: { TUint8 resourceId = aKernMsgPtr[ISI_HEADER_OFFSET_RESOURCEID]; - + DMC_TRACE((("DMC:EH_APE_CEN: StateAny() - resource ID: 0x%x: "), resourceId)); #ifdef USE_MTC_SERVER @@ -489,13 +542,13 @@ DMC_TRACE(("DMC:EH_APE_CEN: StateAny() - PN_MTC")); TUint8 messageId = aKernMsgPtr[ISI_HEADER_OFFSET_MESSAGEID]; - + switch (messageId) { case MTC_STATE_QUERY_RESP: { DMC_TRACE(("DMC:EH_APE_CEN: StateAny() - MTC_STATE_QUERY_RESP")); - + HandleMceModemStateQueryResp(aKernMsgPtr); } break; @@ -509,7 +562,7 @@ DMC_TRACE(("DMC:EH_APE_CEN: StateAny() - PN_MODEM_MCE")); TUint8 messageId = aKernMsgPtr[ISI_HEADER_OFFSET_MESSAGEID]; - + switch (messageId) { case MCE_MODEM_STATE_QUERY_RESP: @@ -517,7 +570,7 @@ OstTrace0(TRACE_FLOW, DMC_EVENT_HAND_STATE_ANY_KERN_2, "DMC:EH_APE_CEN: StateAny() - MCE_STATE_QUERY_RESP"); DMC_TRACE(("DMC:EH_APE_CEN: StateAny() - MCE_STATE_QUERY_RESP")); - + HandleMceModemStateQueryResp(aKernMsgPtr); } break; @@ -534,8 +587,70 @@ } break; - case KERNEL_EVENT_PWR_HANDLER: + case KERNEL_IF_GET_STARTUP_MODE: + { + OstTrace0(TRACE_FLOW, DMC_EVENT_HAND_STATE_ANY_KERN_GET_STARTUPMODE_1, + "DMC:EH_APE_CEN: StateAny() - KERNEL_IF_GET_STARTUP_MODE"); + DMC_TRACE(("DMC:EH_APE_CEN: StateAny() - KERNEL_IF_GET_STARTUP_MODE")); + + DmcEvHandApeCent::Lock(); + TBootReason::GetStartupMode(iTargetStartupMode); + DmcEvHandApeCent::Unlock(); + + /* If we do not get a target startup mode do a brutal reset because + we do not know to which mode to boot up. It's a fatal error if the + target startup mode has not been updated. */ + DMC_TRACE_ASSERT_RESET(iTargetStartupMode, "DMC:EH_APE_CEN: TStartupMode -> EStartupModeNone", + KErrCorrupt); + /* At this point we cannot use mutex because this piece of code can be executed + before DMC kernel extension has been created, thus mutex is not available. */ + *(TUint32 *)aKernMsgPtr = iTargetStartupMode; + + OstTrace1(TRACE_FLOW, DMC_EVENT_HAND_STATE_ANY_KERN_GET_STARTUPMODE_3, + "DMC:EH_APE_CEN: StateAny() - iTargetStartupMode: 0x%x", + iTargetStartupMode); + DMC_TRACE((("DMC:EH_APE_CEN: StateAny() - iTargetStartupMode: 0x%x"), + iTargetStartupMode)); + } + break; + + case KERNEL_IF_GET_HIDDEN_RESET_STATUS: { + OstTrace0(TRACE_FLOW, DMC_EVENT_HAND_STATE_ANY_KERN_HIDDEN_STAT_1, + "DMC:EH_APE_CEN: StateAny() - KERNEL_IF_GET_HIDDEN_RESET_STATUS"); + DMC_TRACE(("DMC:EH_APE_CEN: StateAny() - KERNEL_IF_GET_HIDDEN_RESET_STATUS")); + + DmcEvHandApeCent::Lock(); + iHiddenStatus = TBootReason::IsHiddenReset(); + DmcEvHandApeCent::Unlock(); + + *(TBool *)aKernMsgPtr = iHiddenStatus; + + OstTrace1(TRACE_FLOW, DMC_EVENT_HAND_STATE_ANY_KERN_HIDDEN_STAT_2, + "DMC:EH_APE_CEN: StateAny() - IsHidden: %d", + iHiddenStatus); + DMC_TRACE((("DMC:EH_APE_CEN: StateAny() - IsHidden: %d"), + iHiddenStatus)); + } + break; + + case KERNEL_GET_EVENT_TYPE: + { + OstTrace0(TRACE_FLOW, DMC_EVENT_HAND_STATE_ANY_KERN_GET_EVENT_1, + "DMC:EH_APE_CEN: StateAny() - KERNEL_GET_EVENT_TYPE"); + DMC_TRACE(("DMC:EH_APE_CEN: StateAny() - KERNEL_GET_EVENT_TYPE")); + + DmcEvHandApeCent::Lock(); + + *aKernMsgPtr = iEventType; + + DmcEvHandApeCent::Unlock(); + + OstTrace1(TRACE_FLOW, DMC_EVENT_HAND_STATE_ANY_KERN_GET_EVENT_2, + "DMC:EH_APE_CEN: StateAny() - Event *aKernMsgPtr: 0x%x", + *aKernMsgPtr); + DMC_TRACE((("DMC:EH_APE_CEN: StateAny() - Event *aKernMsgPtr: 0x%x"), + *aKernMsgPtr)); } break; @@ -548,15 +663,6 @@ // Get the target startup mode if the mode has not been fetched yet DmcEvHandApeCent::Lock(); - if (iTargetStartupMode == TBootReason::EStartupModeNone) - { - OstTrace0(TRACE_FLOW, DMC_EVENT_HAND_STATE_ANY_EVENT_2, - "DMC:EH_APE_CEN: StateAny() - Get the target startup mode through Boot Reason API"); - DMC_TRACE(("DMC:EH_APE_CEN: StateAny() - Get the target startup mode through Boot Reason API")); - - TBootReason::GetStartupMode(iTargetStartupMode); - } - *aUsrMsgPtr = static_cast(iTargetStartupMode); DmcEvHandApeCent::Unlock(); @@ -592,15 +698,15 @@ DMC_TRACE(("DMC:EH_APE_CEN: StateAny() - USER_GET_EVENT_TYPE")); DmcEvHandApeCent::Lock(); - + *aUsrMsgPtr = iEventType; - + DmcEvHandApeCent::Unlock(); OstTrace1(TRACE_FLOW, STATE_ANY_EVENT_5, - "DMC:EH_APE_CEN: StateAny() - User event type: 0x%x", + "DMC:EH_APE_CEN: StateAny() - Event *aUsrMsgPtr: 0x%x", *aUsrMsgPtr); - DMC_TRACE((("DMC:EH_APE_CEN: StateAny() - User event type: 0x%x"), + DMC_TRACE((("DMC:EH_APE_CEN: StateAny() - Event *aUsrMsgPtr: 0x%x"), *aUsrMsgPtr)); } break; @@ -642,7 +748,7 @@ TInt ret(KErrNone); /* - * When checking whether a request is to be served in the IDLE-state, the + * When checking whether a request is to be served in the IDLE-state, the * state is changed into BUSY to make sure that no new requqests are taken * into a process. * @@ -685,7 +791,7 @@ // Get the modem state and action information MceIsi::MceModemStateInd(aKernMsgPtr, modemState, modemAction); - + DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - modemState: 0x%x, modemAction: 0x%x"), modemState, modemAction)); @@ -693,24 +799,25 @@ if (modemAction == MTC_START) { DMC_TRACE(("DMC:EH_APE_CEN: StateIdle() - MTC_START")); - + if (modemState == MTC_POWER_OFF) { DMC_TRACE(("DMC:EH_APE_CEN: StateIdle() - MTC_POWER_OFF")); - + // First set the target start-up mode to "none" meaning power off. DmcEvHandApeCent::Lock(); iTargetStartupMode = TBootReason::EStartupModeNone; TBootReason::SetTargetStartupMode(TBootReason::EStartupModeNone); - + /* Set the user client event type. The type of the event is read - once the iUserEventDfcPtr dfc-queue gets execution time. */ - iEventType = USER_CLIENT_POWER_OFF_EVENT; + once the iUserEventDfcPtr and iKernelEventDfcPtr dfc-queues + gets execution time. */ + iEventType = DMC_CLIENT_POWER_OFF_EVENT; DmcEvHandApeCent::Unlock(); - - DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - Boot API, iTargetStartupMode: 0x%x, User iEventType: 0x%x"), + + DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - Boot API, iTargetStartupMode: 0x%x, User iEventType: 0x%x"), iTargetStartupMode, iEventType)); - + // Change the state to MODEM_PWR_OFF DmcEvHandApeCent::SetNextState(MODEM_PWR_OFF); } @@ -718,43 +825,30 @@ if (modemState == MTC_SW_RESET) { DMC_TRACE(("DMC:EH_APE_CEN: StateIdle() - MTC_SW_RESET")); - + // Reset a device back to the same state as started. DmcEvHandApeCent::Lock(); TBootReason::SetTargetStartupMode(iTargetStartupMode); - + /* Set the user client event type. The type of the event is read - once the iUserEventDfcPtr dfc-queue gets execution time. */ - iEventType = USER_CLIENT_RESET_EVENT; + once the iUserEventDfcPtr and iKernelEventDfcPtr dfc-queues + gets execution time. */ + iEventType = DMC_CLIENT_RESET_EVENT; DmcEvHandApeCent::Unlock(); - - DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - Boot API, iTargetStartupMode: 0x%x, User iEventType: 0x%x"), + + DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - Boot API, iTargetStartupMode: 0x%x, User iEventType: 0x%x"), iTargetStartupMode, iEventType)); - + // Change the state to MODEM_CONTROLLED_RESET DmcEvHandApeCent::SetNextState(MODEM_CONTROLLED_RESET); } - // Now check if we have to generate a user event. + // Now check if we have to generate an event. if ((modemState == MTC_POWER_OFF) || (modemState == MTC_SW_RESET)) { - DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - Generate User event, iUserEventDfcPtr: 0x%x"), - iUserEventDfcPtr)); - /* Generate the user event. - If no registered clients yet. Remain in the MODEM_CONTROLLED_RESET state - and as soon as the first client subscribes events, the power - off event is generated. */ - if (iUserEventDfcPtr) - { - if (NKern::CurrentContext() == NKern::EInterrupt) - { - iUserEventDfcPtr->Add(); - } - else - { - iUserEventDfcPtr->Enque(); - } - } + /* Now we need to generate events to both user- and kernel side because + the transaction was launched from modem. */ + GenerateEvent((DMC_USER_BIT | DMC_KERNEL_BIT)); } } } @@ -792,13 +886,13 @@ // Get the modem state and action information MceIsi::MceModemStateInd(aKernMsgPtr, modemState, modemAction); - + OstTraceExt2(TRACE_FLOW, DMC_EVENT_HAND_APE_CENT_STATE_IDLE_MCE_STATE_IND_1, "DMC:EH_APE_CEN: DMC:EH_APE_CEN: StateIdle() - modemState: 0x%x, modemAction: 0x%x", (TUint)modemState, (TUint)modemAction); DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - modemState: 0x%x, modemAction: 0x%x"), modemState, modemAction)); - + if (modemAction == MCE_START) { OstTrace0(TRACE_FLOW, STATE_STATE_IDLE_KERN_EV_ISI_CASE_2, @@ -810,72 +904,56 @@ OstTrace0(TRACE_FLOW, STATE_STATE_IDLE_KERN_EV_ISI_CASE_3, "DMC:EH_APE_CEN: StateIdle() - MCE_POWER_OFF"); DMC_TRACE(("DMC:EH_APE_CEN: StateIdle() - MCE_POWER_OFF")); - + // First set the target start-up mode to "none" meaning power off. DmcEvHandApeCent::Lock(); iTargetStartupMode = TBootReason::EStartupModeNone; TBootReason::SetTargetStartupMode(TBootReason::EStartupModeNone); - - /* Set the user client event type. The type of the event is read - once the iUserEventDfcPtr dfc-queue gets execution time. */ - iEventType = USER_CLIENT_POWER_OFF_EVENT; + + /* Set the client event type. The type of the event is read + once the iUserEventDfcPtr and iKernelEventDfcPtr dfc-queues + gets execution time. */ + iEventType = DMC_CLIENT_POWER_OFF_EVENT; DmcEvHandApeCent::Unlock(); - + OstTraceExt2(TRACE_FLOW, STATE_STATE_IDLE_KERN_EV_ISI_CASE_4, "DMC:EH_APE_CEN: StateIdle() - Boot API, iTargetStartupMode: 0x%x, User Event, iEventType: 0x%x", (TUint)iTargetStartupMode, (TUint)iEventType); - DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - Boot API, iTargetStartupMode: 0x%x, User Event, iEventType: 0x%x"), + DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - Boot API, iTargetStartupMode: 0x%x, User Event, iEventType: 0x%x"), iTargetStartupMode, iEventType)); - + // Change the state to MODEM_PWR_OFF DmcEvHandApeCent::SetNextState(MODEM_PWR_OFF); } - // Modes makes reset, MODEM_CONTROLLED_RESET. + // Modes makes reset, MODEM_CONTROLLED_RESET. if (modemState == MCE_SW_RESET) { DMC_TRACE(("DMC:EH_APE_CEN: StateIdle() - MCE_SW_RESET")); - + // Reset a device back to the same state as started. DmcEvHandApeCent::Lock(); TBootReason::SetTargetStartupMode(iTargetStartupMode); - + /* Set the user client event type. The type of the event is read - once the iUserEventDfcPtr dfc-queue gets execution time. */ - iEventType = USER_CLIENT_RESET_EVENT; + once the iUserEventDfcPtr and iKernelEventDfcPtr dfc-queues + gets execution time. */ + iEventType = DMC_CLIENT_RESET_EVENT; DmcEvHandApeCent::Unlock(); - - DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - Boot API, iTargetStartupMode: 0x%x, User Event, iEventType: 0x%x"), + + DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - Boot API, iTargetStartupMode: 0x%x, User Event, iEventType: 0x%x"), iTargetStartupMode, iEventType)); - + // Change the state to MODEM_CONTROLLED_RESET DmcEvHandApeCent::SetNextState(MODEM_CONTROLLED_RESET); } // Now check if we have to generate a user event. - if ((modemState == MCE_POWER_OFF) || (modemState == MCE_START)) + if ((modemState == MCE_POWER_OFF) || (modemState == MCE_SW_RESET)) { - OstTrace1(TRACE_FLOW, STATE_STATE_IDLE_KERN_EV_ISI_CASE_5, - "DMC:EH_APE_CEN: StateIdle() - Generate User event, iUserEventDfcPtr: 0x%x", - iUserEventDfcPtr); - DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - Generate User event, iUserEventDfcPtr: 0x%x"), - iUserEventDfcPtr)); - - /* Generate the user event. - If no registered clients yet. Remain in the MODEM_CONTROLLED_RESET state - and as soon as the first client subscribes events, the power - off event is generated. */ - if (iUserEventDfcPtr) - { - if (NKern::CurrentContext() == NKern::EInterrupt) - { - iUserEventDfcPtr->Add(); - } - else - { - iUserEventDfcPtr->Enque(); - } - } + /* Now we need to generate events to both user- and kernel side because + the transaction was launched from modem. */ + GenerateEvent((DMC_USER_BIT | DMC_KERNEL_BIT)); } } } @@ -908,39 +986,82 @@ TBootReason::SetTargetStartupMode(iTargetStartupMode); /* Set the user client event type. The type of the event is read - once the iUserEventDfcPtr dfc-queue gets execution time. */ - iEventType = USER_CLIENT_RESET_EVENT; - DmcEvHandApeCent::Unlock(); - - OstTraceExt2(TRACE_FLOW, DMC_EVENT_HAND_APE_CENT_STATE_IDLE_CONNECTION_NOK_2, - "DMC:EH_APE_CEN: StateIdle() - Boot API, iTargetStartupMode: 0x%x, User Event, iEventType: 0x%x", - (TUint)iTargetStartupMode, (TUint)iEventType); - DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - Boot API, iTargetStartupMode: 0x%x, User Event, iEventType: 0x%x"), - iTargetStartupMode, iEventType)); - - OstTrace1(TRACE_FLOW, DMC_EVENT_HAND_APE_CENT_STATE_IDLE_CONNECTION_NOK_3, - "DMC:EH_APE_CEN: StateIdle() - Generate User event, iUserEventDfcPtr: 0x%x", - iUserEventDfcPtr); - DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - Generate User event, iUserEventDfcPtr: 0x%x"), - iUserEventDfcPtr)); - /* Generate the user event. - If no registered clients yet. Remain in the MODEM_UNCONTROLLED_RESET state - and as soon as the first client subscribes events, the power - off event is generated. */ - if (iUserEventDfcPtr) - { - if (NKern::CurrentContext() == NKern::EInterrupt) - { - iUserEventDfcPtr->Add(); - } - else - { - iUserEventDfcPtr->Enque(); - } - } - - // Change the state to MODEM_UNCONTROLLED_RESET - DmcEvHandApeCent::SetNextState(MODEM_UNCONTROLLED_RESET); + once the iUserEventDfcPtr and iKernelEventDfcPtr dfc-queues gets + execution time. */ + iEventType = DMC_CLIENT_RESET_EVENT; + DmcEvHandApeCent::Unlock(); + + OstTraceExt2(TRACE_FLOW, DMC_EVENT_HAND_APE_CENT_STATE_IDLE_CONNECTION_NOK_2, + "DMC:EH_APE_CEN: StateIdle() - Boot API, iTargetStartupMode: 0x%x, User Event, iEventType: 0x%x", + (TUint)iTargetStartupMode, (TUint)iEventType); + DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - Boot API, iTargetStartupMode: 0x%x, User Event, iEventType: 0x%x"), + iTargetStartupMode, iEventType)); + + /* Now we need to generate events to both user- and kernel side because + the transaction was launched from modem. */ + GenerateEvent((DMC_USER_BIT | DMC_KERNEL_BIT)); + + // Change the state to MODEM_UNCONTROLLED_RESET + DmcEvHandApeCent::SetNextState(MODEM_UNCONTROLLED_RESET); + } + break; + + case KERNEL_IF_GENERATE_RESET: + { + OstTrace1(TRACE_FLOW, DMC_EVENT_HAND_APE_CENT_STATE_IDLE_KERN_IF_RESET_1, + "DMC:EH_APE_CEN: StateIdle() - KERNEL_IF_GENERATE_RESET, targetStartUpMode: 0x%x", + (TUint8)*aKernMsgPtr); + DMC_TRACE((("DMC:EH_APE_CEN: StateIdle() - KERNEL_IF_GENERATE_RESET, targetStartUpMode: 0x%x"), + (TUint8)*aKernMsgPtr)); + + DmcEvHandApeCent::Lock(); + iTargetStartupMode = static_cast(*aKernMsgPtr); + TBootReason::SetTargetStartupMode(iTargetStartupMode); + + /* Set the client event type. The type of the event is read + once the iUserEventDfcPtr and/or iKernelEventDfcPtr dfc-queues + gets execution time. */ + iEventType = DMC_CLIENT_RESET_EVENT; + + DmcEvHandApeCent::Unlock(); + + /* Now we need to generate event to user side because + the transaction was launched from the kernel if. */ + GenerateEvent(DMC_USER_BIT); + + /* Change the state to APE_RESET in which we wait a power down + signal from Power Handler.*/ + DmcEvHandApeCent::SetNextState(APE_RESET); + } + break; + + case KERNEL_IF_POWER_OFF: + { + OstTrace0(TRACE_FLOW, DMC_EVENT_HAND_APE_CENT_STATE_IDLE_KERN_IF_PWR_OFF_1, + "DMC:EH_APE_CEN: StateIdle() - KERNEL_IF_POWER_OFF"); + DMC_TRACE(("DMC:EH_APE_CEN: StateIdle() - KERNEL_IF_POWER_OFF")); + + /* Set EStartupModeNone to power off the device. + A device still might do the reset if e.g. a charger is connected, an alarm + occurs or a power key is pressed. This detection is done by "Power Controller". */ + DmcEvHandApeCent::Lock(); + iTargetStartupMode = TBootReason::EStartupModeNone; + TBootReason::SetTargetStartupMode(TBootReason::EStartupModeNone); + + /* Set the client event type. The type of the event is read + once the iUserEventDfcPtr and iKernelEventDfcPtr dfc-queues + gets execution time. */ + iEventType = DMC_CLIENT_POWER_OFF_EVENT; + + DmcEvHandApeCent::Unlock(); + + /* Now we need to generate events to user side because + the transaction was launched from the kernel if. */ + GenerateEvent(DMC_USER_BIT); + + /* Change the state to APE_PWR_OFF in which we wait a power down + signal from Power Handler.*/ + DmcEvHandApeCent::SetNextState(APE_PWR_OFF); } break; @@ -981,9 +1102,6 @@ TBootReason::SetTargetStartupMode(iTargetStartupMode); DmcEvHandApeCent::Unlock(); - // Send indications that we are going to power off. - // Send DMC_POWER_OFF_STARTED_IND - /* Change the state to APE_PWR_OFF in which we wait a power down signal from Power Handler.*/ DmcEvHandApeCent::SetNextState(APE_PWR_OFF); @@ -992,7 +1110,7 @@ default: { - /* Fatal error. */ + /* Fatal error. */ OstTrace1(TRACE_FLOW, DMC_EVENT_HAND_STATE_IDLE_EV_TYPE_DEFAULT, "DMC:EH_APE_CEN: StateIdle() - Illegal event type, aUsrMsgPtr->EventId: %d", aEventType); @@ -1077,7 +1195,7 @@ DmcEvHandApeCent::Unlock(); - DMC_TRACE((("DMC:EH_APE_CEN: StateApePwrOff() - MTC_POWER_OFF, MCE_READY, iModemCurrentState: 0x%x"), + DMC_TRACE((("DMC:EH_APE_CEN: StateApePwrOff() - MTC_POWER_OFF, MCE_READY, iModemCurrentState: 0x%x"), iModemCurrentState)); /* Modem has shut down properly and ready for power off. @@ -1086,7 +1204,7 @@ if (iPowerDownCalled) { DMC_TRACE(("DMC:EH_APE_CEN: StateApePwrOff() - Complete Power Down" )); - + DmcEvHandApeCent::Lock(); /* Make sure that Power Handler is not acknowledged twice. */ iPowerDownCalled = FALSE; @@ -1151,9 +1269,9 @@ OstTrace1(TRACE_FLOW, STATE_APE_PWR_OFF_CASE_2, "DMC:EH_APE_CEN: StateApePwrOff() - MCE_POWER_OFF, MCE_READY, iModemCurrentState: 0x%x", (TUint)iModemCurrentState); - DMC_TRACE((("DMC:EH_APE_CEN: StateApePwrOff() - MCE_POWER_OFF, MCE_READY, iModemCurrentState: 0x%x"), + DMC_TRACE((("DMC:EH_APE_CEN: StateApePwrOff() - MCE_POWER_OFF, MCE_READY, iModemCurrentState: 0x%x"), iModemCurrentState)); - + /* Modem has shut down properly and ready for power off. Acknowledge Power Handler in case it has already called Power Down, oherwise wait Power Down call. */ @@ -1161,7 +1279,7 @@ { OstTrace0(TRACE_FLOW, STATE_APE_PWR_OFF_CASE_3, "DMC:EH_APE_CEN: StateApePwrOff() - Complete Power Down"); DMC_TRACE(("DMC:EH_APE_CEN: StateApePwrOff() - Complete Power Down" )); - + DmcEvHandApeCent::Lock(); /* Make sure that Power Handler is not acknowledged twice. */ iPowerDownCalled = FALSE; @@ -1221,7 +1339,7 @@ OstTrace0(TRACE_FLOW, STATE_APE_PWR_OFF_CASE_MODEM_NOK_2, "DMC:EH_APE_CEN: StateApePwrOff() - Modem power off ready, complete power down"); DMC_TRACE(("DMC:EH_APE_CEN: StateApePwrOff() - Modem power off ready, complete power down")); - + DmcEvHandApeCent::iDmcExtPtr->CompletePowerDown(); } } @@ -1236,7 +1354,7 @@ iModemActionBitMap)); // Complete the power down if the modem power off is ready. - if (iModemActionBitMap & (MODEM_READY | MODEM_CONNECTION_NOT_OK)) + if ((iModemActionBitMap & MODEM_READY) && (iModemActionBitMap & MODEM_CONNECTION_NOT_OK)) { OstTrace0(TRACE_FLOW, STATE_APE_PWR___PWR_HANDLER_2, "DMC:EH_APE_CEN: StateApePwrOff() - Modem power off ready, complete power down"); @@ -1266,7 +1384,7 @@ default: { - /* Fatal error if the event type. */ + /* Fatal error if the event type. */ OstTrace1(TRACE_FLOW, STATE_APE_PWR_OFF_EVENT_TYPE_DEFAULT, "DMC:EH_APE_CEN: StateApePwrOff() - Illegal event type, aEventType: %d", aEventType); @@ -1274,7 +1392,7 @@ aEventType); } break; - } + } OstTrace1(TRACE_ENTRY_EXIT, STATE_APE_PWR_OFF_RETURN, "DMC:EH_APE_CEN: StateApePwrOff() # OUT - ret: %d", ret); @@ -1307,13 +1425,13 @@ case KERNEL_EVENT_ISI: { TUint8 resourceId = aKernMsgPtr[ISI_HEADER_OFFSET_RESOURCEID]; - + OstTrace1(TRACE_FLOW, STATE_APE_RESET_CASE_KRN_EV_1, "DMC:EH_APE_CEN: StateApePwrOff() - resourceId: 0x%x", (TUint)resourceId); DMC_TRACE((("DMC:EH_APE_CEN: StateApeReset() - resource ID: 0x%x: "), resourceId)); -#ifdef USE_MTC_SERVER +#ifdef USE_MTC_SERVER if (resourceId == PN_MTC) { DMC_TRACE(("DMC:EH_APE_CEN: StateApeReset() - PN_MTC")); @@ -1325,10 +1443,10 @@ case MTC_STATE_INFO_IND: { DMC_TRACE(("DMC:EH_APE_CEN: StateApeReset() - MTC_STATE_INFO_IND")); - + TUint8 modemState(MCE_STATE_INIT_VALUE); TUint8 modemAction(MCE_ACTION_INIT_VALUE); - + // Get the modem state and action information MceIsi::MceModemStateInd(aKernMsgPtr, modemState, modemAction); @@ -1344,7 +1462,7 @@ iPowerDownCalled = FALSE; DmcEvHandApeCent::Unlock(); - DMC_TRACE((("DMC:EH_APE_CEN: StateApeReset() - MTC_READY, iModemCurrentState: 0x%x"), + DMC_TRACE((("DMC:EH_APE_CEN: StateApeReset() - MTC_READY, iModemCurrentState: 0x%x"), iModemCurrentState)); /* Modem has shut down properly and ready for power off. @@ -1353,7 +1471,7 @@ if (iPowerDownCalled) { DMC_TRACE(("DMC:EH_APE_CEN: StateApeReset() - Complete Power Down" )); - + DmcEvHandApeCent::Lock(); /* Make sure that Power Handler is not acknowledged twice. */ iPowerDownCalled = FALSE; @@ -1364,15 +1482,15 @@ } } break; - + case MTC_RESET_GENERATE_RESP: { DMC_TRACE(("DMC:EH_APE_CEN: StateApeReset() - MTC_RESET_GENERATE_RESP")); - + MceIsi::MceResetResp(aKernMsgPtr); } break; - + default: { DMC_TRACE((("MCE_ISIMSG:DMC:EH_APE_CEN: StateApeReset - MTC ISI message not supported in this state, messageId: 0x%x"), @@ -1397,10 +1515,10 @@ OstTrace0(TRACE_FLOW, STATE_APE_RESET_CASE_1, "DMC:EH_APE_CEN: StateApeReset() - MCE_MODEM_STATE_IND"); DMC_TRACE(("DMC:EH_APE_CEN: StateApeReset() - MCE_MODEM_STATE_IND")); - + TUint8 modemState(MCE_STATE_INIT_VALUE); TUint8 modemAction(MCE_ACTION_INIT_VALUE); - + // Get the modem state and action information MceIsi::MceModemStateInd(aKernMsgPtr, modemState, modemAction); @@ -1415,11 +1533,11 @@ /* Make sure that Power Handler is not acknowledged twice. */ iPowerDownCalled = FALSE; DmcEvHandApeCent::Unlock(); - + OstTrace1(TRACE_FLOW, STATE_APE_RESET_CASE_2, "DMC:EH_APE_CEN: StateApeReset() - MCE_READY, iModemCurrentState: 0x%x", (TUint)iModemCurrentState); - DMC_TRACE((("DMC:EH_APE_CEN: StateApeReset() - MCE_READY, iModemCurrentState: 0x%x"), + DMC_TRACE((("DMC:EH_APE_CEN: StateApeReset() - MCE_READY, iModemCurrentState: 0x%x"), iModemCurrentState)); /* Modem has shut down properly and ready for power off. @@ -1429,7 +1547,7 @@ { OstTrace0(TRACE_FLOW, STATE_APE_RESET_CASE_3, "DMC:EH_APE_CEN: StateApeReset() - Complete Power Down"); DMC_TRACE(("DMC:EH_APE_CEN: StateApeReset() - Complete Power Down" )); - + DmcEvHandApeCent::Lock(); /* Make sure that Power Handler is not acknowledged twice. */ iPowerDownCalled = FALSE; @@ -1440,7 +1558,7 @@ } } break; - + case MCE_RESET_RESP: { OstTrace0(TRACE_FLOW, STATE_APE_RESET_CASE_5, @@ -1504,7 +1622,8 @@ iPowerDownCalled)); // Complete the power down if the modem power off is ready. - if (iModemActionBitMap & (MODEM_READY | MODEM_CONNECTION_NOT_OK)) + if ((iModemActionBitMap & MODEM_READY) && (iModemActionBitMap & MODEM_CONNECTION_NOT_OK)) + { OstTrace0(TRACE_FLOW, STATE_APE_RESET__PWR_HANDLER_2, "DMC:EH_APE_CEN: StateApeReset() - Modem power off ready, complete power down"); @@ -1534,7 +1653,7 @@ default: { - /* Fatal error if the event type. */ + /* Fatal error if the event type wrong. */ OstTrace1(TRACE_FLOW, STATE_RESET__EVENT_TYPE_CASE_DEFAULT, "DMC:EH_APE_CEN: StateApeReset() - Illegal event type, aEventType: %d", aEventType); @@ -1575,13 +1694,13 @@ case KERNEL_EVENT_ISI: { TUint8 resourceId = aKernMsgPtr[ISI_HEADER_OFFSET_RESOURCEID]; - + OstTrace1(TRACE_FLOW, STATE_MODEM_PWR_OFF_CASE_KRN_EV_1, "DMC:EH_APE_CEN: StateModemPwrOff() - MCE_POWER_OFF, MCE_READY, resourceId: 0x%x", (TUint)resourceId); DMC_TRACE((("DMC:EH_APE_CEN: StateModemPwrOff() - resource ID: 0x%x:"), resourceId)); -#ifdef USE_MTC_SERVER +#ifdef USE_MTC_SERVER if (resourceId == PN_MTC) { DMC_TRACE(("DMC:EH_APE_CEN: StateModemPwrOff() - PN_MTC")); @@ -1593,10 +1712,10 @@ case MTC_STATE_INFO_IND: { DMC_TRACE(("DMC:EH_APE_CEN: StateModemPwrOff() - MTC_STATE_INFO_IND")); - + TUint8 modemState(MCE_STATE_INIT_VALUE); TUint8 modemAction(MCE_ACTION_INIT_VALUE); - + // Get the modem state and action information MceIsi::MceModemStateInd(aKernMsgPtr, modemState, modemAction); @@ -1610,7 +1729,7 @@ DmcEvHandApeCent::Unlock(); - DMC_TRACE((("DMC:EH_APE_CEN: StateModemPwrOff() - MTC_READY, iModemCurrentState: 0x%x"), + DMC_TRACE((("DMC:EH_APE_CEN: StateModemPwrOff() - MTC_READY, iModemCurrentState: 0x%x"), iModemCurrentState)); /* Modem has shut down properly and ready for power off. @@ -1619,7 +1738,7 @@ if (iPowerDownCalled) { DMC_TRACE(("DMC:EH_APE_CEN: StateModemPwrOff() - Complete Power Down" )); - + DmcEvHandApeCent::Lock(); /* Make sure that Power Handler is not acknowledged twice. */ iPowerDownCalled = FALSE; @@ -1630,7 +1749,7 @@ } } break; - + default: { DMC_TRACE((("MCE_ISIMSG:DMC:EH_APE_CEN: StateModemPwrOff - MTC ISI message not supported in this state, messageId: 0x%x"), @@ -1658,7 +1777,7 @@ TUint8 modemState(MCE_STATE_INIT_VALUE); TUint8 modemAction(MCE_ACTION_INIT_VALUE); - + // Get the modem state and action information MceIsi::MceModemStateInd(aKernMsgPtr, modemState, modemAction); @@ -1677,7 +1796,7 @@ OstTrace1(TRACE_FLOW, STATE_MODEM_PWR_OFF_CASE_CASE_2, "DMC:EH_APE_CEN: StateModemPwrOff() - MCE_READY, iModemCurrentState: 0x%x", (TUint)iModemCurrentState); - DMC_TRACE((("DMC:EH_APE_CEN: StateModemPwrOff() - MCE_READY, iModemCurrentState: 0x%x"), + DMC_TRACE((("DMC:EH_APE_CEN: StateModemPwrOff() - MCE_READY, iModemCurrentState: 0x%x"), iModemCurrentState)); /* Modem has shut down properly and ready for reset @@ -1739,7 +1858,7 @@ iModemActionBitMap)); // Complete the power down if the modem power off is ready. - if (iModemActionBitMap & (MODEM_READY | MODEM_CONNECTION_NOT_OK)) + if ((iModemActionBitMap & MODEM_READY) && (iModemActionBitMap & MODEM_CONNECTION_NOT_OK)) { OstTrace0(TRACE_FLOW, STATE_MODEM_PWR_OFF__PWR_HANDLER_2, "DMC:EH_APE_CEN: StateModemPwrOff() - Modem power off ready, complete power down"); @@ -1766,7 +1885,7 @@ default: { - /* Fatal error if the event type. */ + /* Fatal error if the event type. */ OstTrace1(TRACE_FLOW, STATE_MODEM_PWR_OFF__EVENT_TYPE_CASE_DEFAULT, "DMC:EH_APE_CEN: StateModemPwrOff() - Illegal event type, aEventType: %d", aEventType); @@ -1780,7 +1899,7 @@ "DMC:EH_APE_CEN: StateModemPwrOff() # OUT - ret: %d", ret); DMC_TRACE((("DMC:EH_APE_CEN: StateModemPwrOff() # OUT - ret: %d"), ret)); - return ret; + return ret; } @@ -1807,13 +1926,13 @@ case KERNEL_EVENT_ISI: { TUint8 resourceId = aKernMsgPtr[ISI_HEADER_OFFSET_RESOURCEID]; - + OstTrace1(TRACE_FLOW, STATE_MODEM_CONT_RESET_CASE_KRN_EV_1, "DMC:EH_APE_CEN: StateModemControlledReset() - MCE_POWER_OFF, MCE_READY, resourceId: 0x%x", (TUint)resourceId); DMC_TRACE((("DMC:EH_APE_CEN: StateModemControlledReset() - resource ID: 0x%x:"), resourceId)); -#ifdef USE_MTC_SERVER +#ifdef USE_MTC_SERVER if (resourceId == PN_MTC) { DMC_TRACE(("DMC:EH_APE_CEN: StateModemControlledReset() - PN_MTC")); @@ -1844,7 +1963,7 @@ iPowerDownCalled = FALSE; DmcEvHandApeCent::Unlock(); - DMC_TRACE((("DMC:EH_APE_CEN: StateModemControlledReset() - MTC_READY, iModemCurrentState: 0x%x"), + DMC_TRACE((("DMC:EH_APE_CEN: StateModemControlledReset() - MTC_READY, iModemCurrentState: 0x%x"), iModemCurrentState)); /* Modem has shut down properly and ready to power off, @@ -1853,7 +1972,7 @@ } } break; - + default: { DMC_TRACE((("MCE_ISIMSG:DMC:EH_APE_CEN: StateModemControlledReset - MTC ISI message not supported in this state, messageId: 0x%x"), @@ -1881,7 +2000,7 @@ TUint8 modemState(MCE_STATE_INIT_VALUE); TUint8 modemAction(MCE_ACTION_INIT_VALUE); - + // Get the modem state and action information MceIsi::MceModemStateInd(aKernMsgPtr, modemState, modemAction); @@ -1902,7 +2021,7 @@ OstTrace1(TRACE_FLOW, STATE_MODEM_CONT_RESET_CASE_CASE_2, "DMC:EH_APE_CEN: StateModemControlledReset() - MCE_READY, iModemCurrentState: 0x%x", (TUint)iModemCurrentState); - DMC_TRACE((("DMC:EH_APE_CEN: StateModemControlledReset() - MCE_READY, iModemCurrentState: 0x%x"), + DMC_TRACE((("DMC:EH_APE_CEN: StateModemControlledReset() - MCE_READY, iModemCurrentState: 0x%x"), iModemCurrentState)); /* Modem has shut down properly and ready for reset @@ -1960,7 +2079,7 @@ iModemActionBitMap)); // Complete the power down if the modem power off is ready or the communication is not possible. - if (iModemActionBitMap & (MODEM_READY | MODEM_CONNECTION_NOT_OK)) + if ((iModemActionBitMap & iModemActionBitMap) && (iModemActionBitMap & MODEM_CONNECTION_NOT_OK)) { OstTrace0(TRACE_FLOW, STATE_MODEM_CONT_RESET__PWR_HANDLER_2, "DMC:EH_APE_CEN: StateModemControlledReset() - Modem power off ready, complete power down"); @@ -1983,7 +2102,7 @@ default: { - /* Fatal error. */ + /* Fatal error. */ OstTrace1(TRACE_FLOW, STATE_MODEM_CONT_RESET__EVENT_TYPE_CASE_DEFAULT, "DMC:EH_APE_CEN: StateModemControlledReset() - Illegal event type, aEventType: %d", aEventType); @@ -1997,7 +2116,7 @@ "DMC:EH_APE_CEN: StateModemControlledReset() # OUT - ret: %d", ret); DMC_TRACE((("DMC:EH_APE_CEN: StateModemControlledReset() # OUT - ret: %d"), ret)); - return ret; + return ret; } @@ -2058,7 +2177,7 @@ DMC_TRACE((("DMC:EH_APE_CEN: StateModemUncontrolledReset() # OUT - ret: %d"), ret)); - return ret; + return ret; } @@ -2083,11 +2202,11 @@ DmcEvHandApeCent::Lock(); DmcEvHandApeCent::iModemCurrentState = modemCurrentState; DmcEvHandApeCent::Unlock(); - + OstTrace1(TRACE_FLOW, DMC_EVENT_HAND_APE_CENT_HANDLE_MCE_STATE_QUERY_RESP_1, "DMC:EH_APE_CEN: HandleMceModemStateQueryResp() - iModemCurrentState: 0x%02x", DmcEvHandApeCent::iModemCurrentState); - DMC_TRACE((("DMC:EH_APE_CEN: HandleMceModemStateQueryResp() - iModemCurrentState: 0x%02x"), + DMC_TRACE((("DMC:EH_APE_CEN: HandleMceModemStateQueryResp() - iModemCurrentState: 0x%02x"), DmcEvHandApeCent::iModemCurrentState)); } else @@ -2103,6 +2222,93 @@ DMC_TRACE(("DMC:EH_APE_CEN: HandleMceModemStateInd() # OUT")); } +// ----------------------------------------------------------------------------- +// DmcEvHandApeCent::GenerateEvent +// Generates events for user and kernel side. +// ----------------------------------------------------------------------------- +// +void DmcEvHandApeCent::GenerateEvent(const TUint8 aToWhomBitMask) + { + OstTrace1(TRACE_ENTRY_EXIT, DMC_EVENT_HAND_APE_CENT_GEN_EVENT_ENTRY, + "DMC:EH_APE_CEN: GenerateEvent() # IN - aToWhomBitMask: 0x%x", aToWhomBitMask); + DMC_TRACE((("DMC:EH_APE_CEN: GenerateEvent() # IN - aToWhomBitMask: 0x%x"), aToWhomBitMask)); + + if (aToWhomBitMask & DMC_USER_BIT) + { + if (iUserEventDfcPtr) + { + OstTrace1(TRACE_FLOW, DMC_EVENT_HAND_APE_CENT_GEN_EVENT_1, + "DMC:EH_APE_CEN: GenerateEvent() - iUserEventDfcPtr: 0x%x", iUserEventDfcPtr); + DMC_TRACE((("DMC:EH_APE_CEN: GenerateEvent() - Generate User event, iUserEventDfcPtr: 0x%x"), + iUserEventDfcPtr)); + + /* Generate the user event If registered clients exists. */ + if (NKern::CurrentContext() == NKern::EInterrupt) + { + iUserEventDfcPtr->Add(); + } + else + { + iUserEventDfcPtr->Enque(); + } + } + else + { + OstTrace1(TRACE_FLOW, DMC_EVENT_HAND_APE_CENT_GEN_EVENT_2, + "DMC:EH_APE_CEN: GenerateEvent() - iEventType: 0x%x", iEventType); + DMC_TRACE((("DMC:EH_APE_CEN: GenerateEvent() - iEventType: 0x%x"), iEventType)); + + TInt err(KErrGeneral); + + /* This is the situation in which DMC has no clients but a device has to shutdown, thus + generate a switch off restart system event. */ + + if (iEventType == DMC_CLIENT_POWER_OFF_EVENT) + { + OstTrace0(TRACE_FLOW, DMC_EVENT_HAND_APE_CENT_GEN_EVENT_3, + "DMC:EH_APE_CEN: GenerateEvent() - Kern::AddEvent(iSwitchOffEvent)"); + DMC_TRACE((("DMC:EH_APE_CEN: GenerateEvent() - Kern::AddEvent(iSwitchOffEvent)"))); + + err = Kern::AddEvent(iSwitchOffEvent); + DMC_TRACE_ASSERT_RESET(err == KErrNone, "Generating iSwitchOffEvent event failed", err); + } + else + { + OstTrace0(TRACE_FLOW, DMC_EVENT_HAND_APE_CENT_GEN_EVENT_4, + "DMC:EH_APE_CEN: GenerateEvent() - Kern::AddEvent(iResetEvent)"); + DMC_TRACE((("DMC:EH_APE_CEN: GenerateEvent() - Kern::AddEvent(iResetEvent)"))); + + err = Kern::AddEvent(iResetEvent); + DMC_TRACE_ASSERT_RESET(err == KErrNone, "Generating iResetEvent event failed", err); + } + } + } + + if (aToWhomBitMask & DMC_KERNEL_BIT) + { + if (iKernelEventDfcPtr) + { + OstTrace1(TRACE_FLOW, DMC_EVENT_HAND_APE_CENT_GEN_EVENT_5, + "DMC:EH_APE_CEN: GenerateEvent() - iKernelEventDfcPtr: 0x%x", iUserEventDfcPtr); + DMC_TRACE((("DMC:EH_APE_CEN: GenerateEvent() - Generate Kernel event, iKernelEventDfcPtr: 0x%x"), + iKernelEventDfcPtr)); + /* Generate the kernel event if registered kernel clients exists. */ + if (NKern::CurrentContext() == NKern::EInterrupt) + { + iKernelEventDfcPtr->Add(); + } + else + { + iKernelEventDfcPtr->Enque(); + } + } + } + + OstTrace0(TRACE_ENTRY_EXIT, DMC_EVENT_HAND_APE_CENT_GEN_EVENT_RETURN, + "DMC:EH_APE_CEN: GenerateEvent() # OUT"); + DMC_TRACE((("DMC:EH_APE_CEN: GenerateEvent() # OUT"))); + } + // ----------------------------------------------------------------------------- // DmcEvHandApeCent::SetNextState @@ -2154,20 +2360,12 @@ OstTrace1(TRACE_ENTRY_EXIT, DMC_EVENT_HAND_IS_ANY_STATE_ENTRY, "DMC:EH_APE_CEN: IsAnyStateEvent() # IN - aEventType: 0x%x", aEventType); - DMC_TRACE((("DMC:EH_APE_CEN: IsAnyStateEvent() # IN - aType: 0x%x"), aEventType)); + DMC_TRACE((("DMC:EH_APE_CEN: IsAnyStateEvent() # IN - aEventType: 0x%x"), aEventType)); TUint8 bit(0); - - if (aEventType > KERNEL_LAST_KERNEL_EVENT) - { - // User any state event checking - OstTrace0(TRACE_FLOW, DMC_EVENT_HAND_IS_ANY_STATE_1, - "DMC:EH_APE_CEN: HandleEvent() - User event"); - DMC_TRACE((("DMC:EH_APE_CEN: User event"))); - bit = ((iAnyStateMap >> aEventType) & 1); - } + // Only the listed ISI-messages are part of the any state. - else if (aEventType == KERNEL_EVENT_ISI) + if (aEventType == KERNEL_EVENT_ISI) { // Kernel any state event checking OstTrace0(TRACE_FLOW, DMC_EVENT_HAND_IS_ANY_STATE_2, @@ -2175,7 +2373,7 @@ DMC_TRACE((("DMC:EH_APE_CEN: Kernel event"))); /* Check msg ID, which are supported by any state. - A message pointer is already checked in the associated Dfc queue. */ + A message pointer is already checked in the associated Dfc queue. */ TUint8 resourceId = aKernMsgPtr[ISI_HEADER_OFFSET_RESOURCEID]; DMC_TRACE((("DMC:EH_APE_CEN: IsAnyStateEvent() - resource ID: 0x%x: "), resourceId)); @@ -2186,7 +2384,7 @@ DMC_TRACE(("DMC:EH_APE_CEN: IsAnyStateEvent() - PN_MTC")); TUint8 messageId = aKernMsgPtr[ISI_HEADER_OFFSET_MESSAGEID]; - + switch (messageId) { case MTC_STATE_QUERY_RESP: @@ -2196,7 +2394,7 @@ bit = 1; } break; - + default: // nothing to do break; } @@ -2209,7 +2407,7 @@ DMC_TRACE(("DMC:EH_APE_CEN: IsAnyStateEvent() - PN_MODEM_MCE")); TUint8 messageId = aKernMsgPtr[ISI_HEADER_OFFSET_MESSAGEID]; - + switch (messageId) { case MCE_MODEM_STATE_QUERY_RESP: @@ -2221,13 +2419,22 @@ bit = 1; } break; - + default: // nothing to do break; } } #endif // USE_MTC_SERVER } + else + { + // The input was not an ISI-message, check then the anystate bitmap + OstTrace1(TRACE_FLOW, DMC_EVENT_HAND_IS_ANY_STATE_5, + "DMC:EH_APE_CEN: IsAnyStateEvent() - iAnyStateMap: 0x%08x", iAnyStateMap); + DMC_TRACE((("DMC:EH_APE_CEN: IsAnyStateEvent() - iAnyStateMap: 0x%08x"), iAnyStateMap)); + + bit = ((iAnyStateMap >> aEventType) & 1); + } OstTrace1(TRACE_ENTRY_EXIT, DMC_EVENT_HAND_IS_ANY_STATE_RETURN, "DMC:EH_APE_CEN: IsAnyStateEvent() # OUT - bit: 0x%02x", bit); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/devicemodecontroller/dmc_ext/src/dmc_extension.cpp --- a/adaptationlayer/devicemodecontroller/dmc_ext/src/dmc_extension.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/devicemodecontroller/dmc_ext/src/dmc_extension.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -27,6 +27,7 @@ #include "dmc_extension.h" // DDmcExtension #include "dmc_trace.h" #include "dmc_event_handler_ape_cent.h" +#include "dmc_kernel_if.h" #include "OstTraceDefinitions.h" // For Open System Trace #ifdef OST_TRACE_COMPILER_IN_USE @@ -160,6 +161,12 @@ // Register to Power Handler Add(); + OstTrace1(TRACE_FLOW, DDMC_INIT_4, "DMC:KERN_EXTEN: Init() - DmcKernelIf::Init, iDmcExtPtr: 0x%x", + DDmcExtension::iDmcExtPtr); + DMC_TRACE((("DMC:KERN_EXTEN: Init() - DmcKernelIf::Init, iDmcExtPtr: 0x%x"), DDmcExtension::iDmcExtPtr)); + + DmcKernelIf::Init(DDmcExtension::iDmcExtPtr); + OstTrace0(TRACE_FLOW, DDMC_INIT_2, "DMC:KERN_EXTEN: Init() - DIsaKernelAPI::NewF"); DMC_TRACE(("DMC:KERN_EXTEN: Init() - DIsaKernelAPI::NewF")); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/devicemodecontroller/dmc_ext/src/dmc_logical_device.cpp --- a/adaptationlayer/devicemodecontroller/dmc_ext/src/dmc_logical_device.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/devicemodecontroller/dmc_ext/src/dmc_logical_device.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -127,7 +127,7 @@ KErrNoMemory); // Assign the TDfc-queue to the event handler used for event sending. - DmcEvHandApeCent::SubscribeEvents(iUserEventDfcPtr); + DmcEvHandApeCent::SubscribeEvents(DMC_USER_BIT, iUserEventDfcPtr); OstTrace1(TRACE_FLOW, DDMC_LOGICAL_DEVICE_3, @@ -578,13 +578,13 @@ switch (event) { - case USER_CLIENT_POWER_OFF_EVENT: + case DMC_CLIENT_POWER_OFF_EVENT: { eventType = RDmc::EPowerOffEvent; } break; - case USER_CLIENT_RESET_EVENT: + case DMC_CLIENT_RESET_EVENT: { eventType = RDmc::EResetEvent; } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/devicemodecontroller/dmc_ext/src/dmc_mce_isi.cpp --- a/adaptationlayer/devicemodecontroller/dmc_ext/src/dmc_mce_isi.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/devicemodecontroller/dmc_ext/src/dmc_mce_isi.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -259,11 +259,11 @@ "DMC:MCE_ISIMSG: McePowerOff() - trId: %d, status: 0x%x", TUint8(aMsgPtr[ISI_MSG(MTC_POWER_OFF_RESP_OFFSET_TRANSID)]), TUint8(aMsgPtr[ISI_MSG(MTC_POWER_OFF_RESP_OFFSET_STATUS)])); - DMC_TRACE(("DMC:MCE_ISIMSG: McePowerOff() - trId: %d, status: 0x%x"), + DMC_TRACE((("DMC:MCE_ISIMSG: McePowerOff() - trId: %d, status: 0x%x"), TUint8(aMsgPtr[ISI_MSG(MTC_POWER_OFF_RESP_OFFSET_TRANSID)]), - TUint8(aMsgPtr[ISI_MSG(MTC_POWER_OFF_RESP_OFFSET_STATUS)])); + TUint8(aMsgPtr[ISI_MSG(MTC_POWER_OFF_RESP_OFFSET_STATUS)]))); #else // USE_MTC_SERVER - OstTraceExt2(TRACE_FLOW, DMC_MCE_ISI_MCE_POWER_OFF_RESP_1, + OstTraceExt2(TRACE_FLOW, DMC_MCE_ISI_MCE_POWER_OFF_RESP_2, "DMC:MCE_ISIMSG: McePowerOff() - trId: %d, status: 0x%x", TUint8((aMsgPtr[ISI_MSG(MCE_RESET_RESP_OFFSET_TRANSID)])), TUint8(aMsgPtr[ISI_MSG(MCE_RESET_RESP_OFFSET_STATUS)])); @@ -330,15 +330,15 @@ received information. */ #if USE_MTC_SERVER - OstTraceExt2(TRACE_FLOW, DMC_MCE_ISI_MCE_POWER_OFF_RESP_1, + OstTraceExt2(TRACE_FLOW, DMC_MCE_ISI_MCE_POWER_OFF_RESP_3, "DMC:MCE_ISIMSG: MceResetResp() - trId: %d, status: 0x%x", TUint8(aMsgPtr[ISI_MSG(MTC_RESET_GENERATE_RESP_OFFSET_TRANSID)]), TUint8(aMsgPtr[ISI_MSG(MTC_RESET_GENERATE_RESP_OFFSET_STATUS)])); - DMC_TRACE(("DMC:MCE_ISIMSG: MceResetResp() - trId: %d, status: 0x%x"), + DMC_TRACE((("DMC:MCE_ISIMSG: MceResetResp() - trId: %d, status: 0x%x"), TUint8(aMsgPtr[ISI_MSG(MTC_RESET_GENERATE_RESP_OFFSET_TRANSID)]), - TUint8(aMsgPtr[ISI_MSG(MTC_RESET_GENERATE_RESP_OFFSET_STATUS)])); + TUint8(aMsgPtr[ISI_MSG(MTC_RESET_GENERATE_RESP_OFFSET_STATUS)]))); #else // USE_MTC_SERVER - OstTraceExt2(TRACE_FLOW, DMC_MCE_ISI_MCE_POWER_OFF_RESP_1, + OstTraceExt2(TRACE_FLOW, DMC_MCE_ISI_MCE_POWER_OFF_RESP_4, "DMC:MCE_ISIMSG: MceResetResp() - trId: %d, status: 0x%x", TUint8((aMsgPtr[ISI_MSG(MCE_RESET_RESP_OFFSET_TRANSID)])), TUint8(aMsgPtr[ISI_MSG(MCE_RESET_RESP_OFFSET_STATUS)])); @@ -376,7 +376,7 @@ #else // USE_MTC_SERVER aModemState = aMsgPtr[ISI_MSG(MCE_MODEM_STATE_IND_OFFSET_STATE)]; aModemAction = aMsgPtr[ISI_MSG(MCE_MODEM_STATE_IND_OFFSET_ACTION)]; - OstTraceExt3(TRACE_FLOW, DMC_MCE_ISI_MCE_STATE_IND_1, + OstTraceExt3(TRACE_FLOW, DMC_MCE_ISI_MCE_STATE_IND_2, "DMC:MCE_ISIMSG: MceModemStateInd() - trId: %d, aModemState: 0x%x, aModemAction: 0x%x", TUint8(aMsgPtr[ISI_MSG(MCE_MODEM_STATE_IND_OFFSET_TRANSID)]), aModemState, aModemAction); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/devicemodecontroller/group/bld.inf --- a/adaptationlayer/devicemodecontroller/group/bld.inf Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/devicemodecontroller/group/bld.inf Tue Oct 19 13:16:20 2010 +0300 @@ -29,7 +29,8 @@ PRJ_EXPORTS -../rom/devicemodecontroller.iby NON_FOUNDATION_CORE_ADAPT_LAYER_IBY_EXPORT_PATH(devicemodecontroller.iby) +../dmc_ext/inc/dmc_kernel_if.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(dmc_kernel_if.h) +../rom/devicemodecontroller.iby NON_FOUNDATION_CORE_ADAPT_LAYER_IBY_EXPORT_PATH(devicemodecontroller.iby) PRJ_MMPFILES ../dmc_ext/group/dmc.mmp diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/group/bld.inf --- a/adaptationlayer/group/bld.inf Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/group/bld.inf Tue Oct 19 13:16:20 2010 +0300 @@ -22,8 +22,12 @@ BASEDEFAULT #include "../bcaiscadapter/group/bld.inf" +#include "../dataport/group/bld.inf" #include "../devicemodecontroller/group/bld.inf" +#include "../filesystemaccess/group/bld.inf" +#include "../mobileterminalcontroller/group/bld.inf" #include "../modematadaptation/group/bld.inf" +#include "../phoneinfoserver/group/bld.inf" #include "../systemstatemanageradaptation/group/bld.inf" #include "../tsy/group/bld.inf" diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcommon_dll/group/modematcommon_dll.mmp --- a/adaptationlayer/modematadaptation/modematcommon_dll/group/modematcommon_dll.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcommon_dll/group/modematcommon_dll.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -38,6 +38,8 @@ USERINCLUDE ../../modematcontroller_dll/inc USERINCLUDE ../../modematcontroller_exe/inc +USERINCLUDE ../traces + OS_LAYER_SYSTEMINCLUDE NON_FOUNDATION_ADAPT_LAYER_SYSTEMINCLUDE diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcommon_dll/src/modemat_common.cpp --- a/adaptationlayer/modematadaptation/modematcommon_dll/src/modemat_common.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcommon_dll/src/modemat_common.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -18,6 +18,11 @@ #include "modemat_common.h" #include "modemattrace.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "modemat_commonTraces.h" +#endif + _LIT8(KAtNvramStatusCmd, "at&v"); _LIT8(KEchoMode, "*E? *"); @@ -35,6 +40,14 @@ const TInt KNvramCommandLength(20); const TInt KNvramBufLength(1024); +const TInt KReplyTypeOther( 3 ); + +const TInt KEchoOn( 1 ); +const TInt KEchoOff( 2 ); +const TInt KVerboseOn( 3 ); +const TInt KVerboseOff( 4 ); +const TInt KQuietOn( 5 ); +const TInt KQuietOff( 6 ); #define KDefaultBackSpace 8 #define KDefaultLineFeed 10 @@ -42,10 +55,13 @@ #define KDefaultEchoMode 1 #define KDefaultQuietMode 0 #define KDefaultVerboseMode 1 +#define KValueOn 1 +#define KValueOff 0 CModemAtCommon* CModemAtCommon::NewL() { C_TRACE((_L("CModemAtCommon::NewL"))); + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_NEWL, "CModemAtCommon::NewL" ); CModemAtCommon* self = new (ELeave) CModemAtCommon(); CleanupStack::PushL(self); self->ConstructL(); @@ -57,6 +73,7 @@ CModemAtCommon::~CModemAtCommon() { C_TRACE((_L("CModemAtCommon::~CModemAtCommon"))); + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_CMODEMATCOMMON, "CModemAtCommon::~CModemAtCommon" ); iRModemAt.Disconnect(); delete iNvramStatus; iNvramStatus = NULL; @@ -74,18 +91,22 @@ iCommandMode( EIgnore ) { C_TRACE((_L("CModemAtCommon::CModemAtCommon"))); + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATCOMMON_CMODEMATCOMMON, "CModemAtCommon::CModemAtCommon" ); } void CModemAtCommon::ConstructL() { C_TRACE((_L("CModemAtCommon::ConstructL"))); + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_CONSTRUCTL, "CModemAtCommon::ConstructL" ); iNvramStatus = HBufC8::NewL( KNvramBufLength ); C_TRACE((_L("KNvramBufLength : %d"), KNvramBufLength )); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATCOMMON_CONSTRUCTL, "CModemAtCommon::ConstructL;KNvramBufLength=%d", KNvramBufLength ); } void CModemAtCommon::ReportConnectionName( const TDesC8& aName ) { C_TRACE((_L("CModemAtCommon::ReportConnectionName()"))); + OstTraceExt1( TRACE_NORMAL, CMODEMATCOMMON_REPORTCONNECTIONNAME, "CModemAtCommon::ReportConnectionName;aName=%s", aName ); iMediaName = aName; DUMP_MESSAGE(aName); iRModemAt.Connect( ECommonPlugin, iMediaName, this ); @@ -104,6 +125,7 @@ TInt CModemAtCommon::GetMode( TUint aMask, TUint& aMode ) { C_TRACE((_L("CModemAtCommon::GetMode()"))); + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_GETMODE, "CModemAtCommon::GetMode" ); #ifdef _DEBUG PrintModes(); #endif @@ -113,43 +135,52 @@ { aMode |= iEchoMode * KEchoModeBase; C_TRACE((_L("echomode %d"), aMode)); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATCOMMON_GETMODE, "echomode;aMode=%u", aMode ); } if ( aMask & KModeQuiet ) { aMode |= iQuietMode * KQuietModeBase; C_TRACE((_L("quietmode %d"), aMode)); + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATCOMMON_GETMODE, "quietmode;aMode=%u", aMode ); } if ( aMask & KModeVerbose ) { aMode |= iVerboseMode * KVerboseModeBase; C_TRACE((_L("verbosemode %d"), aMode)); + OstTrace1( TRACE_NORMAL, DUP3_CMODEMATCOMMON_GETMODE, "verbosemode;aMode=%u", aMode ); } if ( aMask & KModeCarriage ) { aMode = iCarriageChar; C_TRACE((_L("Carriage return"))); + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATCOMMON_GETMODE, "carriage return" ); } if ( aMask & KModeLineFeed ) { aMode = iLineFeedChar; C_TRACE((_L("line feed"))); + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATCOMMON_GETMODE, "line feed" ); } if ( aMask & KModeBackspace ) { C_TRACE((_L("backspace"))); + OstTrace0( TRACE_NORMAL, DUP6_CMODEMATCOMMON_GETMODE, "backspace" ); aMode = iBackspaceChar; } if( aMode ) { C_TRACE((_L("return KErrNone"))); + OstTrace0( TRACE_NORMAL, DUP7_CMODEMATCOMMON_GETMODE, "return KErrNone" ); return KErrNone; } C_TRACE((_L("return KErrNotSupported"))); + OstTrace0( TRACE_NORMAL, DUP8_CMODEMATCOMMON_GETMODE, "return KErrNotSupported" ); return KErrNotSupported; } TInt CModemAtCommon::ReceiveModeStatusChange() { + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_RECEIVEMODESTATUSCHANGE, "CModemAtCommon::ReceiveModeStatusChange" ); C_TRACE((_L("CModemAtCommon::ReceiveModeStatusChange()"))); iReceiveModeStatusChange++; return KErrNone; @@ -157,6 +188,7 @@ void CModemAtCommon::CancelReceiveModeStatusChange() { + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_CANCELRECEIVEMODESTATUSCHANGE, "CModemAtCommon::CancelReceiveModeStatusChange" ); C_TRACE((_L("CModemAtCommon::CancelReceiveModeStatusChange()"))); if( iReceiveModeStatusChange > 0 ) { @@ -167,6 +199,7 @@ TInt CModemAtCommon::GetNvramStatus( RBuf8& aNvram ) { C_TRACE((_L("CModemAtCommon::GetNvramStatus"))); + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_GETNVRAMSTATUS, "CModemAtCommon::GetNvramStatus" ); TInt retVal ( KErrNone ); TPtr8 response( iNvramStatus->Des() ); TBuf8 cmd; @@ -174,6 +207,7 @@ cmd.Append(iCarriageChar); retVal = iRModemAt.GetNvramStatus( cmd, response ); C_TRACE( (_L("CModemAtCommon::GetNvramStatus Creating response for atext"))); + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATCOMMON_GETNVRAMSTATUS, "CModemAtCommon::GetNvramStatus Creating response for atext" ); aNvram.Create( response ); //atext deletes message return retVal; } @@ -181,6 +215,7 @@ TInt CModemAtCommon::ReceiveNvramStatusChange() { C_TRACE((_L("CModemAtCommon::ReceiveNvramStatusChange()"))); + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_RECEIVENVRAMSTATUSCHANGE, "CModemAtCommon::ReceiveNvramStatusChange" ); iReceiveNvramStatusChange++; return KErrNone; } @@ -188,6 +223,7 @@ void CModemAtCommon::CancelReceiveNvramStatusChange() { C_TRACE((_L("CModemAtCommon::CancelReceiveNvramStatusChange()"))); + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_CANCELRECEIVENVRAMSTATUSCHANGE, "CModemAtCommon::CancelReceiveNvramStatusChange" ); if( iReceiveNvramStatusChange > 0) { iReceiveNvramStatusChange--; @@ -197,6 +233,7 @@ void CModemAtCommon::HandleATCommandCompleted( TInt /*aErr*/ ) { C_TRACE((_L("CModemAtCommon::HandleATCommandCompleted()"))); + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_HANDLEATCOMMANDCOMPLETED, "CModemAtCommon::HandleATCommandCompleted" ); //not used by common plugin } @@ -204,12 +241,14 @@ TBool CModemAtCommon::HasNvramStatusChanged() { C_TRACE((_L("CModemAtCommon::HasNvramStatusChanged"))); + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_HASNVRAMSTATUSCHANGED, "CModemAtCommon::HasNvramStatusChanged" ); HBufC8* oldNvramBuf(NULL); TRAPD( err, oldNvramBuf = HBufC8::NewL( KNvramBufLength ) ); ASSERT_PANIC_ALWAYS( err == KErrNone ); oldNvramBuf->Des().Copy( iNvramStatus->Des() ); C_TRACE((_L("Making AT&V query"))); + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATCOMMON_HASNVRAMSTATUSCHANGED, "Making AT&V query" ); TBuf8 cmd; cmd.Copy( KAtNvramStatusCmd ); cmd.Append( iCarriageChar ); @@ -217,25 +256,40 @@ C_TRACE((_L("Old:"))); TPtr8 oldNvramPtr( oldNvramBuf->Des() ); DUMP_MESSAGE( oldNvramPtr ); - C_TRACE((_L("New:"))); + OstTraceExt1( TRACE_NORMAL, DUP2_CMODEMATCOMMON_HASNVRAMSTATUSCHANGED, "Old:;oldNvramPtr=%s", oldNvramPtr ); + TPtr8 newNvramPtr( iNvramStatus->Des() ); - iRModemAt.GetNvramStatus( cmd, newNvramPtr ); + TInt nvramStatus = iRModemAt.GetNvramStatus( cmd, newNvramPtr ); + if( nvramStatus != KErrNone && + nvramStatus != KReplyTypeOther ) + { + // at&v can't be handled in data mode. Then this is ignored. + C_TRACE((_L("Nvram status NOT changed, pipe is in data mode"))); + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATCOMMON_HASNVRAMSTATUSCHANGED, "Nvram status NOT changed, pipe is in data mode" ); + delete oldNvramBuf; + return EFalse; + } + C_TRACE((_L("New:"))); DUMP_MESSAGE((newNvramPtr)); + OstTraceExt1( TRACE_NORMAL, DUP4_CMODEMATCOMMON_HASNVRAMSTATUSCHANGED, "New:;newNvramPtr=%s", newNvramPtr ); if( oldNvramPtr.Compare( newNvramPtr ) == KErrNone ) { C_TRACE((_L("Nvram status NOT changed"))); + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATCOMMON_HASNVRAMSTATUSCHANGED, "Nvram status NOT changed" ); delete oldNvramBuf; return EFalse; } delete oldNvramBuf; C_TRACE((_L("Nvram status HAS changed"))); + OstTrace0( TRACE_NORMAL, DUP6_CMODEMATCOMMON_HASNVRAMSTATUSCHANGED, "Nvram status HAS changed" ); return ETrue; } TUint CModemAtCommon::GetChangedMode() { C_TRACE((_L("CModemAtCommon::GetChangedMode()"))); + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_GETCHANGEDMODE, "CModemAtCommon::GetChangedMode" ); TUint newMode( 0 ); //mask for mode changes TUint8 oldEchoMode( iEchoMode ); TUint8 oldQuietMode( iQuietMode ); @@ -249,71 +303,180 @@ if( iReceiveModeStatusChange ) { C_TRACE((_L("iReceiveModeStatusChange true"))); + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATCOMMON_GETCHANGEDMODE, "iReceiveModeStatusChange true" ); if (oldEchoMode != iEchoMode) { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATCOMMON_GETCHANGEDMODE, "KEchoModeChanged" ); C_TRACE((_L("KEchoModeChanged"))); newMode |= KEchoModeChanged; newMode |= iEchoMode*KModeEcho; } if (oldQuietMode != iQuietMode) { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATCOMMON_GETCHANGEDMODE, "KQuietModeChanged" ); C_TRACE((_L("KQuietModeChanged"))); newMode |= KQuietModeChanged; newMode |= iQuietMode*KModeQuiet; } if (oldVerboseMode != iVerboseMode) { + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATCOMMON_GETCHANGEDMODE, "KVerboseModeChanged" ); C_TRACE((_L("KVerboseModeChanged"))); newMode |= KVerboseModeChanged; - newMode |= iVerboseMode*KModeVerbose ; + newMode |= iVerboseMode*KModeVerbose; } if (oldCarriageChar != iCarriageChar) { + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATCOMMON_GETCHANGEDMODE, "KCarriageChanged" ); C_TRACE((_L("KCarriageChanged"))); newMode |= KCarriageChanged; + newMode |= iCarriageChar; } if (oldLineFeedChar != iLineFeedChar) { + OstTrace0( TRACE_NORMAL, DUP6_CMODEMATCOMMON_GETCHANGEDMODE, "KLineFeedChanged" ); C_TRACE((_L("KLineFeedChanged"))); newMode |= KLineFeedChanged; + newMode |= iLineFeedChar; } if (oldBackspaceChar != iBackspaceChar) { + OstTrace0( TRACE_NORMAL, DUP7_CMODEMATCOMMON_GETCHANGEDMODE, "KBackspaceChanged" ); C_TRACE((_L("KBackspaceChanged"))); newMode |= KBackspaceChanged; + newMode |= iBackspaceChar; } } return newMode; -} + } void CModemAtCommon::HandleSignalIndication( TInt aErr ) { + OstTrace1( TRACE_NORMAL, CMODEMATCOMMON_HANDLESIGNALINDICATION, "CModemAtCommon::HandleSignalIndication;aErr=%d", aErr ); C_TRACE((_L("CModemAtCommon::HandleSignalIndication(%d)"), aErr)); - if( aErr != KErrNone ) + if( aErr < KErrNone ) { + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATCOMMON_HANDLESIGNALINDICATION, "SignalIndication Error;aErr=%d", aErr ); C_TRACE((_L("SignalIndication Error %d"), aErr )); return; } + else if( aErr > KErrNone ) + { + TBool indicationHandled( EFalse ); + TUint newMode( 0 ); + TUint8 oldEchoMode( iEchoMode ); + TUint8 oldQuietMode( iQuietMode ); + TUint8 oldVerboseMode( iVerboseMode ); + switch( aErr ) + { + case KEchoOff: + { + iEchoMode = KValueOff; + indicationHandled = ETrue; + break; + } + case KEchoOn: + { + iEchoMode = KValueOn; + indicationHandled = ETrue; + break; + } + case KVerboseOn: + { + iVerboseMode = KValueOn; + indicationHandled = ETrue; + break; + } + case KVerboseOff: + { + iVerboseMode = KValueOff; + indicationHandled = ETrue; + break; + } + case KQuietOn: + { + iQuietMode = KValueOn; + indicationHandled = ETrue; + break; + } + case KQuietOff: + { + iQuietMode = KValueOff; + indicationHandled = ETrue; + break; + } + default: + { + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATCOMMON_HANDLESIGNALINDICATION, "SignalIndication Error;aErr=%d", aErr ); + C_TRACE((_L("SignalIndication Error %d"), aErr )); + indicationHandled = EFalse; + break; + } + } + + if( oldEchoMode != iEchoMode ) + { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATCOMMON_HANDLESIGNALINDICATION, "SignalIndication KEchoModeChanged" ); + C_TRACE((_L("SignalIndication KEchoModeChanged"))); + newMode |= KEchoModeChanged; + newMode |= iEchoMode * KModeEcho; + } + if( oldQuietMode != iQuietMode ) + { + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATCOMMON_HANDLESIGNALINDICATION, "SignalIndication KModeQuietChanged" ); + C_TRACE((_L("SignalIndication KQuietModeChanged"))); + newMode |= KQuietModeChanged; + newMode |= iQuietMode * KModeQuiet; + } + if( oldVerboseMode != iVerboseMode ) + { + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATCOMMON_HANDLESIGNALINDICATION, "SignalIndication KVerboseModeChanged" ); + C_TRACE((_L("SignalIndication KVerboseModeChanged"))); + newMode |= KVerboseModeChanged; + newMode |= iVerboseMode * KModeVerbose; + } + + if( indicationHandled ) + { + OstTrace0( TRACE_NORMAL, DUP6_CMODEMATCOMMON_HANDLESIGNALINDICATION, "Indication handled by common plug-in." ); + C_TRACE((_L("Indication handled by common plug-in."))); + if( newMode ) + { + OstTrace0( TRACE_NORMAL, DUP7_CMODEMATCOMMON_HANDLESIGNALINDICATION, "Mode changed" ); + C_TRACE((_L("Mode changed"))); + SendModeStatusChange( newMode ); + } + return; + } + } + + OstTrace0( TRACE_NORMAL, DUP8_CMODEMATCOMMON_HANDLESIGNALINDICATION, "Indication is handled by common plug-in, by using AT&V query." ); + C_TRACE((_L("Indication is handled by common plug-in, by using AT&V query."))); + TBool val = HasNvramStatusChanged(); if( val == EFalse ) { - C_TRACE((_L("HasNvramStatusChanged EFalse"))); + OstTrace0( TRACE_NORMAL, DUP9_CMODEMATCOMMON_HANDLESIGNALINDICATION, "HasNvramStatusChanged EFalse" ); + C_TRACE((_L("HasNvramStatusChanged EFalse"))); return; } //receive nvram status changes if( iReceiveNvramStatusChange ) { // call base class - C_TRACE((_L("iReceiveNvramStatusChange true"))); + OstTrace0( TRACE_NORMAL, DUP10_CMODEMATCOMMON_HANDLESIGNALINDICATION, "iReceiveNvramStatusChange true" ); + C_TRACE((_L("iReceiveNvramStatusChange true"))); SendNvramStatusChange( iNvramStatus->Des() ); iReceiveNvramStatusChange--; } TUint newMode = GetChangedMode(); + OstTrace1( TRACE_NORMAL, DUP11_CMODEMATCOMMON_HANDLESIGNALINDICATION, "newMode;newMode=%x", newMode ); C_TRACE((_L("Newmode 0x%x"),newMode)); if( newMode ) //mode is changed { + OstTrace0( TRACE_NORMAL, DUP12_CMODEMATCOMMON_HANDLESIGNALINDICATION, "Mode changed" ); C_TRACE((_L("Mode changed"))); SendModeStatusChange( newMode ); } @@ -321,6 +484,7 @@ void CModemAtCommon::ParseNvramStatus() { + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_PARSENVRAMSTATUS, "CModemAtCommon::ParseNvramStatus" ); C_TRACE((_L("CModemAtCommon::ParseNvramStatus()"))); TUint8 value; TInt retVal; @@ -342,12 +506,14 @@ retVal = ParseValue(KCarriageChar, CarriageCharOffset, value); if( retVal == KErrNone ) { + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATCOMMON_PARSENVRAMSTATUS, "CModemAtCommon::ParseNvramStatus - iCarriageChar;value=%d", value ); C_TRACE((_L("CModemAtCommon::ParseNvramStatus( ) iCarriageChar %d"), value)); iCarriageChar = value; } retVal = ParseValue(KLineFeedChar, LineFeedCharOffset, value); if( retVal == KErrNone ) { + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATCOMMON_PARSENVRAMSTATUS, "CModemAtCommon::ParseNvramStatus - iLineFeedChar;value=%d", value ); C_TRACE((_L("CModemAtCommon::ParseNvramStatus( ) iLineFeedChar %d"), value)); iLineFeedChar = value; } @@ -363,11 +529,13 @@ TInt CModemAtCommon::ParseValue( const TDesC8& aReg, TInt aPos, TUint8& aValue) { + OstTraceExt3( TRACE_NORMAL, CMODEMATCOMMON_PARSEVALUE, "CModemAtCommon::ParseValue;aReg=%s;aPos=%d;aValue=%p", aReg, aPos, &aValue ); C_TRACE((_L("CModemAtCommon::ParseValue( aPos: %d, aValue: 0x%x"), aPos, &aValue)); DUMP_MESSAGE(aReg); TPtr8 tempPtr(iNvramStatus->Des()); TInt start = tempPtr.Match(aReg); + OstTraceExt2( TRACE_NORMAL, DUP1_CMODEMATCOMMON_PARSEVALUE, "Starting;start=%d;length=%d", start, tempPtr.Length() ); C_TRACE((_L("Starting %d length %d"), start, tempPtr.Length())); if ( start < 0 ) { @@ -377,6 +545,8 @@ TInt firstValueChar = aReg.Locate('?'); TInt valueChars = aReg.LocateReverse('?') - firstValueChar + 1; + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATCOMMON_PARSEVALUE, "Firstvaluechar;firstValueChar=%d", firstValueChar ); + OstTrace1( TRACE_NORMAL, DUP3_CMODEMATCOMMON_PARSEVALUE, "Valuechars;Valuechars=%d", valueChars ); C_TRACE((_L("Firstvaluechar %d"), firstValueChar)); C_TRACE((_L("Valuechars %d"), valueChars)); @@ -388,6 +558,7 @@ TBuf8 valueString; valueString = tempPtr.Mid( start + aPos, valueChars); + OstTraceExt1( TRACE_NORMAL, DUP4_CMODEMATCOMMON_PARSEVALUE, "valueString dump;valueString=%s", valueString ); DUMP_MESSAGE((valueString)); TLex8 lex( valueString ); @@ -395,6 +566,7 @@ if( lex.Val(value) == KErrNone ) { + OstTrace1( TRACE_NORMAL, DUP5_CMODEMATCOMMON_PARSEVALUE, "Value;value=%d", value ); C_TRACE((_L("Value %d"), value)); aValue = value; return KErrNone; @@ -406,6 +578,14 @@ #ifdef _DEBUG void CModemAtCommon::PrintModes() { + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_PRINTMODES, "CModemAtCommon::PrintModes" ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATCOMMON_PRINTMODES, "echo mode;iEchoMode=%d", iEchoMode ); + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATCOMMON_PRINTMODES, "quiet mode;iQuietMode=%d", iQuietMode ); + OstTrace1( TRACE_NORMAL, DUP3_CMODEMATCOMMON_PRINTMODES, "verbose mode;iVerboseMode=%d", iVerboseMode ); + OstTrace1( TRACE_NORMAL, DUP4_CMODEMATCOMMON_PRINTMODES, "Carriagechar mode;iCarriageChar=%d", iCarriageChar ); + OstTrace1( TRACE_NORMAL, DUP5_CMODEMATCOMMON_PRINTMODES, "Linefeed char;iLineFeedChar=%d", iLineFeedChar ); + OstTrace1( TRACE_NORMAL, DUP7_CMODEMATCOMMON_PRINTMODES, "Backspace mode;iBackspaceChar=%d", iBackspaceChar ); + OstTrace1( TRACE_NORMAL, DUP8_CMODEMATCOMMON_PRINTMODES, "Command mode;iCommandMode=%d", (TInt)iCommandMode ); C_TRACE((_L("CModemAtCommon::PrintModes"))); C_TRACE((_L("echo mode %d"), iEchoMode)); C_TRACE((_L("quiet mode %d"), iQuietMode)); @@ -419,12 +599,14 @@ void CModemAtCommon::HandleUnsolicitedResultReceived(TInt /*aErr*/) { + OstTrace0( TRACE_NORMAL, CMODEMATCOMMON_HANDLEUNSOLICITEDRESULTRECEIVED, "CModemAtCommon::HandleUnsolicitedResultReceived - ignored" ); C_TRACE((_L("CModemAtCommon::HandleUnsolicitedResultReceived - ignored"))); //unsolicitedresult is handled in atext-plugin } void CModemAtCommon::HandleCommandModeChanged( TInt aErr, TCommandMode aMode ) { + OstTraceExt2( TRACE_NORMAL, CMODEMATCOMMON_HANDLECOMMANDMODECHANGED, "CModemAtCommon::HandleCommandModeChanged;aErr=%d;aMode=%d", aErr, aMode ); C_TRACE((_L("CModemAtCommon::HandleCommandModeChanged( aErr: %d, aMode: %d) "), aErr, aMode)); iCommandMode = aMode; TUint mode( 0 ); @@ -434,6 +616,7 @@ C_TRACE((_L("Not EDataMode"))); mode |= KModeCommand; } + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATCOMMON_HANDLECOMMANDMODECHANGED, "COMMON PLUGIN SendModeStatusChange:;mode=%x", mode ); C_TRACE((_L("COMMON PLUGIN SendModeStatusChange: 0x%x"), mode)); SendModeStatusChange( mode ); } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_dll/group/modematcontroller_dll.mmp --- a/adaptationlayer/modematadaptation/modematcontroller_dll/group/modematcontroller_dll.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_dll/group/modematcontroller_dll.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -41,7 +41,7 @@ USERINCLUDE ../inc USERINCLUDE ../../modematcontroller_exe/inc - +USERINCLUDE ../traces OS_LAYER_SYSTEMINCLUDE diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_dll/src/catcommandreq.cpp --- a/adaptationlayer/modematadaptation/modematcontroller_dll/src/catcommandreq.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_dll/src/catcommandreq.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -21,6 +21,10 @@ #include "modemattrace.h" #include "modematclientsrv.h" #include "rmodematcontroller.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "catcommandreqTraces.h" +#endif CAtCommandReq::CAtCommandReq( RModemAtController* aClient, const TDesC8& aCommand, @@ -28,6 +32,8 @@ CActive(EPriorityNormal), iClient(aClient) { + OstTraceExt3( TRACE_NORMAL, CATCOMMANDREQ_CATCOMMANDREQ, "CAtCommandReq::CAtCommandReq;aClient=%p;aCommand=%p;aResponse=%p", aClient, &aCommand, &aResponse ); + OstTraceExt1( TRACE_NORMAL, DUP2_CATCOMMANDREQ_CATCOMMANDREQ, "CAtCommandReq::CAtCommandReq - ;aCommand=%s", aCommand ); C_TRACE((_L("CAtCommandReq::CAtCommandReq(0x%x, 0x%x, 0x%x) "), aClient, &aCommand, &aResponse)); DUMP_MESSAGE( aCommand ); CActiveScheduler::Add( this ); @@ -37,19 +43,22 @@ CAtCommandReq::~CAtCommandReq() { + OstTrace0( TRACE_NORMAL, DUP1_CATCOMMANDREQ_CATCOMMANDREQ, "CAtCommandReq::~CAtCommandReq" ); C_TRACE((_L("CAtCommandReq::~CAtCommandReq()"))); Cancel(); } void CAtCommandReq::RunL() { - C_TRACE((_L("CAtCommandReq::RunL()"))); + OstTrace1( TRACE_NORMAL, CATCOMMANDREQ_RUNL, "CAtCommandReq::RunL() complete;iStatus.Int()=%d", iStatus.Int() ); + C_TRACE((_L("CAtCommandReq::RunL() complete: %d"), iStatus.Int())); iClient->ATCommandResponseReceived( iStatus.Int() ); delete this; } void CAtCommandReq::DoCancel() { + OstTrace0( TRACE_NORMAL, CATCOMMANDREQ_DOCANCEL, "CAtCommandReq::DoCancel" ); C_TRACE((_L("CAtCommandReq::DoCancel()"))); iClient->SendReceiveAtCommandCancel(); C_TRACE((_L("Status: %d"), iStatus.Int())); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_dll/src/ccommandmodereq.cpp --- a/adaptationlayer/modematadaptation/modematcontroller_dll/src/ccommandmodereq.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_dll/src/ccommandmodereq.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -21,6 +21,10 @@ #include "modemattrace.h" #include "modematclientsrv.h" #include "rmodematcontroller.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "ccommandmodereqTraces.h" +#endif const TUint KCommandModeBufLength = 1; @@ -30,6 +34,7 @@ iResponseBuf(NULL), iResponse(NULL,0) { + OstTrace0( TRACE_NORMAL, CCOMMANDMODEREQ_CCOMMANDMODEREQ, "CCommandModeReq::CCommandModeReq" ); C_TRACE((_L("CCommandModeReq::CCommandModeReq()"))); CActiveScheduler::Add( this ); iResponseBuf = HBufC8::NewL( KCommandModeBufLength ); @@ -40,6 +45,7 @@ CCommandModeReq::~CCommandModeReq() { + OstTrace0( TRACE_NORMAL, DUP1_CCOMMANDMODEREQ_CCOMMANDMODEREQ, "CCommandModeReq::~CCommandModeReq" ); C_TRACE((_L("CCommandModeReq::~CCommandModeReq()"))); Cancel(); delete iResponseBuf; @@ -48,6 +54,7 @@ void CCommandModeReq::RunL() { + OstTrace0( TRACE_NORMAL, CCOMMANDMODEREQ_RUNL, "CCommandModeReq::RunL" ); C_TRACE((_L("CCommandModeReq::RunL()"))); if( iStatus.Int() == KErrNone ) @@ -57,6 +64,7 @@ TInt mode( 0 ); if( lex.Val( mode ) == KErrNone ) { + OstTrace1( TRACE_NORMAL, DUP1_CCOMMANDMODEREQ_RUNL, "CCommandModeReq command mode;mode=%d;changed", mode ); C_TRACE((_L("CCommandModeReq command mode %d changed"), mode)); iClient->CommandModeChanged( iStatus.Int(), (TCommandMode) mode ); // Start receiving again @@ -66,12 +74,14 @@ } else { + OstTrace1( TRACE_NORMAL, DUP2_CCOMMANDMODEREQ_RUNL, "CCommandModeReq RunL lex failed;lex.Val( mode )=%d", lex.Val( mode ) ); C_TRACE((_L("CCommandModeReq RunL lex failed %d"), lex.Val( mode ))); delete this; } } else if( iStatus.Int() == KErrCancel ) { + OstTrace0( TRACE_NORMAL, DUP3_CCOMMANDMODEREQ_RUNL, "CCommandModeReq RunL cancelled - delete" ); C_TRACE((_L("CCommandModeReq RunL cancelled - delete"))); delete this; } @@ -79,6 +89,7 @@ void CCommandModeReq::DoCancel() { + OstTrace0( TRACE_NORMAL, CCOMMANDMODEREQ_DOCANCEL, "CCommandModeReq::DoCancel" ); C_TRACE((_L("CCommandModeReq::DoCancel()"))); iClient->SendReceiveCommandModeCancel(); } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_dll/src/csignalindreq.cpp --- a/adaptationlayer/modematadaptation/modematcontroller_dll/src/csignalindreq.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_dll/src/csignalindreq.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -21,12 +21,17 @@ #include "modemattrace.h" #include "modematclientsrv.h" #include "rmodematcontroller.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "csignalindreqTraces.h" +#endif CSignalIndReq::CSignalIndReq( RModemAtController* aClient) : CActive(EPriorityNormal), iClient(aClient) { + OstTrace1( TRACE_NORMAL, CSIGNALINDREQ_CSIGNALINDREQ, "CSignalIndReq::CSignalIndReq;aClient=%x", aClient ); C_TRACE((_L("CSignalIndReq::CSignalIndReq(0x%x)"), aClient)); CActiveScheduler::Add( this ); aClient->SendReceiveSignalInd( iStatus ); @@ -35,28 +40,33 @@ CSignalIndReq::~CSignalIndReq() { + OstTrace0( TRACE_NORMAL, DUP1_CSIGNALINDREQ_CSIGNALINDREQ, "CSignalIndReq::~CSignalIndReq" ); C_TRACE((_L("CSignalIndReq::~CSignalIndReq()"))); Cancel(); } void CSignalIndReq::DoCancel() { + OstTrace0( TRACE_NORMAL, CSIGNALINDREQ_DOCANCEL, "CSignalIndReq::DoCancel" ); C_TRACE((_L("CSignalIndReq::DoCancel()"))); iClient->SendReceiveSignalIndCancel(); } void CSignalIndReq::RunL() { + OstTrace0( TRACE_NORMAL, CSIGNALINDREQ_RUNL, "CSignalIndReq::RunL" ); C_TRACE((_L("CSignalIndReq::RunL()"))); - if( iStatus.Int() == KErrNone ) + if( iStatus.Int() == KErrNone || iStatus.Int() > 0 ) { - C_TRACE((_L("KErrNone %d"), iStatus.Int())); + OstTrace1( TRACE_NORMAL, DUP1_CSIGNALINDREQ_RUNL, "CSignalIndReq::RunL - Completing with;iStatus.Int()=%d", iStatus.Int() ); + C_TRACE((_L("Completing with %d"), iStatus.Int())); iClient->SignalIndReceived( iStatus.Int() ); iClient->SendReceiveSignalInd( iStatus ); SetActive(); } - else + else { + OstTrace1( TRACE_NORMAL, DUP2_CSIGNALINDREQ_RUNL, "CSignalIndReq::RunL - delete;iStatus.Int()=%d", iStatus.Int() ); C_TRACE((_L("CSignalIndReq RunL delete %d"), iStatus.Int())); delete this; } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_dll/src/cunsoliciteddatareq.cpp --- a/adaptationlayer/modematadaptation/modematcontroller_dll/src/cunsoliciteddatareq.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_dll/src/cunsoliciteddatareq.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -21,12 +21,17 @@ #include "modemattrace.h" #include "modematclientsrv.h" #include "rmodematcontroller.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cunsoliciteddatareqTraces.h" +#endif CUnsolicitedDataReq::CUnsolicitedDataReq( RModemAtController* aClient, TDes8& aResponse ) : CActive(EPriorityNormal), iClient(aClient), iResponse(aResponse) { + OstTrace1( TRACE_NORMAL, CUNSOLICITEDDATAREQ_CUNSOLICITEDDATAREQ, "CUnsolicitedDataReq::CUnsolicitedDataReq;aClient=%x", aClient ); C_TRACE((_L("CUnsolicitedDataReq::CUnsolicitedDataReq(aClient: 0x%x this: 0x%x)"), aClient, this)); CActiveScheduler::Add( this ); aClient->SendReceiveUnsolicitedResult(aResponse,iStatus); @@ -35,23 +40,28 @@ CUnsolicitedDataReq::~CUnsolicitedDataReq() { + OstTrace0( TRACE_NORMAL, DUP1_CUNSOLICITEDDATAREQ_CUNSOLICITEDDATAREQ, "CUnsolicitedDataReq::~CUnsolicitedDataReq" ); C_TRACE((_L("CUnsolicitedDataReq::~CUnsolicitedDataReq()"))); Cancel(); } void CUnsolicitedDataReq::RunL() { + OstTrace0( TRACE_NORMAL, CUNSOLICITEDDATAREQ_RUNL, "CUnsolicitedDataReq::RunL" ); C_TRACE((_L("CUnsolicitedDataReq::RunL()"))); if( iStatus.Int() == KErrNone ) { + OstTrace1( TRACE_NORMAL, DUP1_CUNSOLICITEDDATAREQ_RUNL, "iClient->UnsolicitedResultReceive;this=%x", this ); C_TRACE((_L("CUnsolicitedDataReq iClient->UnsolicitedResultReceive this: 0x%x"), this)); iClient->UnsolicitedResultReceived(iStatus.Int()); + OstTrace1( TRACE_NORMAL, DUP2_CUNSOLICITEDDATAREQ_RUNL, "CUnsolicitedDataReq::RunL - starting again;iStatus.Int()=%d", iStatus.Int() ); C_TRACE((_L("CUnsolicitedDataReq RunL starting again %d"), iStatus.Int())); iClient->SendReceiveUnsolicitedResult( iResponse, iStatus ); SetActive(); } else { + OstTrace1( TRACE_NORMAL, DUP3_CUNSOLICITEDDATAREQ_RUNL, "CUnsolicitedDataReq::RunL - deleting instance;this=%x", this ); C_TRACE((_L("CUnsolicitedDataReq::RunL() deleting instance this: 0x%x"), this)); delete this; } @@ -59,6 +69,7 @@ void CUnsolicitedDataReq::DoCancel() { + OstTrace0( TRACE_NORMAL, CUNSOLICITEDDATAREQ_DOCANCEL, "CUnsolicitedDataReq::DoCancel" ); C_TRACE((_L("CUnsolicitedDataReq::DoCancel"))); iClient->SendReceiveUnsolicitedResulCancel(); } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_dll/src/rmodematcontroller.cpp --- a/adaptationlayer/modematadaptation/modematcontroller_dll/src/rmodematcontroller.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_dll/src/rmodematcontroller.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -25,6 +25,11 @@ #include "cunsoliciteddatareq.h" #include "csignalindreq.h" #include "ccommandmodereq.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "rmodematcontrollerTraces.h" +#endif + _LIT( KATExtSrvExe, "modematcontroller.exe" ); const TUid KATExtSrvUid3 = { 0x2001FCB1 }; @@ -37,11 +42,13 @@ iSignalIndReq( NULL ), iCommandModeReq( NULL ) { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_RMODEMATCONTROLLER, "RModemAtController::RModemAtController" ); C_TRACE((_L("RModemAtController::RModemAtController()"))); } EXPORT_C RModemAtController::~RModemAtController() { + OstTrace0( TRACE_NORMAL, DUP1_RMODEMATCONTROLLER_RMODEMATCONTROLLER, "RModemAtController::~RModemAtController" ); C_TRACE((_L("RModemAtController::~RModemAtController()"))); if( iUnsolicitedDataReq || iAtRequest || iSignalIndReq || iCommandModeReq ) { @@ -50,11 +57,13 @@ #ifdef _DEBUG RThread thisRt; TInt count = thisRt.RequestCount(); + OstTrace1( TRACE_NORMAL, DUP2_RMODEMATCONTROLLER_RMODEMATCONTROLLER, "RModemAtController::~RModemAtController - >RequestCount;count=%d", count ); C_TRACE((_L(">RequestCount %d "), count)); #endif #ifdef _DEBUG count = thisRt.RequestCount(); + OstTrace1( TRACE_NORMAL, DUP3_RMODEMATCONTROLLER_RMODEMATCONTROLLER, "RModemAtController::~RModemAtController - RequestCount;count=%d", count ); C_TRACE((_L(">RequestCount %d "), count)); #endif TVersion version( KServerMajorVersionNumber, @@ -81,6 +92,7 @@ TInt retVal = CreateSession( KATExtSrvName, version); if ( retVal != KErrNone && retVal != KErrAlreadyExists ) { + OstTrace0( TRACE_NORMAL, DUP2_RMODEMATCONTROLLER_CONNECT, "RModemAtController::Connect - StartServer" ); C_TRACE((_L("RModemAtController::Connect StartServer"))); retVal = StartServer(); if ( retVal == KErrNone || retVal==KErrAlreadyExists ) @@ -89,6 +101,7 @@ } } + OstTrace1( TRACE_NORMAL, DUP3_RMODEMATCONTROLLER_CONNECT, "RModemAtController::Connect - CreateSession returned;retVal=%d", retVal ); C_TRACE((_L("RModemAtController::Connect CreateSession returned: %d "), retVal)); if ( retVal == KErrNone || retVal == KErrAlreadyExists ) @@ -102,25 +115,30 @@ GetCommandMode(); } + OstTrace1( TRACE_NORMAL, DUP4_RMODEMATCONTROLLER_CONNECT, "RModemAtController::Connect - EATExtSetExtensionInterface returned:;retVal=%d", retVal ); C_TRACE((_L("RModemAtController::Connect EATExtSetExtensionInterface returned: %d "), retVal)); if( retVal == KErrAlreadyExists ) { + OstTrace0( TRACE_NORMAL, DUP5_RMODEMATCONTROLLER_CONNECT, "RModemAtController::Connect - Modem is already connected, session is ok" ); C_TRACE( _L("RModemAtController::Connect Modem is already connected, session is ok") ); retVal = KErrNone; } if( retVal == KErrServerTerminated) { + OstTrace0( TRACE_NORMAL, DUP6_RMODEMATCONTROLLER_CONNECT, "RModemAtController::Connect - Connection failed, server has terminated" ); C_TRACE( _L("RModemAtController::Connect Connection failed, server has terminated") ); } } if ( retVal != KErrNone ) { + OstTrace0( TRACE_NORMAL, DUP7_RMODEMATCONTROLLER_CONNECT, "RModemAtController::Connect - Closing session" ); C_TRACE( _L("RModemAtController::Connect Closing session") ); Close(); } #ifdef _DEBUG count = thisRt.RequestCount(); + OstTrace1( TRACE_NORMAL, DUP8_RMODEMATCONTROLLER_CONNECT, "RModemAtController::Connect - RequestCount;count=%d", count ); C_TRACE((_L(">RequestCount %d "), count)); #endif + OstTrace1( TRACE_NORMAL, DUP2_RMODEMATCONTROLLER_DISCONNECT, "RModemAtController::Disconnect - session base handle:;Handle()=%d", Handle() ); C_TRACE((_L("RModemAtController session base handle: %d "), Handle())); - if( Handle() ) - { - C_TRACE((_L("RModemAtController::Disconnect() remove pipe"))); - SendReceiveRemovePipe(); - } ReceiveSignalIndCancel( ); GetCommandModeCancel(); ReceiveUnsolicitedResultCancel(); HandleATCommandCancel(); - Close(); + if( Handle() ) + { + OstTrace0( TRACE_NORMAL, DUP3_RMODEMATCONTROLLER_DISCONNECT, "RModemAtController::Disconnect - remove pipe" ); + C_TRACE((_L("RModemAtController::Disconnect() remove pipe"))); + SendReceiveRemovePipe(); + Close(); + } #ifdef _DEBUG count = thisRt.RequestCount(); + OstTrace1( TRACE_NORMAL, DUP4_RMODEMATCONTROLLER_DISCONNECT, "RModemAtController::Disconnect - Cancel(); delete iAtRequest; @@ -188,6 +214,7 @@ EXPORT_C TInt RModemAtController::ReceiveSignalInd() { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_RECEIVESIGNALIND, "RModemAtController::ReceiveSignalInd" ); C_TRACE((_L("RModemAtController::ReceiveSignalInd"))); if( iSignalIndReq ) { @@ -202,9 +229,11 @@ EXPORT_C TInt RModemAtController::ReceiveSignalIndCancel( ) { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_RECEIVESIGNALINDCANCEL, "RModemAtController::ReceiveSignalIndCancel" ); C_TRACE((_L("RModemAtController::ReceiveSignalIndCancel"))); if( iSignalIndReq ) { + OstTrace0( TRACE_NORMAL, DUP1_RMODEMATCONTROLLER_RECEIVESIGNALINDCANCEL, "RModemAtController::ReceiveSignalIndCancel - Cancelling..." ); C_TRACE((_L("Canceling...") )); iSignalIndReq->Cancel(); delete iSignalIndReq; @@ -215,11 +244,13 @@ EXPORT_C TInt RModemAtController::ReceiveUnsolicitedResult( TDes8& aResult ) { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_RECEIVEUNSOLICITEDRESULT, "RModemAtController::ReceiveUnsolicitedResult" ); C_TRACE((_L("RModemAtController::ReceiveUnsolicitedResult"))); if( iUnsolicitedDataReq ) { - TRACE_ASSERT_ALWAYS; - return KErrAlreadyExists; + OstTrace0( TRACE_NORMAL, DUP1_RMODEMATCONTROLLER_RECEIVEUNSOLICITEDRESULT, "RModemAtController::ReceiveUnsolicitedResult - cancel previous request" ); + C_TRACE((_L("RModemAtController::ReceiveUnsolicitedResult (cancel previous request)"))); + ReceiveUnsolicitedResultCancel(); } TRAPD( err, iUnsolicitedDataReq = new (ELeave) CUnsolicitedDataReq( this, aResult ) ); ASSERT_PANIC_ALWAYS( err == KErrNone ); @@ -228,9 +259,11 @@ EXPORT_C TInt RModemAtController::ReceiveUnsolicitedResultCancel( ) { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_RECEIVEUNSOLICITEDRESULTCANCEL, "RModemAtController::ReceiveUnsolicitedResultCancel" ); C_TRACE((_L("RModemAtController::ReceiveUnsolicitedResultCancel"))); if( iUnsolicitedDataReq ) { + OstTrace0( TRACE_NORMAL, DUP1_RMODEMATCONTROLLER_RECEIVEUNSOLICITEDRESULTCANCEL, "RModemAtController::ReceiveUnsolicitedResultCancel - Canceling..." ); C_TRACE((_L("Canceling..."))); iUnsolicitedDataReq->Cancel(); delete iUnsolicitedDataReq; @@ -241,6 +274,7 @@ EXPORT_C TInt RModemAtController::GetNvramStatus(TDesC8& aCommand, TDes8& aResponse ) { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_GETNVRAMSTATUS, "RModemAtController::GetNvramStatus" ); C_TRACE((_L("RModemAtController::GetNvramStatus"))); aResponse = _L8(""); //ensure, that response buffer is empty TInt status = SendReceive( EModemATGetNvramStatus, TIpcArgs(&aCommand, &aResponse)); @@ -250,6 +284,7 @@ EXPORT_C TInt RModemAtController::GetCommandMode() { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_GETCOMMANDMODE, "RModemAtController::GetCommandMode" ); C_TRACE((_L("RModemAtController::GetCommandMode"))); if( iCommandModeReq ) @@ -264,9 +299,11 @@ EXPORT_C TInt RModemAtController::GetCommandModeCancel() { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_GETCOMMANDMODECANCEL, "RModemAtController::GetCommandModeCancel" ); C_TRACE((_L("RModemAtController::GetCommandMode"))); if( iCommandModeReq ) { + OstTrace0( TRACE_NORMAL, DUP1_RMODEMATCONTROLLER_GETCOMMANDMODECANCEL, "RModemAtController::GetCommandModeCancel - Canceling..." ); C_TRACE((_L("Canceling..."))); iCommandModeReq->Cancel(); delete iCommandModeReq; @@ -277,6 +314,7 @@ EXPORT_C TInt RModemAtController::RemovePipe() { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_REMOVEPIPE, "RModemAtController::RemovePipe" ); C_TRACE((_L("RModemAtController::RemovePipe"))); SendReceiveRemovePipe(); return KErrNone; @@ -288,18 +326,21 @@ TDes8& aResponse, TRequestStatus& aStatus ) { + OstTraceExt2( TRACE_NORMAL, RMODEMATCONTROLLER_SENDRECEIVEATCOMMAND, "RModemAtController::SendReceiveATCommand;aCommand.Length()=%d;aResponse.Length()=%d", aCommand.Length(), aResponse.Length() ); C_TRACE((_L("RModemAtController::SendReceiveATCommand acommand len=%d aresponse len=%d"), aCommand.Length(), aResponse.Length() )); SendReceive( EModemATHandleCommand, TIpcArgs(&aCommand, &aResponse), aStatus); } void RModemAtController::SendReceiveUnsolicitedResult( TDes8& aResponse,TRequestStatus& aStatus) { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_SENDRECEIVEUNSOLICITEDRESULT, "RModemAtController::SendReceiveUnsolicitedResult" ); C_TRACE((_L("RModemAtController::SendReceiveUnsolicitedResult"))); SendReceive( EReceiveUnsolicitedResult, TIpcArgs(&aResponse), aStatus); } void RModemAtController::SendReceiveUnsolicitedResulCancel() { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_SENDRECEIVEUNSOLICITEDRESULCANCEL, "RModemAtController::SendReceiveUnsolicitedResulCancel" ); C_TRACE((_L("RModemAtController::SendReceiveUnsolicitedResulCancel"))); TInt i = 0; SendReceive( EReceiveUnsolicitedResultCancel, TIpcArgs(i) ); @@ -307,6 +348,7 @@ void RModemAtController::SendReceiveSignalInd(TRequestStatus& aStatus) { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_SENDRECEIVESIGNALIND, "RModemAtController::SendReceiveSignalInd" ); C_TRACE((_L("RModemAtController::SendReceiveSignalInd()"))); TInt value = 0; SendReceive( EModemATReceiveSignalInd, TIpcArgs(&value),aStatus); @@ -314,6 +356,7 @@ void RModemAtController::SendReceiveAtCommandCancel() { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_SENDRECEIVEATCOMMANDCANCEL, "RModemAtController::SendReceiveAtCommandCancel" ); C_TRACE((_L("RModemAtController::SendReceiveAtCommandCancel()"))); TInt i=0; SendReceive( EModemATHandleCommandCancel,TIpcArgs(i)); @@ -321,12 +364,14 @@ void RModemAtController::SignalIndReceived( TInt aErr ) { + OstTrace1( TRACE_NORMAL, RMODEMATCONTROLLER_SIGNALINDRECEIVED, "RModemAtController::SignalIndReceived;aErr=%d", aErr ); C_TRACE((_L("RModemAtController::SignalIndReceived(%d)"), aErr)); iObserver->HandleSignalIndication( aErr ); } void RModemAtController::SendReceiveSignalIndCancel() { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_SENDRECEIVESIGNALINDCANCEL, "RModemAtController::SendReceiveSignalIndCancel" ); C_TRACE((_L("RModemAtController::SendReceiveSignalIndCancel()"))); TInt value = 0; SendReceive( EModemATReceiveSignalIndCancel, TIpcArgs(&value)); @@ -334,6 +379,7 @@ void RModemAtController::ATCommandResponseReceived( TInt aErr ) { + OstTrace1( TRACE_NORMAL, RMODEMATCONTROLLER_ATCOMMANDRESPONSERECEIVED, "RModemAtController::ATCommandResponseReceived;aErr=%d", aErr ); C_TRACE((_L("RModemAtController::ATCommandResponseReceived(%d)"), aErr)); iObserver->HandleATCommandCompleted(aErr); iAtRequest = NULL; @@ -341,18 +387,21 @@ void RModemAtController::UnsolicitedResultReceived( TInt aErr ) { + OstTrace1( TRACE_NORMAL, RMODEMATCONTROLLER_UNSOLICITEDRESULTRECEIVED, "RModemAtController::UnsolicitedResultReceived;aErr=%d", aErr ); C_TRACE((_L("RModemAtController::UnsolicitedResultReceived(%d)"), aErr)); iObserver->HandleUnsolicitedResultReceived( aErr ); } void RModemAtController::SendReceiveCommandMode(TDes8& aResponse, TRequestStatus& aStatus) { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_SENDRECEIVECOMMANDMODE, "RModemAtController::SendReceiveCommandMode" ); C_TRACE((_L("RModemAtController::SendReceiveCommandMode()"))); SendReceive( EModemATCommandMode, TIpcArgs(&aResponse), aStatus); } void RModemAtController::SendReceiveCommandModeCancel() { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_SENDRECEIVECOMMANDMODECANCEL, "RModemAtController::SendReceiveCommandModeCancel" ); C_TRACE((_L("RModemAtController::SendReceiveCommandModeCancel()"))); TInt value = 0; SendReceive( EModemATCommandModeCancel, TIpcArgs(&value)); @@ -360,12 +409,14 @@ void RModemAtController::CommandModeChanged( TInt aErr, TCommandMode aMode ) { + OstTraceExt2( TRACE_NORMAL, RMODEMATCONTROLLER_COMMANDMODECHANGED, "RModemAtController::CommandModeChanged;aErr=%d;aMode=%d", aErr, aMode ); C_TRACE((_L("RModemAtController::CommandModeChanged(%d, %d)"), aErr, aMode)); iObserver->HandleCommandModeChanged( aErr, aMode ); } TInt StartServer() { + OstTrace0( TRACE_NORMAL, _STARTSERVER, "::StartServer" ); C_TRACE((_L("RModemAtController::StartServer()"))); const TUidType serverUid( KNullUid, KNullUid, KATExtSrvUid3 ); RProcess server; @@ -386,6 +437,7 @@ server.Resume(); } User::WaitForRequest( status ); + OstTrace1( TRACE_NORMAL, DUP1__STARTSERVER, "::StartServer - Server started;status.Int()=%d", status.Int() ); C_TRACE((_L("Server started, code %d"), status.Int())); retTemp = ( server.ExitType() == EExitPanic ) ? KErrGeneral : status.Int(); server.Close(); @@ -394,6 +446,7 @@ void RModemAtController::SendReceiveRemovePipe() { + OstTrace0( TRACE_NORMAL, RMODEMATCONTROLLER_SENDRECEIVEREMOVEPIPE, "RModemAtController::SendReceiveRemovePipe" ); C_TRACE((_L(">>RModemAtController::SendReceiveRemovePipe()"))); TInt value = 0; TRequestStatus removePipeStatus = KRequestPending; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_exe/group/modematcontroller_exe.mmp --- a/adaptationlayer/modematadaptation/modematcontroller_exe/group/modematcontroller_exe.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_exe/group/modematcontroller_exe.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -40,12 +40,12 @@ SOURCE cmodematpipecontroller.cpp SOURCE catmessage.cpp - +macro PIPECAMP_UNSUBSCRIBE_PNS_PEP_STATUS_IND OS_LAYER_SYSTEMINCLUDE NON_FOUNDATION_ADAPT_LAYER_SYSTEMINCLUDE USERINCLUDE ../inc ../../modematcontroller_dll/inc - +USERINCLUDE ../traces LIBRARY euser.lib LIBRARY iscapi.lib diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_exe/inc/catmessage.h --- a/adaptationlayer/modematadaptation/modematcontroller_exe/inc/catmessage.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_exe/inc/catmessage.h Tue Oct 19 13:16:20 2010 +0300 @@ -44,7 +44,7 @@ /** GetBuffer * @return Pointer to the buffer */ - TPtr8 GetBuffer(); + TPtr8& GetBuffer(); /** GetMessageType * @return messagetype @@ -54,9 +54,10 @@ /** ReceiveATResponse * @param aResponse Response to AT-command * @param aComplete Intermediate data is not completed until it has a response. AT command is completed. + * @param aCompleteCode Complete code. * @return */ - void ReceiveATResponse( const TDesC8& aResponse, TBool aComplete ); + void ReceiveATResponse( const TDesC8& aResponse, TBool aComplete, TInt aCompleteCode ); /** CancelRequest * diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_exe/inc/cmodemathandler.h --- a/adaptationlayer/modematadaptation/modematcontroller_exe/inc/cmodemathandler.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_exe/inc/cmodemathandler.h Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-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" @@ -23,7 +23,6 @@ #include #include "mmodematobserver.h" - // FORWARD DECLARATIONS class CModemAtSrv; class RIscApi; @@ -48,7 +47,7 @@ * @param aServer * @return Instance of self */ - static CModemAtHandler* NewL( CModemAtSrv& aServer ); + static CModemAtHandler* NewL( CModemAtSrv& aServer, TInt aChannel ); /** * Destructor. @@ -57,13 +56,11 @@ /** * Sends AT-command to Modem AT-server - * @param aDteId * @param aPluginType AText/Common * @param aMessageType 0=normal, 1=getnvram status * @param aCmd AT-command */ TInt SendATCommand( - const TUint8 aDteId, const TATPluginInterface aPluginType, const TUint8 aMessageType, const TDesC8& aCmd ); @@ -75,14 +72,14 @@ * @return KErrNoMemory */ - TInt Connect( const TUint8 aDteId ); + TInt Connect( TUint8 aDevId, TUint8 aObjId ); /** * Disconnects handler from modem * @param TUint8 aDteId * @return Disconnect status */ - TInt Disconnect( const TUint8 aDteId ); + TInt Disconnect(); /** * Check if disconnect is called directly @@ -98,17 +95,16 @@ /** * SendAtModemDataRedirectResultReq - * @param TUint8 aDteId * @param TUint aResult */ - void SendAtModemDataRedirectResultReq( const TUint8 aDteId, const TUint aResult); + void SendAtModemDataRedirectResultReq( const TUint aResult ); /** - * SendEscapeSignalDetection - * @param TUint8 aDteId + * SendSignalDetection + * @param TUint8 aSignal * @return Symbian error code if error */ - TInt SendEscapeSignalDetection( const TUint8 aDteId ); + TInt SendSignalDetection( const TUint8 aSignal ); /** * HandleSignalDetectedResp @@ -118,9 +114,8 @@ /** * RemovePipe - * @param TUint8 aDteId */ - void RemovePipe( const TUint8 aDteId ); + void RemovePipe(); /** * IsPluginConnected @@ -136,9 +131,68 @@ /** * SendAtModemConnectReq - * @param TUint8 aDteId + */ + TInt SendAtModemConnectReq(); + + /** + * Check if pipe is in data mode + * @return ETrue, if pipe is in datamode + */ + TBool IsPipeInDataMode(); + + /** + * Check if text message mode is on + * @return ETrue, if +CMGS or +CMGS command has been received + */ + TBool IsTextMessageMode(); + + /** + * Set text message mode. Modem indications will be ignored during this mode. + * @param TBool aTextMode + */ + void SetTextMessageMode( TBool aTextMode ); + + /** + * Pipe creation result and pipe handle is informed + * with this function + * @param TUint8 aPipeHandle + * @param TInt aError */ - TInt SendAtModemConnectReq( const TUint8 aDteId ); + void PipeCreated( TUint8 aPipeHandle, TInt aError ); + + /** + * Stores device info so that it's available when + * plugin for the device is created + * @param TUint8 aDevId + * @param TUint8 aObjId + */ + void AddDevice( TUint8 aDevId, TUint8 aObjId ); + + /** + * Remove device info + * @param TUint8 aDevId + * @param TUint8 aObjId + */ + void RemoveDevice( TUint8 aDevId, TUint8 aObjId ); + + /** + * Get Dataport object id + * @param TUint8& aObjId + */ + void GetDataportObjectId( TUint& aObjId ); + + /** + * Get secondary dataport object id (e.g. if usb and bluetooth connect without PNS_NAME_ADD_IND) + * @param TUint8& aObjId + */ + void GetSecondaryDataportObjectId( TUint& aObjId ); + + /** + * Get ISC channel id used by handler + * @return TUint8 channel id + */ + TInt GetChannelId(); + protected: // from CActive @@ -149,7 +203,7 @@ /** * Default C++ constructor. */ - CModemAtHandler( CModemAtSrv& aServer ); + CModemAtHandler( CModemAtSrv& aServer, TInt aChannel ); /** * 2nd phase constructor @@ -188,17 +242,19 @@ TIsiReceiveC* iReceivedMessage; TUint iPepObjId; //controller pep - + TUint iDataportObjId; + CModemAtPipeController* iPipeController; #ifdef __WINSCW__ TInt iEmulatedValue; - TUint8 iDteId; - TUint8 iChannel; TATPluginInterface iPluginType; #endif TUint8 iLastTransactionId; TBool iDisconnected; TBool iModemAtExistInCmt; + TBool iTextMessageMode; + TUint8 iDteId; + TInt iChannel; }; #endif // CMODEMATHANDLER_H diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_exe/inc/cmodematpipecontroller.h --- a/adaptationlayer/modematadaptation/modematcontroller_exe/inc/cmodematpipecontroller.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_exe/inc/cmodematpipecontroller.h Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-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" @@ -23,6 +23,28 @@ #include "cmodemathandler.h" const TUint8 KInvalidPipeHandle = 0xff; + +const TUint8 PEP_COMM_IND_ID_ESCAPE = 0x07;// Hard coded PEP constants to be included when dataport exports (DP is COMM PEP)!! +const TUint8 PEP_COMM_CTRL_ID_ESCAPE = 0x05; +const TUint8 PEP_COMM_SIGNAL_DTR_ON = 0x05; +const TUint8 PEP_COMM_SIGNAL_DTR_OFF = 0x06; +const TUint8 PEP_COMM_SIGNAL_DCD_ON = 0x07; +const TUint8 PEP_COMM_SIGNAL_DCD_OFF = 0x08; +const TUint8 PEP_COMM_SIGNAL_DSR_ON = 0x01; +const TUint8 PEP_COMM_SIGNAL_DSR_OFF = 0x02; +const TUint8 PEP_COMM_IND_ID_V24_CHANGE = 0x04; +const TUint8 PEP_COMM_FLOW_CTRL_SW = 0x01; +const TUint8 PEP_COMM_FLOW_CTRL_HW = 0x02; +// const TUint8 PEP_COMM_FLOW_CTRL_BOTH = 0x03; // Note: AT_MODEM_FLOW_CONTROL_BOTH is not supported +const TUint8 PEP_COMM_FLOW_CTRL_NONE = 0x04; +const TUint8 PEP_COMM_FLOW_CTRL_EXTRACT = 0x05; +const TUint8 PEP_COMM_FLOW_CTRL_NO_EXTRACT = 0x06; +const TUint8 PEP_COMM_CTRL_ID_FLOW_CTRL = 0x02; +// Escape time for PEP_CTRL_REQ with PEP_COMM_CTRL_ID_ESCAPE +// Time is given as 20 milliseconds. So real escape time is: +// 50 * 20 milliseconds = 1000 milliseconds +const TUint8 KEscapeTime = 50; + class TPipeInfo { public: @@ -57,7 +79,7 @@ static CModemAtPipeController* NewL( RIscApi& aIscApi, TUint& aObjId, CModemAtHandler& aHandler ); ~CModemAtPipeController(); -#ifndef NCP_COMMON_BRIDGE_FAMILY + /* * Handles messages from PN_NAME * @param TIsiReceiveC& aReceivedMessage Message data @@ -73,9 +95,8 @@ /** * Removes pipe. - * @param TUint8 aDteId Connection DteId */ - void RemovePipe( const TUint8 aDteId); + void RemovePipe(); /** * Redirects pipe @@ -83,7 +104,7 @@ * @param TUint8 aNewDevId New PEP * @param TUint8 aNewObjId New PEP */ - void RedirectPipe( const TUint8 aDteId, const TUint8 aNewDevId, const TUint8 aNewObjId ); + void RedirectPipe( const TUint8 aNewDevId, const TUint8 aNewObjId ); /** * Queries AT MODEM object id. @@ -91,12 +112,38 @@ void QueryModemAtFromNameService(); /** - * GetPipeHandle - * @return pipehandle + * GetPipeState + * @return pipe state + */ + TPipeInfo::EPipeState GetPipeState(); + + /** + * Sends PNS_PIPE_ENABLE_REQ */ - TUint8 GetPipeHandle(); + void SendEnablePipeReq(); + + /** + * Sends PNS_PEP_CTRL_REQ to notify dataport + * @param TUint8 aControlId + * @param TDesC8& aData + */ + void SendPepCtrlReq( const TUint8 aControlId, TDesC8& aData ); -#endif + /** + * Sends PNS_PIPE_CREATE_REQ + * @param TUint8 aDevId New PEP + * @param TUint8 aObjId New PEP + */ + void SendCreatePipeMessage(const TUint8 aDevId, const TUint8 aObjId); + + /** + * Sends PNS_PEP_STATUS_IND + PEP_COMM_IND_ID_V24_CHANGE + * @param TUint8 aPepCommSignal DCD or DSR signal ON or OFF + * + * + */ + void SendPepStatusIndSignal( const TUint8 aPepCommSignal ); + private: /** * Default C++ constructor. @@ -112,12 +159,11 @@ void ConstructL(); -#ifndef NCP_COMMON_BRIDGE_FAMILY /** * Handles MatchDataportName * @param TUint aName */ - TUint MatchDataportName( TUint aName ); + TBool MatchDataportName( TUint aName ); /** * Handles PNS_NAME_ADD_IND @@ -137,7 +183,6 @@ */ void HandleNameQueryResp( const TIsiReceiveC& aReceivedMesssage ); - /** * Handles PNS_PIPE_CREATE_RESP * @param TIsiReceiveC& aReceivedMessage Message data @@ -167,25 +212,13 @@ * @param TIsiReceiveC& aReceivedMessage Message data */ void HandlePepStatusInd( const TIsiReceiveC& aReceivedMessage ); - - /** - * Sends PNS_PIPE_CREATE_REQ - * @param TUint8 aDevId New PEP - * @param TUint8 aObjId New PEP - */ - void SendCreatePipeMessage(const TUint8 aDevId, const TUint8 aObjId); - + /** * Sends PNS_PIPE_REMOVE_REQ * @param TUint8 aPipeHandle Pipehandle */ void SendRemovePipeReq( const TUint8 aPipeHandle ); - /** - * Sends PNS_PIPE_ENABLE_REQ - * @param TUint8 aPipeHandle Pipehandle - */ - void SendEnablePipeReq( const TUint8 aPipeHandle); /** * ChangePipeState @@ -193,15 +226,20 @@ */ void ChangePipeState( TPipeInfo::EPipeState aState ); -#endif + /** + * HandlePepCtrlResp + * @param TIsiReceiveC& aReceivedMessage Message data + */ + void HandlePepCtrlResp( const TIsiReceiveC& aReceivedMessage ); + private: RIscApi& iIscApi; TUint iModemAtObjId; //Modem AT Controller Obj-id TUint iModemAtDevId; //Modem AT Controller device-id - TUint iDataportDevId; //Dataport device-id - TUint iDataportObjId; //Dataport obj-id - TPipeInfo iPipe; //Pipehandle, pipe status and pipe id's + TUint iDpDevId; //Dataport device-id + TUint iDpObjId; //Dataport obj-id + TPipeInfo iPipe; //Pipehandle, pipe status and pipe id's CModemAtHandler& iAtHandler; //forwards AT-commands to the AT MODEM CActiveSchedulerWait* iSchedulerWait; }; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_exe/inc/cmodematsession.h --- a/adaptationlayer/modematadaptation/modematcontroller_exe/inc/cmodematsession.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_exe/inc/cmodematsession.h Tue Oct 19 13:16:20 2010 +0300 @@ -56,33 +56,46 @@ /** * Called by CModemAtHandler, when signal ind is received + * @param aCompleteCode */ - void SignalIndReceived( ); + void SignalIndReceived( const TInt aCompleteCode ); /** - * Returns name of current session - * @return Session name + * Returns DteId of current session + * @return DteID + */ + TUint8 GetDteId(); + + /** + * Sets DteID for this session + * @param aDteId DteId */ + void SetDteId( const TUint8 aDteId ); + + /** + * Returns name of current session + * @return Session name + */ TDesC8& GetName(); /** - * Returns plugin type (common/atext) - * @return Plugintype - */ + * Returns plugin type (common/atext) + * @return Plugintype + */ TATPluginInterface GetPluginType(); /** - * Modem-Connected-callback. Called when modem is connected. - * @param aDteId DteId - * @param aErr Error code - * @return + * Modem-Connected-callback. Called when modem is connected. + * @param aDteId DteId + * @param aErr Error code + * @return void */ void ModemConnected( const TInt aErr ); /** * CommandModeChanged. Called when pipe handle indicates that mode is changed. * @param aMode TCommandMode aMode - * @return + * @return void */ void CommandModeChanged( TCommandMode aMode ) ; @@ -110,6 +123,20 @@ */ TBool IsConnectReqActive(); + /** + * sets handler for this session + * @param aHandler pointer to handler, which handles messages + * for this session + * @return void + */ + void SetHandler( CModemAtHandler* aHandler ); + + /** + * gets handler for this session + * @return pointer to handler, which handles messages for this session + */ + CModemAtHandler* GetHandler(); + private: // from base class CSession2 @@ -142,9 +169,12 @@ RMessage2 iCommandModeReq; TVersion iVersion; + TUint8 iDteId; HBufC8* iClientName; TATPluginInterface iPluginType; TPtr8 iClientNamePtr; + TBuf8 iTemporaryUnsolicitedData; + CModemAtHandler* iHandler; }; #endif // CMODEMATSESSION_H diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_exe/inc/cmodematsrv.h --- a/adaptationlayer/modematadaptation/modematcontroller_exe/inc/cmodematsrv.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_exe/inc/cmodematsrv.h Tue Oct 19 13:16:20 2010 +0300 @@ -26,6 +26,7 @@ const TUint8 EAtCmd = 0; const TUint8 EGetNvramStatus = 1; +const TUint8 KMaxDteCount( 3 ); /* * Reference: i_at_modem_fp_3.1.doc (3.5.2) @@ -35,16 +36,29 @@ * unsolicited data indication. */ const TUint8 KUnsolicitedDataDteId = 0xff; - +const TUint8 KInitialValue = 0xff; const TInt KATModemCommandArgumentIndex = 0; const TInt KATModemResponseArgumentIndex = 1; const TInt KATModemUnsolicitedDataIndex = 0; _LIT8( KEmptyString, ""); +#define KMaxBufferLength 1024 + class CModemAtSession; class CAtMessage; + +class TDteInfo +{ +public: + + TUint8 iDevId; + TUint8 iObjId; + CModemAtSession* iSession; +}; + + /** * CModemAtSrv server core class. CModemAtsrc creates/deletes sessions. Dte-ids are allocated * by CmodemAtSrv. @@ -82,13 +96,14 @@ * @param TATPluginInterface aPluginType Atext or common plugin * @return Connection status: KErrNone, KErrAlreadyExists */ - TInt ConnectToModem( CModemAtSession* aSession, TATPluginInterface aPluginType); + TInt ConnectToModemL( CModemAtSession* aSession, TATPluginInterface aPluginType); /** - * HandleSignalInd + * HandleSignalInd handles AT_MODEM_SIGNAL_IND and notifying ATV, ATQ and ATE changes. * @param aDteId Device Terminal ID - */ - void HandleSignalInd( const TUint8 aDteId ); + * @param aCompleteCode Change in V, Q or E is completed to common plugin. + */ + void HandleSignalInd( const TUint8 aDteId, const TInt aCompleteCode ); /** * HandleUnsolicitedData * @param aDteId Device Terminal ID @@ -109,13 +124,18 @@ * @param aDteId Device Terminal ID * @param aResponse Response buffer */ - void HandleATResponse( const TUint8 aDteId, const TDesC8& aResponse, const TUint8 aCommand ); + void HandleATResponse( + const TUint8 aDteId, + CModemAtHandler* aHandler, + const TDesC8& aResponse, + const TUint8 aCommand ); /** * HandleCommandModeChange + * @param aDteId dte id which mode is changed * @param aMode Command mode 0 or data mode 1 */ - void HandleCommandModeChange( TCommandMode aMode ); + void HandleCommandModeChange( TUint8 aDteId, TCommandMode aMode ); /** * AddToSendFifo @@ -142,15 +162,89 @@ /** * RemovePipe + * @param aHandler pointer to message handler */ - void RemovePipe(); + void RemovePipe( CModemAtHandler* aHandler ); + + /** + * Sets DteID for this session + * @param aDteId DteId + * @param aConnectionError error + */ + void SetDteIdAndConnect( const TUint8 aDteId, const TInt aConnectionError ); + + /** + * Check if pipe is in data mode + * @param CModemAtHandler* aHandler + * @return True, if pipe is in datamode + */ + TBool IsPipeInDataMode( CModemAtHandler* aHandler ); + + /** + * Check if text message mode is on + * @param aHandler pointer to message handler + * @return ETrue, if +CMGS or +CMGS command has been received + */ + TBool IsTextMessageMode( CModemAtHandler* aHandler ); + + /** + * Peek if AT command is for sending text messages or if it's reply + * needs to be notified to ATEXT. This will reduce ISI message overhead, otherwise + * AT&V command would be needed every time when V, Q or E setting is changed. + * @param CModemAtHandler* aHandler + * @param TDes8& aCmd + */ + void PeekAtCommand( CModemAtHandler* aHandler, TDes8& aCmd ); + + /** + * Check if echo has been notified to common plug-in. + * @return ETrue or EFalse. + */ + TBool IsEchoNotified( const TUint8 aEchoValue ); /** - * Sets DteID for this session - * @param aDteId DteId - * @param aConnectionError error - */ - void SetDteIdAndConnect( const TUint8 aDteId, const TInt aConnectionError ); + * Check if V, Q or E command is ongoing, to handle AT_MODEM_SIGNAL_IND correctly. + * @return ETrue or EFalse. + */ + TBool IsSettingQueryOngoing(); + + /** + * Check if there is unsolicited data available in buffer, before there are active requests. + * @return ETrue or EFalse. + */ + TBool IsUnsolicitedDataInBuffer(); + + /** + * Get unsolicited data available in buffer, before there are active requests. + * @return ETrue or EFalse. + */ + void GetUnsolicitedDataInBuffer( TDes8& aData ); + + /** + * Reset unsolicited data in temporary buffer. + */ + void ResetUnsolicitedDataInBuffer(); + + /** + * Stores device info so that it's available when + * plugin for the device is created + * @param TUint8 aDevId + * @param TUint8 aObjId + */ + void AddDevice( TUint8 aDevId, TUint8 aObjId ); + + /** + * Remove device info + * @param TUint8 aDevId + * @param TUint8 aObjId + */ + void RemoveDevice( TUint8 aDevId, TUint8 aObjId ); + + /** + * calculates number of different DTE's connected + * @return number of dte's conntected + */ + TUint8 GetDteCount(); private: @@ -175,6 +269,14 @@ * Two-Phase constructor */ void ConstructL(); + + /** + * Gets free ISC channel id + * + * @param aChannel free channel id is inserted to this param + * @return TInt KErrNone if free channel found, otherwise KErrNotFound + */ + TInt GetFreeChannelId( TUint8& aChannel ); private: // data @@ -183,6 +285,26 @@ RPointerArray iAtMessageArray; CModemAtHandler* iHandler; TUint8 iDteId; + + TUint8 iEcho; + TUint8 iEchoNotified; + TBool iEchoQueryIsOngoing; + + TUint8 iVerbose; + TUint8 iVerboseNotified; + TBool iVerboseQueryIsOngoing; + + TUint8 iQuiet; + TUint8 iQuietNotified; + TBool iQuietQueryIsOngoing; + + TUint8 iCarriageReturn; + TBool iCarriageReturnFound; + + TBuf8 iTemporaryUnsolicitedData; + RArray iDteInfo; + TBuf8 iFreeChannels; + }; #endif // CMODEMATSRV_H diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_exe/src/catmessage.cpp --- a/adaptationlayer/modematadaptation/modematcontroller_exe/src/catmessage.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_exe/src/catmessage.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -19,6 +19,12 @@ #include "modemattrace.h" #include "cmodematsrv.h" #include "catmessage.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "catmessageTraces.h" +#endif + +const TInt KReplyTypeOther( 3 ); CAtMessage::CAtMessage( const TUint8 aMessageType, CModemAtSession* aSession, @@ -28,12 +34,15 @@ iRequest( aRequest ), iMessagePtr( NULL, 0) { + OstTraceExt3( TRACE_NORMAL, CATMESSAGE_CATMESSAGE, "CAtMessage::CAtMessage;this=%p;aRequest=%p;aRequest.Handle()=%x", this, &aRequest, (TUint)aRequest.Handle() ); C_TRACE(( _L("CAtMessage::CAtMessage() this: 0x%x, aRequest 0x%x handle: 0x%x"), this, &aRequest, aRequest.Handle() )); TInt length = aRequest.GetDesLength( KATModemCommandArgumentIndex ); + OstTraceExt2( TRACE_NORMAL, DUP2_CATMESSAGE_CATMESSAGE, "CAtMessage::CAtMessage;aMessageType=%d;length=%d", aMessageType, length ); C_TRACE((_L("CAtMessage aMessageType: %d at command length: %d"), aMessageType, length )); iMessage = HBufC8::New( length ); iMessagePtr.Set( iMessage->Des() ); TInt err = aRequest.Read( KATModemCommandArgumentIndex, iMessagePtr ); + OstTrace1( TRACE_NORMAL, DUP3_CATMESSAGE_CATMESSAGE, "CAtMessage::CAtMessage - aRequest.Read err:;err=%d", err ); C_TRACE((_L("aRequest.Read err: %d"), err )); if( err != KErrNone ) { @@ -41,28 +50,33 @@ } DUMP_MESSAGE( iMessagePtr ); iRequest.Write( KATModemResponseArgumentIndex, KEmptyString ); + OstTrace0( TRACE_NORMAL, DUP4_CATMESSAGE_CATMESSAGE, "CAtMessage::CAtMessage - done" ); C_TRACE(( _L("CAtMessage done") )); } CAtMessage::~CAtMessage() { + OstTrace0( TRACE_NORMAL, DUP1_CATMESSAGE_CATMESSAGE, "CAtMessage::~CAtMessage" ); C_TRACE (( _L("CAtMessage::~CAtMessage()") )); if( !iRequest.IsNull() ) - { - C_TRACE (( _L("CAtMessage::~CAtMessage() !iRequest.IsNull this: 0x%x iRequest: 0x%x handle: 0x%x"), this, &iRequest, iRequest.Handle() )); - } + { + OstTraceExt3( TRACE_NORMAL, DUP5_CATMESSAGE_CATMESSAGE, "CAtMessage::~CAtMessage;this=%p;iRequest=%p;iRequest.Handle()=%x", this, &iRequest, (TUint)iRequest.Handle() ); + C_TRACE (( _L("CAtMessage::~CAtMessage() !iRequest.IsNull this: 0x%x iRequest: 0x%x handle: 0x%x"), this, &iRequest, iRequest.Handle() )); + } if( iMessage ) { - delete iMessage; + delete iMessage; iMessage = NULL; } } void CAtMessage::CancelRequest() { + OstTrace0( TRACE_NORMAL, CATMESSAGE_CANCELREQUEST, "CAtMessage::CancelRequest" ); C_TRACE (( _L("CAtMessage::CancelRequest()") )); if( !iRequest.IsNull() ) { + OstTraceExt2( TRACE_NORMAL, DUP1_CATMESSAGE_CANCELREQUEST, "CAtMessage::CancelRequest - complete iRequest KErrCancel;iRequest=%p;iRequest.Handle()=%x", &iRequest, (TUint)iRequest.Handle() ); C_TRACE (( _L("CAtMessage::CancelRequest complete iRequest KErrCancel iRequest: 0x%x handle 0x%x"), &iRequest, iRequest.Handle() )); iRequest.Complete( KErrCancel ); } @@ -70,38 +84,61 @@ CModemAtSession* CAtMessage::GetSession() { + OstTrace1( TRACE_NORMAL, CATMESSAGE_GETSESSION, "CAtMessage::GetSession;iSession=%x", iSession ); C_TRACE (( _L("CAtMessage::GetSession() 0x%x"), &iSession )); return iSession; } -TPtr8 CAtMessage::GetBuffer() +TPtr8& CAtMessage::GetBuffer() { + OstTrace0( TRACE_NORMAL, CATMESSAGE_GETBUFFER, "CAtMessage::GetBuffer" ); C_TRACE (( _L("CAtMessage::GetBuffer()"))); return iMessagePtr; } TUint8 CAtMessage::GetMessageType() { + OstTrace1( TRACE_NORMAL, CATMESSAGE_GETMESSAGETYPE, "CAtMessage::GetMessageType;iMessageType=%u", iMessageType ); C_TRACE (( _L("CAtMessage::GetMessageType()"), iMessageType )); return iMessageType; } -void CAtMessage::ReceiveATResponse( const TDesC8& aResponse, TBool aComplete ) +void CAtMessage::ReceiveATResponse( const TDesC8& aResponse, TBool aComplete, TInt aCompleteCode ) { + //OstTraceExt3( TRACE_NORMAL, CATMESSAGE_RECEIVEATRESPONSE, "CAtMessage::ReceiveATResponse;aResponse=%p;aComplete=%d;aCompleteCode=%d", &aResponse, (TUint)aComplete, aCompleteCode ); + OstTrace1( TRACE_NORMAL, DUP1_CATMESSAGE_RECEIVEATRESPONSE, "CAtMessage::ReceiveATResponse - ;iMessageType=%d", iMessageType ); C_TRACE (( _L("CAtMessage::ReceiveATResponse( aResponse 0x%x, aComplete %d )"), &aResponse, (TInt)aComplete )); - C_TRACE (( _L("CAtMessage::ReceiveATResponse iMessageType: %d"), iMessageType )); + C_TRACE (( _L("CAtMessage::ReceiveATResponse iMessageType: %d, aCompleteCode: %d"), iMessageType, aCompleteCode )); if( !iRequest.IsNull() ) { + OstTraceExt2( TRACE_NORMAL, DUP2_CATMESSAGE_RECEIVEATRESPONSE, "CAtMessage::ReceiveATResponse - Writing to iRequest:;iRequest=%p;iRequest.Handle()=%d", &iRequest, (TUint)iRequest.Handle() ); C_TRACE (( _L("CAtMessage::ReceiveATResponse Writing to iRequest: 0x%x handle 0x%x"), &iRequest, iRequest.Handle() )); - TInt err = iRequest.Write( KATModemResponseArgumentIndex, aResponse, iRequest.GetDesLength( KATModemResponseArgumentIndex )); + TInt length = iRequest.GetDesMaxLength( KATModemResponseArgumentIndex ); + HBufC8* intermediateBuffer = HBufC8::New( length ); + TPtr8 ptr = intermediateBuffer->Des(); + TInt readErr = iRequest.Read( KATModemResponseArgumentIndex, ptr ); + TRACE_ASSERT( readErr == KErrNone ); + if( ptr.Length() > 0 ) + { + OstTrace1( TRACE_NORMAL, DUP3_CATMESSAGE_RECEIVEATRESPONSE, "CAtMessage::ReceiveATResponse - Complete with EReplyTypeOther :;ptr.Length()=%d", ptr.Length() ); + C_TRACE(( _T("Complete with EReplyTypeOther :%d"), ptr.Length() )); + aCompleteCode = KReplyTypeOther; + } + ptr.Append( aResponse ); + DUMP_MESSAGE( ptr ); + TInt err = iRequest.Write( KATModemResponseArgumentIndex, ptr ); TRACE_ASSERT( err == KErrNone ); + delete intermediateBuffer; + intermediateBuffer = NULL; if( aComplete ) { + OstTraceExt4( TRACE_NORMAL, DUP4_CATMESSAGE_RECEIVEATRESPONSE, "CAtMessage::ReceiveATResponse -;completion code=%d;this=%p;iRequest=%p;iRequest.Handle()=%d", err, this, &iRequest, (TUint)iRequest.Handle() ); C_TRACE (( _L("CAtMessage::ReceiveATResponse completing (%d) this: 0x%x iRequest: 0x%x handle: 0x%x"), err, this, &iRequest, iRequest.Handle() )); - iRequest.Complete( err ); + iRequest.Complete( aCompleteCode ); } else { + OstTrace1( TRACE_NORMAL, DUP5_CATMESSAGE_RECEIVEATRESPONSE, "CAtMessage::ReceiveATResponse - not completing intermediate data yet;err=%d", err ); C_TRACE (( _L("CAtMessage::ReceiveATResponse not completing intermediate data yet(%d)"), err )); } } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_exe/src/cmodemathandler.cpp --- a/adaptationlayer/modematadaptation/modematcontroller_exe/src/cmodemathandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_exe/src/cmodemathandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-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" @@ -21,20 +21,22 @@ #include #include #include -#ifndef NCP_COMMON_BRIDGE_FAMILY #include #include #include -#endif #include #include #include "cmodemathandler.h" #include "cmodematpipecontroller.h" #include "modemattrace.h" #include "cmodematsrv.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmodemathandlerTraces.h" +#endif + #define KCommandBits 0x0f -#define KMaxBufferLength 1024 #define KTransactionIdBitsShift 4 #define KFiller 0 #define KIndicationOrderMsgLength 14 @@ -44,14 +46,21 @@ const TInt KUnsubscribeFourEvents(4); const TInt KAlignToFourBytes(4); +const TInt KSessionIndLimit(1); // AT_MODEM_SIGNAL_IND is not handled if only one session is connected +const TInt KEscapeDataLength(2); +const TInt KFlowCtrlDataLength(3); +const TUint8 KReservedDteId( 255 ); #ifdef __WINSCW__ #define KEmulatedReplyMsgLength 50 #endif -CModemAtHandler* CModemAtHandler::NewL( CModemAtSrv& aServer ) +CModemAtHandler* CModemAtHandler::NewL( + CModemAtSrv& aServer, + TInt aChannel ) { - CModemAtHandler* self = new (ELeave) CModemAtHandler( aServer ); + OstTrace0( TRACE_NORMAL, CMODEMATHANDLER_NEWL, "CModemAtHandler::NewL" ); + CModemAtHandler* self = new (ELeave) CModemAtHandler( aServer, aChannel ); CleanupStack::PushL( self ); self->ConstructL(); CleanupStack::Pop( self ); @@ -60,6 +69,7 @@ CModemAtHandler::~CModemAtHandler() { + OstTrace0( TRACE_NORMAL, CMODEMATHANDLER_CMODEMATHANDLER, "CModemAtHandler::~CModemAtHandler" ); C_TRACE(( _T("CModemAtHandler::~CModemAtHandler()") )); TBuf8 events; events.Append( KFiller ); @@ -81,12 +91,14 @@ if( iIscApi ) { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATHANDLER_CMODEMATHANDLER, "CModemAtHandler::~CModemAtHandler - closing isc api" ); + C_TRACE(( _T("CModemAtHandler::~CModemAtHandler() closing isc api") )); iIscApi->Close(); delete iIscApi; } } -CModemAtHandler::CModemAtHandler( CModemAtSrv& aServer ) +CModemAtHandler::CModemAtHandler( CModemAtSrv& aServer, TInt aChannel ) : CActive( EPriorityHigh ), iServer( aServer ), iIscApi( NULL ), @@ -96,16 +108,21 @@ iReceiveMessageLength( 0 ), iReceivedMessage( NULL ), iPepObjId(0), + iDataportObjId(0), iPipeController(NULL), iLastTransactionId( 0 ), iDisconnected( EFalse ), - iModemAtExistInCmt( EFalse ) + iModemAtExistInCmt( EFalse ), + iTextMessageMode( EFalse ), + iChannel( aChannel ) { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATHANDLER_CMODEMATHANDLER, "CModemAtHandler::CModemAtHandler" ); C_TRACE (( _T("CModemAtHandler::CModemAtHandler") )); } void CModemAtHandler::DoCancel() { + OstTrace0( TRACE_NORMAL, CMODEMATHANDLER_DOCANCEL, "CModemAtHandler::DoCancel" ); C_TRACE (( _T("CModemAtHandler::DoCancel()") )); iIscApi->ReceiveCancel(); } @@ -113,11 +130,13 @@ void CModemAtHandler::RunL() { - C_TRACE (( _T("CModemAtHandler::RunL()") )); + OstTrace0( TRACE_NORMAL, CMODEMATHANDLER_RUNL, "CModemAtHandler::RunL" ); + C_TRACE (( _T("CModemAtHandler::RunL() %d"), iDteId )); if( iStatus == KErrNone ) { TIsiReceiveC receiveMessage = TIsiReceiveC( *iReceivedMessageBuffer ); + OstTraceExt1( TRACE_NORMAL, DUP1_CMODEMATHANDLER_RUNL, "CModemAtHandler::RunL - message dump;iReceivePtr=%s", iReceivePtr ); DUMP_MESSAGE( iReceivePtr ); if( iReceivedMessageBuffer->Length() > ISI_HEADER_OFFSET_MESSAGEID ) @@ -125,6 +144,7 @@ switch(receiveMessage.Get8bit(ISI_HEADER_OFFSET_RESOURCEID)) { case PN_AT_MODEM: //AT MODEM COMMANDS + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATHANDLER_RUNL, "CModemAtHandler::RunL - PN_AT_MODEM" ); C_TRACE(_L("PN_AT_MODEM")); switch( receiveMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ) @@ -134,6 +154,7 @@ break; case AT_MODEM_DISCONNECT_RESP: + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATHANDLER_RUNL, "CModemAtHandler::RunL - AT_MODEM_DISCONNECT_RESP" ); C_TRACE(_L("AT_MODEM_DISCONNECT_RESP")); break; @@ -146,6 +167,8 @@ break; case AT_MODEM_UNSOLICITED_DATA_IND: + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATHANDLER_RUNL, "CModemAtHandler::RunL - AT_MODEM_UNSOLICITED_DATA_IND" ); + C_TRACE(_L("AT_MODEM_UNSOLICITED_DATA_IND")); HandleUnsolicitedData( receiveMessage ); break; @@ -158,15 +181,18 @@ break; case AT_MODEM_DATA_REDIRECT_RESULT_RESP: + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATHANDLER_RUNL, "CModemAtHandler::RunL - AT_MODEM_DATA_REDIRECT_RESULT_RESP" ); C_TRACE((_L("AT_MODEM_DATA_REDIRECT_RESULT_RESP"))); HandleRedirectResultResp( receiveMessage ); break; case AT_MODEM_SIGNAL_DETECTED_RESP: + OstTrace0( TRACE_NORMAL, DUP6_CMODEMATHANDLER_RUNL, "CModemAtHandler::RunL - AT_MODEM_SIGNAL_DETECTED_RESP" ); C_TRACE((_L("AT_MODEM_SIGNAL_DETECTED_RESP"))); HandleSignalDetectedResp( receiveMessage ); break; default: + OstTrace0( TRACE_NORMAL, DUP7_CMODEMATHANDLER_RUNL, "CModemAtHandler::RunL - Not a valid message" ); C_TRACE(_L("CModemAtHandler::RunL: Not a valid message")) ; TRACE_ASSERT_ALWAYS; break; @@ -174,26 +200,28 @@ break; //case PN_AT_MODEM: //AT MODEM COMMANDS -#ifndef NCP_COMMON_BRIDGE_FAMILY - case PN_NAME_SERVICE: - C_TRACE(_L("PN_NAME_SERVICE")); - iPipeController->HandleNameServiceMessage(receiveMessage); + case PN_NAMESERVICE: + OstTrace0( TRACE_NORMAL, DUP8_CMODEMATHANDLER_RUNL, "CModemAtHandler::RunL - PN_NAMESERVICE" ); + C_TRACE(_L("PN_NAMESERVICE")); + iPipeController->HandleNameServiceMessage( receiveMessage ); break; case PN_PIPE: - C_TRACE(_L("Pipe message")); - iPipeController->HandlePipeServiceMessage(receiveMessage); + OstTrace0( TRACE_NORMAL, DUP9_CMODEMATHANDLER_RUNL, "CModemAtHandler::RunL - PN_PIPE" ); + C_TRACE(_L("PN_PIPE")); + iPipeController->HandlePipeServiceMessage( receiveMessage ); break; -#endif default: + OstTrace0( TRACE_NORMAL, DUP10_CMODEMATHANDLER_RUNL, "CModemAtHandler::RunL - Unknown resource id" ); C_TRACE((_L("Unknown resource id"))); TRACE_ASSERT_ALWAYS; break; } - + } //if( receiveMessageBuffer->Length() > ISI_HEADER_OFFSET_MESSAGEID ) else { + OstTrace0( TRACE_NORMAL, DUP11_CMODEMATHANDLER_RUNL, "CModemAtHandler::RunL - ISI message is too short" ); C_TRACE(_L("ISI message is too short")); TRACE_ASSERT_ALWAYS; } @@ -212,30 +240,38 @@ void CModemAtHandler::ConstructL() { + OstTrace0( TRACE_NORMAL, CMODEMATHANDLER_CONSTRUCTL, "CModemAtHandler::ConstructL" ); C_TRACE (( _T("CModemAtHandler::ConstructL()") )); CActiveScheduler::Add( this ); iIscApi = new ( ELeave ) RIscApi; + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATHANDLER_CONSTRUCTL, "CModemAtHandler::ConstructL - RIscApi created" ); C_TRACE(_L("RIscApi created")); #ifndef __WINSCW__ OpenChannelL(); -#ifndef NCP_COMMON_BRIDGE_FAMILY - iPipeController->QueryModemAtFromNameService(); -#endif + if( iChannel == EIscNokiaAtController ) + { + iPipeController->QueryModemAtFromNameService(); + } + else + { + SetModemAtExistsInCmt( ETrue ); + } #else iEmulatedValue = 0; #endif } -TInt CModemAtHandler::SendATCommand(const TUint8 aDteId, +TInt CModemAtHandler::SendATCommand( const TATPluginInterface aPluginType, const TUint8 aMessageType, const TDesC8& aCmd) { - C_TRACE (( _T(">>CModemAtHandler::SendATCommand()") )); + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_SENDATCOMMAND, "CModemAtHandler::SendATCommand;iDteId=%d", iDteId ); + C_TRACE (( _T(">>CModemAtHandler::SendATCommand() %d"), iDteId )); TInt err = KErrNone; // aMessageType contains normal AT-cmd (0) or Nvram-query (1) @@ -243,17 +279,10 @@ // used with intermediate data ind // can be removed, when AT_MODEM_INTERMEDIATE_DATA_IND supports transactionid iLastTransactionId = transactionId; //messages are routed to correct plugin by transaction id + OstTraceExt4( TRACE_NORMAL, DUP1_CMODEMATHANDLER_SENDATCOMMAND, "CModemAtHandler::SendATCommand;transactionId=%d;aPluginType=%d;aMessageType=%d;iLastTransactionId=%d", transactionId, aPluginType, aMessageType, iLastTransactionId ); C_TRACE((_L("transaction id %d, plugintype %d, aMessageType %d"), transactionId, aPluginType, aMessageType)); C_TRACE((_L("iLastTransctionId = %d "), iLastTransactionId )); - #ifdef __WINSCW__ - iDteId = aDteId; - iChannel = aMessageType; - iPluginType = aPluginType; - HandleATResponse(); - return KErrNone; - #endif - TInt size = ISI_HEADER_SIZE + AT_MODEM_CMD_REQ_OFFSET_CMDLINEBUFFER + aCmd.Length(); TInt sizeWithFillers = size; @@ -261,6 +290,7 @@ { sizeWithFillers++; } + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATHANDLER_SENDATCOMMAND, "CModemAtHandler::SendATCommand - Message length;sizeWithFillers=%d", sizeWithFillers ); C_TRACE((_L("Message length %d"), sizeWithFillers)); HBufC8* message = HBufC8::New( sizeWithFillers ); @@ -271,25 +301,29 @@ isimessage.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_AT_MODEM ); isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_CMD_REQ_OFFSET_TID, transactionId ); isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_CMD_REQ_OFFSET_MESSAGEID, AT_MODEM_CMD_REQ ); - isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_CMD_REQ_OFFSET_DTEID, aDteId ); + isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_CMD_REQ_OFFSET_DTEID, iDteId ); isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_CMD_REQ_OFFSET_FILLERBYTE1, 0 ); + OstTrace1( TRACE_NORMAL, DUP3_CMODEMATHANDLER_SENDATCOMMAND, "CModemAtHandler::SendATCommand - AT command length:;aCmd.Length()=%d", aCmd.Length() ); C_TRACE((_L("AT command length: %d"), aCmd.Length())); isimessage.Set16bit( ISI_HEADER_SIZE + AT_MODEM_CMD_REQ_OFFSET_LENGTH, (TUint16) aCmd.Length() ); const TUint8* ptr = aCmd.Ptr(); for ( TInt i = 0; i < aCmd.Length(); i++ ) { + OstTraceExt3( TRACE_NORMAL, DUP4_CMODEMATHANDLER_SENDATCOMMAND, "CModemAtHandler::SendATCommand - message;i=%d;ptr[i]=%x;charptr[i]=%c", i, ptr[i], ptr[i] ); C_TRACE((_L("message %d, 0x%x '%c'"), i, ptr[i], ptr[i])); isimessage.Set8bit(ISI_HEADER_SIZE + AT_MODEM_CMD_REQ_OFFSET_CMDLINEBUFFER + i, ptr[i]); } for( TInt j = sizeWithFillers; j < size; j++ ) { + OstTrace1( TRACE_NORMAL, DUP5_CMODEMATHANDLER_SENDATCOMMAND, "CModemAtHandler::SendATCommand - Add filler;j=%d", j ); C_TRACE((_L("Add filler [%d]"), j)); isimessage.Set8bit( j , KFiller ); } isimessage.Complete(); + OstTraceExt1( TRACE_NORMAL, DUP6_CMODEMATHANDLER_SENDATCOMMAND, "CModemAtHandler::SendATCommand - Created ISI-message;messageptr=%s", messageptr ); C_TRACE(_L("Created ISI-message")); DUMP_MESSAGE( messageptr ); @@ -300,19 +334,23 @@ } else { + OstTrace0( TRACE_NORMAL, DUP7_CMODEMATHANDLER_SENDATCOMMAND, "CModemAtHandler::SendATCommand - No memory - error in sending ISI message from heap" ); C_TRACE(_L("No memory - error in sending ISI message from heap")); TRACE_ASSERT_ALWAYS; } + + OstTrace1( TRACE_NORMAL, DUP8_CMODEMATHANDLER_SENDATCOMMAND, "CModemAtHandler::SendATCommand;err=%d", err ); C_TRACE (( _T("<Open( EIscNokiaAtController, openStatus, EOwnerThread ); + iIscApi->Open( iChannel, openStatus, EOwnerThread ); User::WaitForRequest( openStatus ); TRACE_ASSERT( !openStatus.Int()); @@ -327,11 +365,13 @@ TRACE_ASSERT(iReceivedMessageBuffer); iReceivePtr.Set( iReceivedMessageBuffer->Des() ); + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATHANDLER_OPENCHANNELL, "CModemAtHandler::OpenChannelL - Start receive ISI messages" ); C_TRACE(_L("Start receive ISI messages")); iIscApi->Receive( iStatus, iReceivePtr, iReceiveMessageLength ); SetActive(); + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATHANDLER_OPENCHANNELL, "CModemAtHandler::OpenChannelL - Start receive indications" ); C_TRACE(_L("Start receive indications")); TBuf8 events; events.Append( PN_AT_MODEM ); @@ -343,43 +383,51 @@ events.Append( PN_AT_MODEM ); events.Append( AT_MODEM_DATA_REDIRECT_IND ); -#ifndef NCP_COMMON_BRIDGE_FAMILY +#ifndef PIPECAMP_UNSUBSCRIBE_PNS_PEP_STATUS_IND + events.Append( PN_PIPE ); + events.Append( PNS_PEP_STATUS_IND ); +#endif //name add ind events.Append( PN_NAMESERVICE ); events.Append( PNS_NAME_ADD_IND ); events.Append( PN_NAMESERVICE ); events.Append( PNS_NAME_REMOVE_IND ); - events.Append( PN_PIPE ); - events.Append( PNS_PEP_STATUS_IND ); -#else - events.Append( 0 ); - events.Append( 0 ); - events.Append( 0 ); - events.Append( 0 ); - events.Append( 0 ); - events.Append( 0 ); -#endif - iIscApi->CustomFunction(EIscNokiaEventSubscribe,&events); + iIscApi->CustomFunction( EIscNokiaEventSubscribe, &events ); TBuf8 objId; - iIscApi->GetChannelInfo(EIscNokiaAtController, objId); - + iIscApi->GetChannelInfo( iChannel, objId ); + iPepObjId = (((TUint16)(objId[0]))< dpObjId; + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATHANDLER_OPENCHANNELL, "CModemAtHandler::OpenChannelL - GetChannelInfo(EIscNokiaDataport2)" ); + C_TRACE(( _T("GetChannelInfo() EIscNokiaDataport2") )); + iIscApi->GetChannelInfo( EIscNokiaDataport2, dpObjId ); + + OstTrace0( TRACE_NORMAL, DUP6_CMODEMATHANDLER_OPENCHANNELL, "CModemAtHandler::OpenChannelL - GetChannelInfo() done" ); + C_TRACE(( _T("GetChannelInfo() done") )); + iDataportObjId = (((TUint16)(dpObjId[0])) << KEightBits) + dpObjId[1]; + OstTrace1( TRACE_NORMAL, DUP7_CMODEMATHANDLER_OPENCHANNELL, "CModemAtHandler::OpenChannelL;iDataportObjId=%x", iDataportObjId ); + C_TRACE((_L("DataportObjId 0x%x"), iDataportObjId)); } void CModemAtHandler::HandleATResponse( const TIsiReceiveC& aMessage ) { + OstTrace0( TRACE_NORMAL, CMODEMATHANDLER_HANDLEATRESPONSE, "CModemAtHandler::HandleATResponse" ); C_TRACE (( _T("CModemAtHandler::HandleATResponse()") )); TUint8 dteId = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_CMD_RESP_OFFSET_DTEID ) ; TUint transactionId = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_CMD_RESP_OFFSET_TID ); TUint8 command = transactionId & KCommandBits; //normal AT-cmd or Nvram-query - TInt length = aMessage.Get16bit( ISI_HEADER_SIZE+AT_MODEM_CMD_RESP_OFFSET_LENGTH ); + TInt length = aMessage.Get16bit( ISI_HEADER_SIZE + AT_MODEM_CMD_RESP_OFFSET_LENGTH ); + OstTraceExt3( TRACE_NORMAL, DUP2_CMODEMATHANDLER_HANDLEATRESPONSE, "CModemAtHandler::HandleATResponse;dteId=%d;AT (0) or nvram command (1):;command=%d;Response length;length=%d", dteId, command, length ); C_TRACE(( _L("DteId: %d AT (0) or nvram command (1): %d Response length %d"), dteId, command, length )); /** @@ -390,9 +438,12 @@ * Current implementation uses first in first out response completion * so plugintype is not needed. */ + OstTrace1( TRACE_NORMAL, DUP3_CMODEMATHANDLER_HANDLEATRESPONSE, "CModemAtHandler::HandleATResponse - ;Plugintype=%d", transactionId >> KTransactionIdBitsShift ); C_TRACE(( _L("Plugintype: %d"), transactionId >> KTransactionIdBitsShift )); - iServer.HandleATResponse( dteId, + iServer.HandleATResponse( + dteId, + this, aMessage.GetData( ISI_HEADER_SIZE + AT_MODEM_CMD_RESP_OFFSET_CMDLINEBUFFER, length), command ); } @@ -400,94 +451,70 @@ #ifdef __WINSCW__ void CModemAtHandler::HandleATResponse( ) { - C_TRACE (( _T("CModemAtHandler::HandleATResponse()") )); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATHANDLER_HANDLEATRESPONSE, "CModemAtHandler::HandleATResponse;iDteId=%d", iDteId ); + C_TRACE (( _T("CModemAtHandler::HandleATResponse() %d"), iDteId )); //reply back immediately const TInt KReplyLength(50); TBuf8 replyEmulated = _L8("\r\nAT TEST REPLY"); replyEmulated.AppendNum(iEmulatedValue++); replyEmulated.Append(_L8("\r\n")); - iServer.HandleATResponse( iDteId, replyEmulated, 0 /* 0 = AT-cmd, 1 = nvram */); + iServer.HandleATResponse( iDteId, this, replyEmulated, 0 /* 0 = AT-cmd, 1 = nvram */); } #endif -TInt CModemAtHandler::Connect( const TUint8 aDteId ) +TInt CModemAtHandler::Connect( TUint8 aDevId, TUint8 aObjId ) { - C_TRACE (( _T("CModemAtHandler::Connect()") )); + OstTraceExt2( TRACE_NORMAL, CMODEMATHANDLER_CONNECT, "CModemAtHandler::Connect;aDevId=%hhx;aObjId=%hhx", aDevId, aObjId ); + C_TRACE (( _T("CModemAtHandler::Connect() dev id: 0x%x, obj id: 0x%x"), aDevId, aObjId )); if( !iModemAtExistInCmt ) { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATHANDLER_CONNECT, "CModemAtHandler::Connect - Connection failed, PN_AT_MODEM is not in CMT" ); C_TRACE((_T("Connection failed, PN_AT_MODEM is not in CMT"))); TRACE_ASSERT_ALWAYS; return KErrNotFound; } SetDisconnected( EFalse ); -#ifdef __WINSCW__ - return KErrNone; -#endif - - TInt err( KErrNone ); - TUint8 pipeHandle( KInvalidPipeHandle ); - -#ifndef NCP_COMMON_BRIDGE_FAMILY - pipeHandle = iPipeController->GetPipeHandle(); -#endif - - if( pipeHandle == KInvalidPipeHandle ) - { - C_TRACE(( _L("Connecting with dteId %d. (RComm was not used before connecting the plug-ins)."), aDteId )); - err = SendAtModemConnectReq( aDteId ); - } - else - { - C_TRACE(( _L("Connecting with pipehandle %d."), pipeHandle )); - err = SendAtModemConnectReq( pipeHandle ); - } - - if( err != KErrNone ) - { - TRACE_ASSERT_ALWAYS; - return KErrNotFound; - } + iPipeController->SendCreatePipeMessage( aDevId, aObjId ); return KErrNone; } void CModemAtHandler::SetDisconnected( TBool aIsDisconnected ) { + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_SETDISCONNECTED, "CModemAtHandler::SetDisconnected;aIsDisconnected=%d", aIsDisconnected ); C_TRACE (( _T("CModemAtHandler::SetDisconnected(%d)"),aIsDisconnected )); iDisconnected = aIsDisconnected; } TBool CModemAtHandler::IsDisconnected() { + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_ISDISCONNECTED, "CModemAtHandler::IsDisconnected;iDisconnected=%d", iDisconnected ); C_TRACE (( _T("CModemAtHandler::IsDisconnected(%d)"),iDisconnected )); return iDisconnected; } TBool CModemAtHandler::IsPluginConnected() { + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_ISPLUGINCONNECTED, "CModemAtHandler::IsPluginConnected;iServer.SessionCount()=%d", iServer.SessionCount() ); C_TRACE (( _T("CModemAtHandler::IsPluginConnected() sessions: %d"), iServer.SessionCount() )); return iServer.SessionCount() > 0; } -void CModemAtHandler::RemovePipe( const TUint8 aDteId ) +void CModemAtHandler::RemovePipe() { - C_TRACE(( _T("CModemAtHandler::RemovePipe()"))); + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_REMOVEPIPE, "CModemAtHandler::RemovePipe;iDteId=%d", iDteId ); + C_TRACE(( _T("CModemAtHandler::RemovePipe() %d"), iDteId )); iDisconnected = ETrue; -#ifndef NCP_COMMON_BRIDGE_FAMILY - iPipeController->RemovePipe( aDteId ); -#endif + iPipeController->RemovePipe(); } -TInt CModemAtHandler::Disconnect( const TUint8 aDteId ) +TInt CModemAtHandler::Disconnect() { - C_TRACE (( _T("CModemAtHandler::Disconnect(%d)"),aDteId )); - #ifdef __WINSCW__ - iDteId = aDteId; - return KErrNone; - #endif + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_DISCONNECT, "CModemAtHandler::Disconnect;iDteId=%d", iDteId ); + C_TRACE (( _T("CModemAtHandler::Disconnect(%d)"),iDteId )); TInt size = ISI_HEADER_SIZE + SIZE_AT_MODEM_DISCONNECT_REQ; HBufC8* message = HBufC8::New( size ); @@ -498,10 +525,11 @@ isimessage.Set8bit(ISI_HEADER_SIZE + AT_MODEM_DISCONNECT_REQ_OFFSET_TID, 0); isimessage.Set8bit(ISI_HEADER_SIZE + AT_MODEM_DISCONNECT_REQ_OFFSET_MESSAGEID, AT_MODEM_DISCONNECT_REQ); - isimessage.Set8bit(ISI_HEADER_SIZE + AT_MODEM_DISCONNECT_REQ_OFFSET_DTEID, aDteId); + isimessage.Set8bit(ISI_HEADER_SIZE + AT_MODEM_DISCONNECT_REQ_OFFSET_DTEID, iDteId); isimessage.Set8bit(ISI_HEADER_SIZE + AT_MODEM_DISCONNECT_REQ_OFFSET_FILLERBYTE1, KFiller); isimessage.Complete(); + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATHANDLER_DISCONNECT, "CModemAtHandler::Disconnect - Sending AT_MODEM_DISCONNECT_REQ" ); C_TRACE (( _T("CModemAtHandler::Disconnect Sending AT_MODEM_DISCONNECT_REQ"))); TInt err = iIscApi->Send(messageptr); TRACE_ASSERT( err == KErrNone ); @@ -513,19 +541,21 @@ void CModemAtHandler::HandleModemConnectResp( const TIsiReceiveC& aMessage ) { - C_TRACE (( _T("CModemAtHandler::HandleModemConnectResp()") )); + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_HANDLEMODEMCONNECTRESP, "CModemAtHandler::HandleModemConnectResp;iDteId=%d", iDteId ); + C_TRACE (( _T("CModemAtHandler::HandleModemConnectResp() %d"), iDteId )); TUint8 dteId = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_CONNECT_RESP_OFFSET_DTEID ); TInt status = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_CONNECT_RESP_OFFSET_RESULT ); TInt err = KErrGeneral; if( status == AT_MODEM_RESULT_OK ) { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATHANDLER_HANDLEMODEMCONNECTRESP, "CModemAtHandler::HandleModemConnectResp - Connected ok, AT_MODEM_RESULT_OK received" ); C_TRACE(_L("Connected ok, AT_MODEM_RESULT_OK received")); err = KErrNone; } else { + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATHANDLER_HANDLEMODEMCONNECTRESP, "CModemAtHandler::HandleModemConnectResp - Connection failed, AT_MODEM_RESULT_ERROR received;status=%d", status ); C_TRACE((_L("Connection failed, AT_MODEM_RESULT_ERROR received (%d)"), status)); - TRACE_ASSERT_ALWAYS; } iServer.SetDteIdAndConnect( dteId, err ); @@ -534,64 +564,324 @@ void CModemAtHandler::HandleSignalInd( const TIsiReceiveC& aMessage ) { - C_TRACE (( _T("CModemAtHandler::HandleSignalInd()") )); + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd;iDteId=%d", iDteId ); + C_TRACE (( _T("CModemAtHandler::HandleSignalInd() (%d)"), iDteId )); + TUint8 dteId = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_SIGNAL_IND_OFFSET_DTEID ); - iServer.HandleSignalInd( dteId ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd;dteId=%x", dteId ); + C_TRACE(( _L("dteId: 0x%x"), dteId )); + + if( iDteId != dteId ) + { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd - AT_MODEM_SIGNAL_IND is ignored because of it's received from diffrent dte." ); + C_TRACE (( _T("AT_MODEM_SIGNAL_IND is ignored because of it's received from diffrent dte.") )); + return; + } + + if( IsTextMessageMode() ) + { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd - AT_MODEM_SIGNAL_IND is ignored during text message mode." ); + C_TRACE (( _T("AT_MODEM_SIGNAL_IND is ignored during text message mode.") )); + return; + } + + // Go through indications. Note that common plugin handles only these: + // echo, verbose, quiet, escape char, linefeed char and backspace char. + + + + TUint8 count = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_SIGNAL_IND_OFFSET_NOOFSUBBLOCKS ); + OstTrace1( TRACE_NORMAL, DUP4_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd - subblock;count=%d", count ); + C_TRACE(( _L("subblock count: 0x%x"), count )); + if( count > 0 ) + { + TInt length( ISI_HEADER_SIZE + SIZE_AT_MODEM_SIGNAL_IND ); + TUint8 messageId( 0 ); + TUint8 echoValue( KInitialValue ); + TUint8 escapeChar( KInitialValue ); + TUint8 flowControlOutward( AT_MODEM_FLOW_CONTROL_SW ); + TUint8 flowControlInward( AT_MODEM_FLOW_CONTROL_SW ); + TUint8 flowControlExtract( AT_MODEM_WITH_EXTRACT ); + TUint8 dcdValue( AT_MODEM_DCD_OFF ); + TUint8 dsrValue( AT_MODEM_DSR_OFF ); + for( TInt i = 0; i < count; i++ ) + { + messageId = aMessage.Get8bit( length ); + OstTrace1( TRACE_NORMAL, DUP5_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd;messageId=%x", messageId ); + C_TRACE((_L("messageId: 0x%x"), messageId)); + + switch( messageId ) + { + case AT_MODEM_SB_ECHO_VALUE: + { + echoValue = aMessage.Get8bit( length + + AT_MODEM_SB_ECHO_VALUE_OFFSET_ECHOVALUE ); + OstTrace1( TRACE_NORMAL, DUP6_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd;echoValue=%x", echoValue ); + C_TRACE(( _L("echo value: 0x%x"), echoValue)); + length += SIZE_AT_MODEM_SB_ECHO_VALUE; + break; + } + case AT_MODEM_SB_DTE_PARAMS: + { + length += SIZE_AT_MODEM_SB_DTE_PARAMS; + break; + } + case AT_MODEM_SB_FLOW_CTRL: + { + flowControlOutward = aMessage.Get8bit( length + + AT_MODEM_SB_FLOW_CTRL_OFFSET_FLOWCTRLOUTWARDDCE ); + C_TRACE(( _L("Flow control outward used by DCE towards DTE: 0x%x"), flowControlOutward )); + + flowControlInward = aMessage.Get8bit( length + + AT_MODEM_SB_FLOW_CTRL_OFFSET_FLOWCTRLINWARDDTE ); + C_TRACE(( _L("Flow control inward from DTE: 0x%x"), flowControlInward )); + + flowControlExtract = aMessage.Get8bit( length + + AT_MODEM_SB_FLOW_CTRL_OFFSET_EXTRACT ); + C_TRACE(( _L("extract: 0x%x"), flowControlExtract )); + + TBuf8 data; + switch( flowControlOutward ) + { + case AT_MODEM_FLOW_CONTROL_SW: + data.Append( PEP_COMM_FLOW_CTRL_SW ); + break; + case AT_MODEM_FLOW_CONTROL_NONE: + data.Append( PEP_COMM_FLOW_CTRL_NONE ); + break; + case AT_MODEM_FLOW_CONTROL_HW: + data.Append( PEP_COMM_FLOW_CTRL_HW ); + break; + default: + data.Append( PEP_COMM_FLOW_CTRL_SW ); + break; + } + switch( flowControlInward ) + { + case AT_MODEM_FLOW_CONTROL_SW: + data.Append( PEP_COMM_FLOW_CTRL_SW ); + break; + case AT_MODEM_FLOW_CONTROL_NONE: + data.Append( PEP_COMM_FLOW_CTRL_NONE ); + break; + case AT_MODEM_FLOW_CONTROL_HW: + data.Append( PEP_COMM_FLOW_CTRL_HW ); + break; + default: + data.Append( PEP_COMM_FLOW_CTRL_SW ); + break; + } + switch( flowControlExtract ) + { + case AT_MODEM_NO_EXTRACT: + data.Append( PEP_COMM_FLOW_CTRL_NO_EXTRACT ); + break; + case AT_MODEM_WITH_EXTRACT: + data.Append( PEP_COMM_FLOW_CTRL_EXTRACT ); + break; + default: + data.Append( PEP_COMM_FLOW_CTRL_EXTRACT ); + break; + } + + TPipeInfo::EPipeState pipeState = iPipeController->GetPipeState(); + if( pipeState != TPipeInfo::EPipeNoPipe && + pipeState != TPipeInfo::EPipeRemoving ) + { + iPipeController->SendPepCtrlReq( PEP_COMM_CTRL_ID_FLOW_CTRL, data ); + } + length += SIZE_AT_MODEM_SB_FLOW_CTRL; + break; + } + case AT_MODEM_SB_ESCAPE_PARAMS: + { + escapeChar = aMessage.Get8bit( length + + AT_MODEM_SB_ESCAPE_PARAMS_OFFSET_ESCAPECHAR ); + OstTrace1( TRACE_NORMAL, DUP7_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd;escapeChar=%x", escapeChar ); + C_TRACE(( _L("escape character: 0x%x"), escapeChar )); + length += SIZE_AT_MODEM_SB_ESCAPE_PARAMS; + break; + } + case AT_MODEM_SB_AUTOBAUD: + { + length += SIZE_AT_MODEM_SB_AUTOBAUD; + break; + } + case AT_MODEM_SB_DTE_SIGNALS: + { + dcdValue = aMessage.Get8bit( length + + AT_MODEM_SB_DTE_SIGNALS_OFFSET_DCDSIGNAL ); + OstTrace1( TRACE_NORMAL, DUP8_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd;dcdValue=%x", dcdValue ); + C_TRACE(( _L("DCD value: 0x%x"), dcdValue)); + + dsrValue = aMessage.Get8bit( length + + AT_MODEM_SB_DTE_SIGNALS_OFFSET_DSRSIGNAL ); + OstTrace1( TRACE_NORMAL, DUP9_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd;dsrValue=%x", dsrValue ); + C_TRACE(( _L("DSR value: 0x%x"), dsrValue)); + TPipeInfo::EPipeState pipeState = iPipeController->GetPipeState(); + if( pipeState != TPipeInfo::EPipeNoPipe && + pipeState != TPipeInfo::EPipeRemoving ) + { + if( AT_MODEM_DCD_OFF == dcdValue ) + { + iPipeController->SendPepStatusIndSignal( PEP_COMM_SIGNAL_DCD_OFF ); + } + else if( AT_MODEM_DCD_ON == dcdValue ) + { + iPipeController->SendPepStatusIndSignal( PEP_COMM_SIGNAL_DCD_ON ); + } + + if( AT_MODEM_DSR_OFF == dsrValue ) + { + iPipeController->SendPepStatusIndSignal( PEP_COMM_SIGNAL_DSR_OFF ); + } + else if( AT_MODEM_DSR_ON == dsrValue ) + { + iPipeController->SendPepStatusIndSignal( PEP_COMM_SIGNAL_DSR_ON ); + } + } + length += SIZE_AT_MODEM_SB_DTE_SIGNALS; + break; + } + default: + { + TRACE_ASSERT_ALWAYS; + break; + } + } + } + + if( escapeChar != KInitialValue ) + { + OstTrace0( TRACE_NORMAL, DUP10_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd - Escape char received, it will be sent to dataport." ); + C_TRACE(( _T("Escape char received, it will be sent to dataport.") )); + + // Dataport should have the pipehandle and escape character. It defaults to handle 0xff and escape char '+'. + TPipeInfo::EPipeState pipeState = iPipeController->GetPipeState(); + if( pipeState != TPipeInfo::EPipeNoPipe && + pipeState != TPipeInfo::EPipeRemoving ) + { + TBuf8 data; + data.Append( escapeChar ); + data.Append( KEscapeTime ); + iPipeController->SendPepCtrlReq( PEP_COMM_CTRL_ID_ESCAPE, data ); + } + + } + if( IsPipeInDataMode() ) + { + OstTrace0( TRACE_NORMAL, DUP11_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd - AT_MODEM_SIGNAL_IND is ignored during data mode (exception: escape char is allowed)" ); + C_TRACE (( _T("AT_MODEM_SIGNAL_IND is ignored during data mode (exception: escape char is allowed)") )); + return; + } + + if( echoValue == KInitialValue ) + { + OstTrace0( TRACE_NORMAL, DUP12_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd - AT_MODEM_SIGNAL_IND not handled (no echo changes)" ); + C_TRACE(( _T("AT_MODEM_SIGNAL_IND not handled (no echo changes)") )); + return; + } + TInt sessionCount = iServer.SessionCount(); + if( sessionCount == KSessionIndLimit ) + { + OstTrace0( TRACE_NORMAL, DUP13_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd - AT_MODEM_SIGNAL_IND not handled (connect ongoing)" ); + C_TRACE(( _T("AT_MODEM_SIGNAL_IND not handled (connect ongoing)") )); + return; + } + if( iServer.IsSettingQueryOngoing() ) + { + // V, Q or E command is not ongoing, handle AT_MODEM_SIGNAL_IND always. + OstTrace0( TRACE_NORMAL, DUP14_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd - AT_MODEM_SIGNAL_IND not handled (Q, V or E query ongoing)" ); + C_TRACE(( _T("AT_MODEM_SIGNAL_IND not handled (Q, V or E query ongoing)") )); + return; + } + + if( !iServer.IsEchoNotified( echoValue ) ) + { + OstTrace0( TRACE_NORMAL, DUP15_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd - Handling AT_MODEM_SIGNAL_IND (new echo value received, more than 1 session open)" ); + C_TRACE(( _T("Handling AT_MODEM_SIGNAL_IND (new echo value received, more than 1 session open)") )); + iServer.HandleSignalInd( dteId, KErrNone ); + return; + } + + OstTrace1( TRACE_NORMAL, DUP16_CMODEMATHANDLER_HANDLESIGNALIND, "CModemAtHandler::HandleSignalInd - AT_MODEM_SIGNAL_IND not handled.;sessionCount=%d", sessionCount ); + C_TRACE(( _L("AT_MODEM_SIGNAL_IND not handled. sessionCount: %d"), sessionCount )); + } + // no else } void CModemAtHandler::HandleUnsolicitedData( const TIsiReceiveC& aMessage ) { - C_TRACE (( _T("CModemAtHandler::HandleUnsolicitedData()") )); - TUint8 dteId = aMessage.Get8bit( ISI_HEADER_SIZE+ AT_MODEM_UNSOLICITED_DATA_IND_OFFSET_LENGTH ); + TUint8 dteId = aMessage.Get8bit( ISI_HEADER_SIZE+AT_MODEM_UNSOLICITED_DATA_IND_OFFSET_DTEID ); TInt length = aMessage.Get16bit( ISI_HEADER_SIZE+AT_MODEM_UNSOLICITED_DATA_IND_OFFSET_LENGTH ); - - iServer.HandleUnsolicitedData( dteId, - aMessage.GetData( ISI_HEADER_SIZE + AT_MODEM_UNSOLICITED_DATA_IND_OFFSET_UNSOLICITEDDATABUFFER, - length ) ); + OstTraceExt2( TRACE_NORMAL, CMODEMATHANDLER_HANDLEUNSOLICITEDDATA, "CModemAtHandler::HandleUnsolicitedData;dteId=%d;iDteId=%d", dteId, iDteId ); + C_TRACE (( _T("CModemAtHandler::HandleUnsolicitedData() %d %d"), dteId, iDteId )); + if( iDteId == dteId || + KReservedDteId == dteId ) + { + iServer.HandleUnsolicitedData( dteId, + aMessage.GetData( ISI_HEADER_SIZE + AT_MODEM_UNSOLICITED_DATA_IND_OFFSET_UNSOLICITEDDATABUFFER, + length ) ); + } + // no else } void CModemAtHandler::HandleIntermediateDataInd( const TIsiReceiveC& aMessage ) { - C_TRACE (( _T("CModemAtHandler::HandleIntermediateDataInd()") )); TUint8 dteId = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_INTERMEDIATE_DATA_IND_OFFSET_DTEID ); TInt length = aMessage.Get16bit( ISI_HEADER_SIZE + AT_MODEM_INTERMEDIATE_DATA_IND_OFFSET_LENGTH ); - - TUint transactionId = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_CMD_RESP_OFFSET_TID ); - - C_TRACE((_L("transactionId from %d"), transactionId)); - transactionId = iLastTransactionId; - C_TRACE((_L("transactionId after setting it to iLastTransactionId: %d"), transactionId)); - - TUint8 command = transactionId & KCommandBits; //normal AT-cmd or Nvram-query - TUint8 pluginType = transactionId >> KTransactionIdBitsShift; - C_TRACE((_L("dteId %d, command %d (AT=0,NVRAM=1), pluginType = %d (atext=0,common=1)"), dteId, command, pluginType)); - - iServer.HandleIntermediateDataInd( dteId, - (TATPluginInterface) pluginType, - aMessage.GetData( ISI_HEADER_SIZE + AT_MODEM_INTERMEDIATE_DATA_IND_OFFSET_INTERMEDIATEDATABUFFER, - length), - command ); + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_HANDLEINTERMEDIATEDATAIND, "CModemAtHandler::HandleIntermediateDataInd;iDteId=%d", iDteId ); + C_TRACE (( _T("CModemAtHandler::HandleIntermediateDataInd() %d"), iDteId )); + + if( iDteId == dteId ) + { + TUint transactionId = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_CMD_RESP_OFFSET_TID ); + + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATHANDLER_HANDLEINTERMEDIATEDATAIND, "CModemAtHandler::HandleIntermediateDataInd - transactionId from;transactionId=%d", transactionId ); + C_TRACE((_L("transactionId from %d"), transactionId)); + transactionId = iLastTransactionId; + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATHANDLER_HANDLEINTERMEDIATEDATAIND, "CModemAtHandler::HandleIntermediateDataInd - transactionId after setting it to iLastTransactionId:;transactionId=%d", transactionId ); + C_TRACE((_L("transactionId after setting it to iLastTransactionId: %d"), transactionId)); + + TUint8 command = transactionId & KCommandBits; //normal AT-cmd or Nvram-query + TUint8 pluginType = transactionId >> KTransactionIdBitsShift; + OstTraceExt4( TRACE_NORMAL, DUP3_CMODEMATHANDLER_HANDLEINTERMEDIATEDATAIND, "CModemAtHandler::HandleIntermediateDataInd;dteId=%d;command=%d;(AT=0,NVRAM=1);pluginType=%d;(atext=0,common=1);iDteId=%d", dteId, command, pluginType, iDteId ); + C_TRACE((_L("dteId %d, command %d (AT=0,NVRAM=1), pluginType = %d (atext=0,common=1)"), dteId, command, pluginType)); + + iServer.HandleIntermediateDataInd( dteId, + (TATPluginInterface) pluginType, + aMessage.GetData( ISI_HEADER_SIZE + AT_MODEM_INTERMEDIATE_DATA_IND_OFFSET_INTERMEDIATEDATABUFFER, + length), + command ); + } } void CModemAtHandler::HandleRedirectInd( const TIsiReceiveC& aMessage ) { - C_TRACE (( _T("CModemAtHandler::HandleRedirectInd()") )); - TUint8 dteId = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_DATA_REDIRECT_IND_OFFSET_DTEID ); - TInt newSecondDevId = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_DATA_REDIRECT_IND_OFFSET_DEVICEID ); - TInt newSecondObjId = aMessage.Get16bit( ISI_HEADER_SIZE + AT_MODEM_DATA_REDIRECT_IND_OFFSET_SERVERID ); -#ifndef NCP_COMMON_BRIDGE_FAMILY - iPipeController->RedirectPipe( dteId, newSecondDevId, newSecondObjId ); -#endif + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_HANDLEREDIRECTIND, "CModemAtHandler::HandleRedirectInd;iChannel=%d", iChannel ); + C_TRACE (( _T("CModemAtHandler::HandleRedirectInd() %d %d"), iDteId, iChannel )); + if( iDteId == dteId ) + { + TInt newSecondDevId = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_DATA_REDIRECT_IND_OFFSET_DEVICEID ); + TInt newSecondObjId = aMessage.Get16bit( ISI_HEADER_SIZE + AT_MODEM_DATA_REDIRECT_IND_OFFSET_SERVERID ); + iPipeController->RedirectPipe( newSecondDevId, newSecondObjId ); + } + else + { + TRACE_ASSERT_ALWAYS; + } } -void CModemAtHandler::SendAtModemDataRedirectResultReq( const TUint8 aDteId, const TUint aResult ) +void CModemAtHandler::SendAtModemDataRedirectResultReq( const TUint aResult ) { + OstTrace0( TRACE_NORMAL, CMODEMATHANDLER_SENDATMODEMDATAREDIRECTRESULTREQ, "CModemAtHandler::SendAtModemDataRedirectResultReq" ); C_TRACE (( _T("CModemAtHandler::SendAtModemDataRedirectResultReq()") )); HBufC8* message = HBufC8::New( ISI_HEADER_SIZE + SIZE_AT_MODEM_DATA_REDIRECT_RESULT_REQ ); - C_TRACE((_L("Sending AT_MODEM_DATA_REDIRECT_RESULT_REQ dteid %d result %d"), aDteId, aResult)); + OstTraceExt2( TRACE_NORMAL, DUP1_CMODEMATHANDLER_SENDATMODEMDATAREDIRECTRESULTREQ, "CModemAtHandler::SendAtModemDataRedirectResultReq - Sending AT_MODEM_DATA_REDIRECT_RESULT_REQ;iDteId=%d;aResult=%d", (TUint)iDteId, aResult ); + C_TRACE((_L("Sending AT_MODEM_DATA_REDIRECT_RESULT_REQ dteid %d result %d"), iDteId, aResult)); TPtr8 messageptr = message->Des(); TIsiSend isimessage( messageptr, ISI_HEADER_SIZE + SIZE_AT_MODEM_DATA_REDIRECT_RESULT_REQ ); @@ -599,13 +889,15 @@ isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_DATA_REDIRECT_RESULT_REQ_OFFSET_TID, 0 ); isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_DATA_REDIRECT_RESULT_REQ_OFFSET_MESSAGEID, AT_MODEM_DATA_REDIRECT_RESULT_REQ ); - isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_DATA_REDIRECT_RESULT_REQ_OFFSET_DTEID ,aDteId ); + isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_DATA_REDIRECT_RESULT_REQ_OFFSET_DTEID ,iDteId ); isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_DATA_REDIRECT_RESULT_REQ_OFFSET_RESULT ,aResult ); isimessage.Complete(); + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATHANDLER_SENDATMODEMDATAREDIRECTRESULTREQ, "CModemAtHandler::SendAtModemDataRedirectResultReq - Created ISI-message" ); C_TRACE(_L("Created ISI-message")); for( TInt i = 0 ; i < (ISI_HEADER_SIZE + SIZE_AT_MODEM_DATA_REDIRECT_RESULT_REQ); i++ ) { + OstTraceExt2( TRACE_NORMAL, DUP3_CMODEMATHANDLER_SENDATMODEMDATAREDIRECTRESULTREQ, "CModemAtHandler - ;i=%d;%x", (TUint)i, (TUint)((*message)[i]) ); C_TRACE((_L("[%d] 0x%x"),i ,(*message)[i]) ); } @@ -618,90 +910,103 @@ void CModemAtHandler::HandleRedirectResultResp(const TIsiReceiveC& aMessage) { - C_TRACE (( _T("CModemAtHandler::HandleRedirectResultResp()") )); + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_HANDLEREDIRECTRESULTRESP, "CModemAtHandler::HandleRedirectResultResp;iDteId=%d", iDteId ); + C_TRACE (( _T("CModemAtHandler::HandleRedirectResultResp() %d"), iDteId )); TUint8 dteId = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_DATA_REDIRECT_RESULT_RESP_OFFSET_DTEID ); TInt error = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_DATA_REDIRECT_RESULT_RESP_OFFSET_RESULT ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATHANDLER_HANDLEREDIRECTRESULTRESP, "CModemAtHandler::HandleRedirectResultResp;dteId=%d", dteId ); C_TRACE((_L("CModemAtHandler::HandleRedirectResultResp() dte %d"), dteId)); if( error == AT_MODEM_RESULT_ERROR ) { - C_TRACE(_L("CModemAtHandler::HandleRedirectResultResp() AT_MODEM_RESULT_ERROR received, redirect failed")); - TRACE_ASSERT_ALWAYS; + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATHANDLER_HANDLEREDIRECTRESULTRESP, "CModemAtHandler::HandleRedirectResultResp - AT_MODEM_RESULT_ERROR -> COMMAND MODE" ); + C_TRACE(_L("AT_MODEM_RESULT_ERROR -> COMMAND MODE")); + iServer.HandleCommandModeChange( dteId, ECommandMode ); } else { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATHANDLER_HANDLEREDIRECTRESULTRESP, "CModemAtHandler::HandleRedirectResultResp - redirect OK, enable pipe" ); C_TRACE(_L("CModemAtHandler::HandleRedirectResultResp() redirect OK")); + TPipeInfo::EPipeState pipeState = iPipeController->GetPipeState(); + OstTrace1( TRACE_NORMAL, DUP4_CMODEMATHANDLER_HANDLEREDIRECTRESULTRESP, "CModemAtHandler::HandleRedirectResultResp;pipeState=%d", pipeState ); + C_TRACE((_L("CModemAtHandler::HandleRedirectResultResp() pipe state %d"), pipeState)); + if( pipeState != TPipeInfo::EPipeDisabled ) + { + iPipeController->SendEnablePipeReq(); + } } - } + void CModemAtHandler::HandleCommandModeChange( TCommandMode aMode ) { - C_TRACE(( _T("CModemAtHandler::HandleCommandModeChange() aMode: %d"), (TInt) aMode )); - iServer.HandleCommandModeChange( aMode ); + OstTraceExt2( TRACE_NORMAL, CMODEMATHANDLER_HANDLECOMMANDMODECHANGE, "CModemAtHandler::HandleCommandModeChange;aMode=%d;iDteId=%d", (TUint)aMode, (TUint)iDteId ); + C_TRACE(( _T("CModemAtHandler::HandleCommandModeChange() aMode: %d dteId: %d"), (TInt) aMode, iDteId )); + iServer.HandleCommandModeChange( iDteId, aMode ); } -TInt CModemAtHandler::SendEscapeSignalDetection( const TUint8 aDteId ) +TInt CModemAtHandler::SendSignalDetection( const TUint8 aSignal ) { - C_TRACE((_T("CModemAtHandler::SendEscapeSignalDetection(%d)"), aDteId)); -#ifdef __WINSCW__ - iDteId = aDteId; - return KErrNone; -#endif - + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_SENDSIGNALDETECTION, "CModemAtHandler::SendSignalDetection;iDteId=%d", iDteId ); + C_TRACE((_T("CModemAtHandler::SendSignalDetection( dteId: %d, aSignal: 0x%x)"), iDteId, aSignal )); + TInt error( KErrGeneral ); TUint msgSize( ISI_HEADER_SIZE + SIZE_AT_MODEM_SIGNAL_DETECTED_REQ ); TUint size( msgSize + SIZE_AT_MODEM_SB_SIGNAL_DETECTED ); HBufC8* message = HBufC8::New( size ); if( message ) - { - TPtr8 messageptr = message->Des(); - TIsiSend isimessage( messageptr, size ); - isimessage.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_AT_MODEM ); - isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_SIGNAL_DETECTED_REQ_OFFSET_TID, 0x00 ); - isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_SIGNAL_DETECTED_REQ_OFFSET_MESSAGEID, - AT_MODEM_SIGNAL_DETECTED_REQ ); - isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_SIGNAL_DETECTED_REQ_OFFSET_DTEID, aDteId ); - isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_SIGNAL_DETECTED_REQ_OFFSET_NOOFSUBBLOCKS, 0x01 ); - isimessage.Set8bit( msgSize + AT_MODEM_SB_SIGNAL_DETECTED_OFFSET_SUBBLOCKID, - AT_MODEM_SB_SIGNAL_DETECTED ); - isimessage.Set8bit( msgSize + AT_MODEM_SB_SIGNAL_DETECTED_OFFSET_SUBBLOCKLENGTH, - SIZE_AT_MODEM_SB_SIGNAL_DETECTED ); - isimessage.Set8bit( msgSize + AT_MODEM_SB_SIGNAL_DETECTED_OFFSET_TYPEOFSIGNALDETECTED, - AT_MODEM_SIGNAL_ESCAPE_DETECTED ); - isimessage.Set8bit( msgSize + AT_MODEM_SB_SIGNAL_DETECTED_OFFSET_FILLERBYTE1, 0x00 ); - isimessage.Complete(); - error = iIscApi->Send(messageptr); - C_TRACE((_L("escape send result %d"), error )); - delete message; - message = NULL; - } + { + TPtr8 messageptr = message->Des(); + TIsiSend isimessage( messageptr, size ); + isimessage.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_AT_MODEM ); + isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_SIGNAL_DETECTED_REQ_OFFSET_TID, 0x00 ); + isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_SIGNAL_DETECTED_REQ_OFFSET_MESSAGEID, + AT_MODEM_SIGNAL_DETECTED_REQ ); + isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_SIGNAL_DETECTED_REQ_OFFSET_DTEID, iDteId ); + isimessage.Set8bit( ISI_HEADER_SIZE + AT_MODEM_SIGNAL_DETECTED_REQ_OFFSET_NOOFSUBBLOCKS, 0x01 ); + isimessage.Set8bit( msgSize + AT_MODEM_SB_SIGNAL_DETECTED_OFFSET_SUBBLOCKID, + AT_MODEM_SB_SIGNAL_DETECTED ); + isimessage.Set8bit( msgSize + AT_MODEM_SB_SIGNAL_DETECTED_OFFSET_SUBBLOCKLENGTH, + SIZE_AT_MODEM_SB_SIGNAL_DETECTED ); + isimessage.Set8bit( msgSize + AT_MODEM_SB_SIGNAL_DETECTED_OFFSET_TYPEOFSIGNALDETECTED, + aSignal ); + isimessage.Set8bit( msgSize + AT_MODEM_SB_SIGNAL_DETECTED_OFFSET_FILLERBYTE1, 0x00 ); + isimessage.Complete(); + error = iIscApi->Send(messageptr); + TRACE_ASSERT( error == KErrNone ); + delete message; + message = NULL; + } else - { - ASSERT_ALWAYS; - error = KErrNoMemory; - } + { + ASSERT_ALWAYS; + error = KErrNoMemory; + } return error; } void CModemAtHandler::HandleSignalDetectedResp( const TIsiReceiveC& aMessage ) { - C_TRACE (( _T("CModemAtHandler::HandleSignalDetectedResp() escape sequence detect response received from cellmo") )); + OstTrace0( TRACE_NORMAL, CMODEMATHANDLER_HANDLESIGNALDETECTEDRESP, "CModemAtHandler::HandleSignalDetectedResp() - escape sequence detect response received from cellmo" ); + C_TRACE (( _T("CModemAtHandler::HandleSignalDetectedResp()") )); TUint8 dteId( aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_SIGNAL_DETECTED_RESP_OFFSET_DTEID ) ); TInt result = aMessage.Get8bit( ISI_HEADER_SIZE + AT_MODEM_SIGNAL_DETECTED_RESP_OFFSET_RESULT ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATHANDLER_HANDLESIGNALDETECTEDRESP, "CModemAtHandler::HandleSignalDetectedResp;dteId=%d", dteId ); C_TRACE((_L("CModemAtHandler::HandleSignalDetectedResp() dteId %d"), dteId)); TRACE_ASSERT( result == AT_MODEM_RESULT_OK ); } void CModemAtHandler::SetModemAtExistsInCmt( TBool aModemAtExistsInCmt ) { + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_SETMODEMATEXISTSINCMT, "CModemAtHandler::SetModemAtExistsInCmt;aModemAtExistsInCmt=%d", (TInt)aModemAtExistsInCmt ); C_TRACE((_T("CModemAtHandler::SetModemAtExistsInCmt(%d)"), (TInt)aModemAtExistsInCmt)); iModemAtExistInCmt = aModemAtExistsInCmt; } -TInt CModemAtHandler::SendAtModemConnectReq( const TUint8 aDteId ) +TInt CModemAtHandler::SendAtModemConnectReq() { - C_TRACE (( _T("CModemAtHandler::SendAtModemConnectReq()") )); + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_SENDATMODEMCONNECTREQ, "CModemAtHandler::SendAtModemConnectReq;iDteId=%d", iDteId ); + C_TRACE (( _T("CModemAtHandler::SendAtModemConnectReq() %d"), iDteId )); TInt size = ISI_HEADER_SIZE + SIZE_AT_MODEM_CONNECT_REQ; HBufC8* message = HBufC8::New( size ); TRACE_ASSERT( message ); @@ -710,15 +1015,129 @@ isimessage.Set8bit(ISI_HEADER_OFFSET_RESOURCEID, PN_AT_MODEM); isimessage.Set8bit(ISI_HEADER_SIZE + AT_MODEM_CONNECT_REQ_OFFSET_TID, KDefaultTId); isimessage.Set8bit(ISI_HEADER_SIZE + AT_MODEM_CONNECT_REQ_OFFSET_MESSAGEID, AT_MODEM_CONNECT_REQ); - isimessage.Set8bit(ISI_HEADER_SIZE + AT_MODEM_CONNECT_REQ_OFFSET_DTEID, aDteId); + isimessage.Set8bit(ISI_HEADER_SIZE + AT_MODEM_CONNECT_REQ_OFFSET_DTEID, iDteId); isimessage.Set8bit(ISI_HEADER_SIZE + AT_MODEM_CONNECT_REQ_OFFSET_FILLERBYTE1, KFiller); isimessage.Complete(); + OstTraceExt1( TRACE_NORMAL, DUP1_CMODEMATHANDLER_SENDATMODEMCONNECTREQ, "CModemAtHandler::SendAtModemConnectReq - message dump;messageptr=%s", messageptr ); DUMP_MESSAGE( messageptr ); TInt err = iIscApi->Send( messageptr ); TRACE_ASSERT( err == KErrNone ); delete message; message = NULL; + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATHANDLER_SENDATMODEMCONNECTREQ, "CModemAtHandler::SendAtModemConnectReq - return;err=%d", err ); C_TRACE (( _T("CModemAtHandler::SendAtModemConnectReq()<< returned: %d"), err )); return err; } +TBool CModemAtHandler::IsPipeInDataMode() + { + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_ISPIPEINDATAMODE, "CModemAtHandler::IsPipeInDataMode;iDteId=%d", iDteId ); + C_TRACE(( _T("CModemAtHandler::IsPipeInDataMode() dteId: %d"), iDteId )); + TPipeInfo::EPipeState pipeState( iPipeController->GetPipeState() ); + if( pipeState == TPipeInfo::EPipeEnabled || + pipeState == TPipeInfo::EPipeRedirected ) + { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATHANDLER_ISPIPEINDATAMODE, "CModemAtHandler::IsPipeInDataMode - True" ); + C_TRACE(( _T("CModemAtHandler::IsPipeInDataMode() True") )); + return ETrue; + } + else + { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATHANDLER_ISPIPEINDATAMODE, "CModemAtHandler::IsPipeInDataMode - False" ); + C_TRACE(( _T("CModemAtHandler::IsPipeInDataMode() False") )); + return EFalse; + } + } + + +void CModemAtHandler::SetTextMessageMode( TBool aTextMode ) + { + OstTraceExt2( TRACE_NORMAL, CMODEMATHANDLER_SETTEXTMESSAGEMODE, "CModemAtHandler::SetTextMessageMode(;aTextMode=%d;);iDteId=%d", (TUint)aTextMode, (TUint)iDteId ); + C_TRACE (( _T("CModemAtHandler::SetTextMessageMode( aTextMode: %d ) dte id: %d"), (TInt) aTextMode, iDteId )); + iTextMessageMode = aTextMode; + } + +TBool CModemAtHandler::IsTextMessageMode() + { + OstTraceExt2( TRACE_NORMAL, CMODEMATHANDLER_ISTEXTMESSAGEMODE, "CModemAtHandler::IsTextMessageMode;iTextMessageMode=%d;iDteId=%d", (TUint)iTextMessageMode, (TUint)iDteId ); + C_TRACE (( _T("CModemAtHandler::IsTextMessageMode() iTextMessageMode: %d dte id: %d"), (TInt) iTextMessageMode, iDteId )); + return iTextMessageMode; + } + +void CModemAtHandler::PipeCreated( TUint8 aPipeHandle, TInt aError ) + { + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_PIPECREATED, "CModemAtHandler::PipeCreated;aPipeHandle=%d", aPipeHandle ); + C_TRACE(( _T("CModemAtHandler::PipeCreated() pipehandle: %d"), aPipeHandle )); + + iDteId = aPipeHandle; + + if( KErrNone == aError ) + { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATHANDLER_PIPECREATED, "CModemAtHandler::PipeCreated - pipe created, let's connect to modem" ); + C_TRACE(( _T("CModemAtHandler::pipeCreated(): pipe created, let's connect to modem") )); + SendAtModemConnectReq(); + } + else + { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATHANDLER_PIPECREATED, "CModemAtHandler::PipeCreated - pipe creation has failed, connect is aborted" ); + C_TRACE(( _T("CModemAtHandler::pipeCreated(): pipe creation has failed, connect is aborted") )); + iServer.SetDteIdAndConnect( KInvalidPipeHandle, aError ); + } + } + + +void CModemAtHandler::AddDevice( TUint8 aDevId, TUint8 aObjId ) + { + OstTraceExt2( TRACE_NORMAL, CMODEMATHANDLER_ADDDEVICE, "CModemAtHandler::AddDevice;aDevId=%x;aObjId=%x", aDevId, aObjId ); + C_TRACE(( _T("CModemAtHandler::AddDevice() aDevId: 0x%x, aObjId: 0x%x"), aDevId, aObjId )); + iServer.AddDevice( aDevId, aObjId ); + } + + +void CModemAtHandler::RemoveDevice( TUint8 aDevId, TUint8 aObjId ) + { + OstTraceExt2( TRACE_NORMAL, CMODEMATHANDLER_REMOVEDEVICE, "CModemAtHandler::RemoveDevice;aDevId=%hhu;aObjId=%hhu", aDevId, aObjId ); + C_TRACE(( _T("CModemAtHandler::RemoveDevice() aDevId: 0x%x, aObjId: 0x%x"), aDevId, aObjId )); + iServer.RemoveDevice( aDevId, aObjId ); + } + +void CModemAtHandler::GetDataportObjectId( TUint& aObjId ) + { + OstTrace0( TRACE_NORMAL, CMODEMATHANDLER_GETDATAPORTOBJECTID, "CModemAtHandler::GetDataportObjectId" ); + C_TRACE(( _T("CModemAtHandler::GetDataportObjectId()") )); + aObjId = iDataportObjId; + } + +void CModemAtHandler::GetSecondaryDataportObjectId( TUint& aObjId ) + { + OstTrace0( TRACE_NORMAL, CMODEMATHANDLER_GETSECONDARYDATAPORTOBJECTID, "CModemAtHandler::GetSecondaryDataportObjectId" ); + C_TRACE(( _T("CModemAtHandler::GetScondaryDataportObjectId()") )); + TBuf8 dpObjId; + + if( iIscApi ) + { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATHANDLER_GETSECONDARYDATAPORTOBJECTID, "CModemAtHandler::GetSecondaryDataportObjectId - call GetChannelInfo(EIscNokiaDataport4) " ); + C_TRACE(( _T("GetChannelInfo() EIscNokiaDataport4") )); + iIscApi->GetChannelInfo( EIscNokiaDataport4, dpObjId ); + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATHANDLER_GETSECONDARYDATAPORTOBJECTID, "CModemAtHandler::GetSecondaryDataportObjectId - GetChannelInfo() done" ); + C_TRACE(( _T("GetChannelInfo() done") )); + aObjId = (((TUint16)(dpObjId[0])) << KEightBits) + dpObjId[1]; + OstTrace1( TRACE_NORMAL, DUP3_CMODEMATHANDLER_GETSECONDARYDATAPORTOBJECTID, "CModemAtHandler::GetSecondaryDataportObjectId;aObjId=%d", aObjId ); + C_TRACE((_L("DataportObjId 0x%x"), aObjId )); + } + else + { + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATHANDLER_GETSECONDARYDATAPORTOBJECTID, "CModemAtHandler::GetSecondaryDataportObjectId - No IscApi found, using default dataport object id" ); + C_TRACE(( _T("No IscApi found, using default dataport object id") )); + } + } + + +TInt CModemAtHandler::GetChannelId() + { + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATHANDLER_GETCHANNELID, "CModemAtHandler::GetChannelId;iChannel=%x", iChannel ); + OstTrace1( TRACE_NORMAL, CMODEMATHANDLER_GETCHANNELID, "CModemAtHandler::GetChannelId;this=%x", this ); + C_TRACE(( _T("CModemAtHandler::GetChannelId() handler: 0x%x, channel id: 0x%x"), this, iChannel )); + return iChannel; + } + diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_exe/src/cmodematpipecontroller.cpp --- a/adaptationlayer/modematadaptation/modematcontroller_exe/src/cmodematpipecontroller.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_exe/src/cmodematpipecontroller.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-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" @@ -20,30 +20,36 @@ #include //For ISC #include //isc definitions #include -#ifndef NCP_COMMON_BRIDGE_FAMILY #include #include //pipe #include //pipe -#endif #include //for isimessage -#include "cmodematpipecontroller.h" +#include "cmodematpipecontroller.h" #include "cmodemathandler.h" #include //redirectreq error codes #include "modemattrace.h" #include "cmodematsrv.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmodematpipecontrollerTraces.h" +#endif -#ifndef NCP_COMMON_BRIDGE_FAMILY -const TUint8 PEP_COMM_IND_ID_ESCAPE = 0x07; const TUint8 KFiller = 0; const TUint8 KDefaultTrId = 0; const TInt KLastByteIndex = 3; -#endif +const TUint8 KDpPadding = 0; +const TUint8 KDialUpPort1 = 1;// from Dataport export (otherwise hard coded and incorrect) +const TUint8 KDialUpPort4 = 4; +const TUint8 KDialUpPort5 = 5; +const TUint8 KPepCtrlDataSize = 1; +const TUint8 KPepFlowCtrlDataSize = 2; CModemAtPipeController* CModemAtPipeController::NewL( RIscApi& aIscApi, TUint& aObjId, CModemAtHandler& aHandler ) { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_NEWL, "CModemAtPipeController::NewL" ); CModemAtPipeController* self = new (ELeave) CModemAtPipeController( aIscApi,aObjId, aHandler ); CleanupStack::PushL( self ); self->ConstructL(); @@ -53,15 +59,18 @@ void CModemAtPipeController::ConstructL() { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_CONSTRUCTL, "CModemAtPipeController::ConstructL" ); C_TRACE (( _T("CModemAtPipeController::ConstructL()") )); } CModemAtPipeController::~CModemAtPipeController() { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_CMODEMATPIPECONTROLLER, "CModemAtPipeController::~CModemAtPipeController" ); C_TRACE((_L(">>CModemAtPipeController::~CModemAtPipeController()"))); if( iSchedulerWait ) { C_TRACE((_L("CModemAtPipeController::~CModemAtPipeController() iSchedulerWait->Stop"))); + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_CMODEMATPIPECONTROLLER, "CModemAtPipeController::~CModemAtPipeController - iSchedulerWait->Stop" ); iSchedulerWait->AsyncStop(); delete iSchedulerWait; iSchedulerWait = NULL; @@ -75,41 +84,45 @@ iIscApi( aIscApi ), iModemAtObjId( aObjId ), iModemAtDevId( THIS_DEVICE ), - iDataportDevId( 0 ), - iDataportObjId( 0 ), + iDpDevId( 0 ), + iDpObjId( 0 ), iAtHandler( aHandler ), iSchedulerWait( NULL ) - { - C_TRACE (( _T("CModemAtPipeController::CModemAtPipeController()>") )); - iPipe.pipeHandle = KInvalidPipeHandle; - iPipe.firstDevId = 0; - iPipe.firstObjId = 0; - iPipe.secondDevId = 0; - iPipe.secondDevId = 0; - iPipe.pipeState = TPipeInfo::EPipeNoPipe; + { + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_CMODEMATPIPECONTROLLER, "CModemAtPipeController::CModemAtPipeController;aObjId=%d", aObjId ); + C_TRACE (( _T("CModemAtPipeController::CModemAtPipeController() obj id: 0x%x>"), aObjId )); + iPipe.pipeHandle = KInvalidPipeHandle; + iPipe.firstDevId = 0; + iPipe.firstObjId = 0; + iPipe.secondDevId = 0; + iPipe.secondDevId = 0; + iPipe.pipeState = TPipeInfo::EPipeNoPipe; - C_TRACE (( _T("CModemAtPipeController::CModemAtPipeController()<") )); + C_TRACE (( _T("CModemAtPipeController::CModemAtPipeController()<") )); } -#ifndef NCP_COMMON_BRIDGE_FAMILY void CModemAtPipeController::HandleNameServiceMessage( const TIsiReceiveC& aReceivedMessage ) { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_HANDLENAMESERVICEMESSAGE, "CModemAtPipeController::HandleNameServiceMessage" ); C_TRACE (( _T("CModemAtPipeController::HandleNameServiceMessage()") )); switch( aReceivedMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ) { case PNS_NAME_QUERY_RESP: C_TRACE(_L("PNS_NAME_QUERY_RESP")); + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_HANDLENAMESERVICEMESSAGE, "CModemAtPipeController::HandleNameServiceMessage - PNS_NAME_QUERY_RESP" ); HandleNameQueryResp( aReceivedMessage ); break; case PNS_NAME_ADD_IND: C_TRACE(_L("PNS_NAME_ADD_IND")); + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_HANDLENAMESERVICEMESSAGE, "CModemAtPipeController::HandleNameServiceMessage - PNS_NAME_ADD_IND" ); HandleNameAddInd( aReceivedMessage ); break; case PNS_NAME_REMOVE_IND: C_TRACE(_L("PNS_NAME_REMOVE_IND")); + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATPIPECONTROLLER_HANDLENAMESERVICEMESSAGE, "CModemAtPipeController::HandleNameServiceMessage - PNS_NAME_REMOVE_IND" ); HandleNameRemoveInd( aReceivedMessage ); break; @@ -121,44 +134,58 @@ void CModemAtPipeController::HandlePipeServiceMessage( const TIsiReceiveC& aReceivedMessage) { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_HANDLEPIPESERVICEMESSAGE, "CModemAtPipeController::HandlePipeServiceMessage" ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_HANDLEPIPESERVICEMESSAGE, "CModemAtPipeController::HandlePipeServiceMessage;messageId=%d", aReceivedMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); C_TRACE (( _T("CModemAtPipeController::HandlePipeServiceMessage()") )); C_TRACE((_L("message id: %d") , aReceivedMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) )); switch( aReceivedMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ) { case PNS_PIPE_CREATE_RESP: C_TRACE(_L("PNS_PIPE_CREATE_RESP")); + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_HANDLEPIPESERVICEMESSAGE, "CModemAtPipeController::HandlePipeServiceMessage - PNS_PIPE_CREATE_RESP" ); HandlePipeCreateResp( aReceivedMessage ); break; case PNS_PIPE_REDIRECT_RESP: C_TRACE(_L("PNS_PIPE_REDIRECT_RESP")); + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATPIPECONTROLLER_HANDLEPIPESERVICEMESSAGE, "CModemAtPipeController::HandlePipeServiceMessage - PNS_PIPE_REDIRECT_RESP" ); HandlePipeRedirectResp( aReceivedMessage ); break; case PNS_PIPE_REMOVE_RESP: C_TRACE(_L("PNS_PIPE_REMOVE_RESP")); + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATPIPECONTROLLER_HANDLEPIPESERVICEMESSAGE, "CModemAtPipeController::HandlePipeServiceMessage - PNS_PIPE_REMOVE_RESP" ); HandlePipeRemoveResp( aReceivedMessage ); break; case PNS_PIPE_ENABLE_RESP: C_TRACE(_L("PNS_PIPE_ENABLE_RESP")); + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATPIPECONTROLLER_HANDLEPIPESERVICEMESSAGE, "CModemAtPipeController::HandlePipeServiceMessage - PNS_PIPE_ENABLE_RESP" ); HandlePipeEnabledResp( aReceivedMessage ); break; case PNS_PEP_STATUS_IND : C_TRACE(_L("PNS_PEP_STATUS_IND")); + OstTrace0( TRACE_NORMAL, DUP6_CMODEMATPIPECONTROLLER_HANDLEPIPESERVICEMESSAGE, "CModemAtPipeController::HandlePipeServiceMessage - PNS_PEP_STATUS_IND" ); HandlePepStatusInd( aReceivedMessage ); break; + + case PNS_PEP_CTRL_RESP: + C_TRACE(_L("PNS_PEP_CTRL_RESP")); + OstTrace0( TRACE_NORMAL, DUP7_CMODEMATPIPECONTROLLER_HANDLEPIPESERVICEMESSAGE, "CModemAtPipeController::HandlePipeServiceMessage - PNS_PEP_CTRL_RESP" ); + HandlePepCtrlResp( aReceivedMessage ); + break; default: TRACE_ASSERT_ALWAYS; break; - } + } } -TUint CModemAtPipeController::MatchDataportName( TUint aName) +TBool CModemAtPipeController::MatchDataportName( TUint aName ) { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_MATCHDATAPORTNAME, "CModemAtPipeController::MatchDataportName" ); /* See from dataport: @@ -175,30 +202,52 @@ break; Only 3 last bytes count */ + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_MATCHDATAPORTNAME, "CModemAtPipeController::MatchDataportName;aName=%d", aName ); + C_TRACE((_L("CModemAtPipeController::MatchDataportName(): %d") , aName ) ); + TBool ret( EFalse ); - TUint KDpDialUpPort = 1; - TUint KDpPadding = 0; - TUint dataportName(0); - dataportName = ( + TUint dataportName1(0); + dataportName1 = ( + ( (TUint)PN_PIPE ) | + ( (TUint)PN_PEP_TYPE_COMM << 8 ) | + ( KDpPadding << 16) | + ( KDialUpPort1 << 24 ) ); + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_MATCHDATAPORTNAME, "CModemAtPipeController::MatchDataportName;dataportName1=%d", dataportName1 ); + C_TRACE((_L("CModemAtPipeController::MatchDataportName(): name1 %d") , dataportName1 ) ); + TUint dataportName4(0); + dataportName4 = ( ( (TUint)PN_PIPE ) | ( (TUint)PN_PEP_TYPE_COMM << 8 ) | ( KDpPadding << 16) | - ( KDpDialUpPort << 24 ) - ); + ( KDialUpPort4 << 24 ) ); + OstTrace1( TRACE_NORMAL, DUP3_CMODEMATPIPECONTROLLER_MATCHDATAPORTNAME, "CModemAtPipeController::MatchDataportName;dataportName4=%d", dataportName4 ); + C_TRACE((_L("CModemAtPipeController::MatchDataportName(): name4 %d") , dataportName4 ) ); + TUint dataportName5(0); + dataportName5 = ( + ( (TUint)PN_PIPE ) | + ( (TUint)PN_PEP_TYPE_COMM << 8 ) | + ( KDpPadding << 16) | + ( KDialUpPort5 << 24 ) ); + OstTrace1( TRACE_NORMAL, DUP4_CMODEMATPIPECONTROLLER_MATCHDATAPORTNAME, "CModemAtPipeController::MatchDataportName;dataportName5=%d", dataportName5 ); + C_TRACE((_L("CModemAtPipeController::MatchDataportName(): name5 %d") , dataportName5 ) ); - if( aName == dataportName ) + if( dataportName1 == aName || + dataportName4 == aName || + dataportName5 == aName ) { - return ETrue; - } - return EFalse; + ret = ETrue; + } + return ret; } void CModemAtPipeController::HandleNameAddInd( const TIsiReceiveC& aReceivedMessage ) { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_HANDLENAMEADDIND, "CModemAtPipeController::HandleNameAddInd" ); C_TRACE (( _T("CModemAtPipeController::HandleNameAddInd()") )); TInt matchesInThisMsg = aReceivedMessage.Get16bit( ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_MATCHESINMSG ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_HANDLENAMEADDIND, "CModemAtPipeController::HandleNameAddInd;matchesInThisMsg=%d", matchesInThisMsg ); C_TRACE((_L("matchesInThisMsg: %d") ,matchesInThisMsg )); TUint name = 0; @@ -206,27 +255,28 @@ { name = aReceivedMessage.Get32bit(ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL * i); + OstTraceExt2( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_HANDLENAMEADDIND, "CModemAtPipeController:;i=%d;name=%x", i, name ); C_TRACE((_L("name [%d] 0x%x"), i ,name)); if( MatchDataportName(name) ) { - iDataportDevId = aReceivedMessage.Get8bit( ISI_HEADER_SIZE + + TUint8 devId = aReceivedMessage.Get8bit( ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL * i + PN_NAME_SRV_ITEM_STR_OFFSET_DEV ); - iDataportObjId = aReceivedMessage.Get8bit( ISI_HEADER_SIZE + + TUint8 objId = aReceivedMessage.Get8bit( ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL * i + PN_NAME_SRV_ITEM_STR_OFFSET_OBJ); - if( ( iDataportDevId == THIS_DEVICE ) && - ( iPipe.pipeState == TPipeInfo::EPipeNoPipe ) ) + if( devId == THIS_DEVICE ) { - C_TRACE((_L("Creating pipe. (Dataport device id 0x%x, object id: 0x%x)"),iDataportDevId,iDataportObjId)); - SendCreatePipeMessage( iDataportDevId, iDataportObjId ); + OstTraceExt2( TRACE_NORMAL, DUP3_CMODEMATPIPECONTROLLER_HANDLENAMEADDIND, "CModemAtPipeController::HandleNameAddInd - Adding dataport name.;devId=%x;objId=%x", devId, objId ); + C_TRACE((_L("Adding dataport name. (Dataport device id 0x%x, object id: 0x%x)"),devId,objId)); + iAtHandler.AddDevice( devId, objId ); } else { - C_TRACE((_L("ERROR: Pipe is not created. (Dataport device id 0x%x, object id: 0x%x)"),iDataportDevId, iDataportObjId )); - TRACE_ASSERT_ALWAYS; + OstTraceExt2( TRACE_NORMAL, DUP4_CMODEMATPIPECONTROLLER_HANDLENAMEADDIND, "CModemAtPipeController::HandleNameAddInd - ERROR: Pipe is not created.;devId=%x;objId=%x", devId, objId ); + C_TRACE((_L("ERROR: Pipe is not created. (Dataport device id 0x%x, object id: 0x%x)"),devId, objId )); } } } @@ -234,10 +284,12 @@ void CModemAtPipeController::HandleNameRemoveInd( const TIsiReceiveC& aReceivedMessage ) { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_HANDLENAMEREMOVEIND, "CModemAtPipeController::HandleNameRemoveInd" ); C_TRACE (( _T("CModemAtPipeController::HandleNameRemoveInd()") )); TInt matchesInThisMsg = aReceivedMessage.Get16bit( ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_MATCHESINMSG ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_HANDLENAMEREMOVEIND, "CModemAtPipeController::HandleNameRemoveInd;matchesInThisMsg=%d", matchesInThisMsg ); C_TRACE((_L("matchesInThisMsg: %d"), matchesInThisMsg )); TUint name = 0; @@ -245,6 +297,7 @@ { name = aReceivedMessage.Get32bit(ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_NAMEENTRYTBL * i); + OstTraceExt2( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_HANDLENAMEREMOVEIND, "CModemAtPipeController::HandleNameRemoveInd;i=%d;name=%x", i, name ); C_TRACE((_L("name [%d] 0x%x"), i ,name)); if( MatchDataportName(name) ) @@ -256,26 +309,20 @@ PNS_NAME_REMOVE_IND_OFFSET_NAMEENTRYTBL * i + PN_NAME_SRV_ITEM_STR_OFFSET_OBJ); - if( iDataportDevId == devId && iDataportObjId == objId ) - { - C_TRACE((_L("Dataport removed from name service (devid %x o-bjid %x) "), iDataportDevId, iDataportObjId)); - iDataportDevId = 0; - iDataportObjId = 0; - } - else - { - C_TRACE((_L("Unused dataport removed from name service. DevId: 0x%x or ObjId 0x%x"), iDataportDevId, iDataportObjId )); - TRACE_ASSERT_ALWAYS; - } + OstTraceExt2( TRACE_NORMAL, DUP3_CMODEMATPIPECONTROLLER_HANDLENAMEREMOVEIND, "CModemAtPipeController::HandleNameRemoveInd - Dataport removed from name service;devId=%x;objId=%x", devId, objId ); + C_TRACE((_L("Dataport removed from name service (devid %x o-bjid %x) "), devId, objId)); + iAtHandler.RemoveDevice( devId, objId ); } } } void CModemAtPipeController::HandleNameQueryResp( const TIsiReceiveC& aReceivedMessage ) { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_HANDLENAMEQUERYRESP, "CModemAtPipeController::HandleNameQueryResp" ); C_TRACE((_L("CModemAtPipeHandler::HandleNameQueryResp"))); TUint16 matchesInThisMsg( aReceivedMessage.Get16bit( ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_MATCHESINMSG ) ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_HANDLENAMEQUERYRESP, "CModemAtPipeController::HandleNameQueryResp;matchesInThisMsg=%d", matchesInThisMsg ); C_TRACE((_L("matchesInThisMsg: %d"), matchesInThisMsg )); TBool found = EFalse; @@ -287,9 +334,11 @@ TUint8 name( aReceivedMessage.Get8bit( ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_NAMEENTRYTBL + recordIndex + ( PN_NAME_SRV_ITEM_STR_OFFSET_NAME + KLastByteIndex ) ) ); + OstTraceExt2( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_HANDLENAMEQUERYRESP, "CModemAtPipeController::HandleNameQueryResp;i=%d;name=%x", i, name ); C_TRACE((_L("name [%d] 0x%x"), i, name )); if( PN_AT_MODEM == name ) { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATPIPECONTROLLER_HANDLENAMEQUERYRESP, "CModemAtPipeController::HandleNameQueryResp - PN_AT_MODEM found." ); C_TRACE((_L("PN_AT_MODEM found."))); i = matchesInThisMsg; found = ETrue; @@ -303,9 +352,13 @@ void CModemAtPipeController::SendCreatePipeMessage( const TUint8 aDevId, const TUint8 aObjId ) { + OstTraceExt2( TRACE_NORMAL, CMODEMATPIPECONTROLLER_SENDCREATEPIPEMESSAGE, "CModemAtPipeController::SendCreatePipeMessage;aDevId=%x;aObjId=%x", aDevId, aObjId ); C_TRACE (( _T("CModemAtPipeController::SendCreatePipeMessage() DevId: 0x%x ObjId: 0x%x"), aDevId, aObjId )); HBufC8* message = HBufC8::New( ISI_HEADER_SIZE + SIZE_PNS_PIPE_CREATE_REQ ); TRACE_ASSERT(message); + + iDpObjId = aObjId; + iDpDevId = aDevId; TPtr8 messageptr = message->Des(); TIsiSend isimessage( messageptr, ISI_HEADER_SIZE + SIZE_PNS_PIPE_CREATE_REQ ); @@ -326,6 +379,8 @@ isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_CREATE_REQ_OFFSET_SECONDPEPTYPE, PN_PEP_TYPE_COMMON ); isimessage.Complete(); + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_SENDCREATEPIPEMESSAGE, "CModemAtPipeController::SendCreatePipeMessage - Created ISI-message" ); + OstTraceExt1( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_SENDCREATEPIPEMESSAGE, "CModemAtPipeController::SendCreatePipeMessage - msg;messageptr=%s", messageptr ); C_TRACE(_L("Created ISI-message")); DUMP_MESSAGE( messageptr ); TInt retVal = iIscApi.Send( messageptr ); @@ -336,28 +391,36 @@ void CModemAtPipeController::HandlePipeCreateResp( const TIsiReceiveC& aReceivedMessage ) { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_HANDLEPIPECREATERESP, "CModemAtPipeController::HandlePipeCreateResp" ); C_TRACE (( _T("CModemAtPipeController::HandlePipeCreateResp()") )); TInt error = aReceivedMessage.Get8bit(ISI_HEADER_SIZE + PNS_PIPE_CREATE_RESP_OFFSET_ERRORCODE ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_HANDLEPIPECREATERESP, "CModemAtPipeController::HandlePipeCreateResp - Pipe create resp:;error=%d", error ); C_TRACE((_L("Pipe create resp: %d"), error )); if( error == PN_PIPE_NO_ERROR) { - iPipe.pipeHandle = aReceivedMessage.Get8bit( ISI_HEADER_SIZE + + TUint8 pipeHandle; + pipeHandle = aReceivedMessage.Get8bit( ISI_HEADER_SIZE + PNS_PIPE_CREATE_RESP_OFFSET_PIPEHANDLE ); - C_TRACE( (_L("Pipe created successfully. Pipehandle: %d"), iPipe.pipeHandle )); + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_HANDLEPIPECREATERESP, "CModemAtPipeController::HandlePipeCreateResp - Pipe created successfully.;pipeHandle=%d", pipeHandle ); + C_TRACE( (_L("Pipe created successfully. Pipehandle: %d"), pipeHandle )); // Now that pipehandle is received, it will also be used as dteId when connecting to AT Modem. - - iPipe.firstDevId = iDataportDevId; - iPipe.firstObjId = iDataportObjId; + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATPIPECONTROLLER_HANDLEPIPECREATERESP, "CModemAtPipeController::HandlePipeCreateResp - pipe found" ); + C_TRACE((_L("CModemAtPipeHandler::HandlePipeCreateResp: pipe found"))); + iPipe.pipeHandle = pipeHandle; + iPipe.firstDevId = iDpDevId; + iPipe.firstObjId = iDpObjId; + iPipe.secondObjId = iModemAtObjId; iPipe.secondDevId = THIS_DEVICE; - iPipe.secondObjId = iModemAtObjId; ChangePipeState( TPipeInfo::EPipeCreated ); + iAtHandler.PipeCreated( pipeHandle, KErrNone ); } else { + OstTrace1( TRACE_NORMAL, DUP4_CMODEMATPIPECONTROLLER_HANDLEPIPECREATERESP, "CModemAtPipeController::HandlePipeCreateResp - Pipe creation failed:;error=%d", error ); C_TRACE((_L("Pipe creation failed: %d"), error )); iPipe.pipeHandle = KInvalidPipeHandle; iPipe.firstDevId = 0; @@ -365,7 +428,8 @@ iPipe.secondDevId = 0; iPipe.secondObjId = 0; ChangePipeState( TPipeInfo::EPipeNoPipe ); - ASSERT_ALWAYS; + + iAtHandler.PipeCreated( KInvalidPipeHandle, KErrGeneral ); } } @@ -373,32 +437,27 @@ void CModemAtPipeController::HandlePipeRemoveResp( const TIsiReceiveC& aReceivedMessage ) { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_HANDLEPIPEREMOVERESP, "CModemAtPipeController::HandlePipeRemoveResp" ); C_TRACE (( _T(">>CModemAtPipeController::HandlePipeRemoveResp()") )); TInt error = aReceivedMessage.Get8bit( ISI_HEADER_SIZE + PNS_PIPE_REMOVE_RESP_OFFSET_ERRORCODE ); TInt pipehandle = aReceivedMessage.Get8bit( ISI_HEADER_SIZE + PNS_PIPE_REMOVE_RESP_OFFSET_PIPEHANDLE ); - TRACE_ASSERT( pipehandle == iPipe.pipeHandle ); - if( pipehandle != iPipe.pipeHandle ) - { - C_TRACE(( _T("CModemAtPipeController::HandlePipeRemoveResp() illegal pipehandle %d"), pipehandle )); - return; - } - + TRACE_ASSERT( error == PN_PIPE_NO_ERROR ) if( error != PN_PIPE_NO_ERROR ) { + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_HANDLEPIPEREMOVERESP, "CModemAtPipeController::HandlePipeRemoveResp;error=%d", error ); C_TRACE(( _T("CModemAtPipeController::HandlePipeRemoveResp() error %d"), error )); return; } ChangePipeState( TPipeInfo::EPipeNoPipe ); - iPipe.pipeHandle = KInvalidPipeHandle; - if( iSchedulerWait ) { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_HANDLEPIPEREMOVERESP, "CModemAtPipeController::HandlePipeRemoveResp - iSchedulerWait->Stop" ); C_TRACE((_L("CModemAtPipeController::HandlePipeRemoveResp() iSchedulerWait->Stop"))); iSchedulerWait->AsyncStop(); delete iSchedulerWait; @@ -408,45 +467,33 @@ } -void CModemAtPipeController::RemovePipe( const TUint8 aDteId ) +void CModemAtPipeController::RemovePipe() { - C_TRACE (( _T("CModemAtPipeController::RemovePipe(%d, 0x%x)"), aDteId, this )); - - C_TRACE (( _T("iPipe:0x%x"), &iPipe )); - C_TRACE (( _T("iHandle: %d"), iPipe.pipeHandle )); - C_TRACE (( _T("i1stDevId: %d"), iPipe.firstDevId )); - C_TRACE (( _T("i1stObjId: %d"), iPipe.firstObjId )); - C_TRACE (( _T("i2ndDevId: %d"), iPipe.secondDevId )); - C_TRACE (( _T("i2ndObjId: %d"), iPipe.secondObjId )); - - if( iPipe.pipeHandle != KInvalidPipeHandle ) + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_REMOVEPIPE, "CModemAtPipeController::RemovePipe" ); + OstTraceExt3( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_REMOVEPIPE, "CModemAtPipeController::RemovePipe - ;iPipe.pipeHandle=%d;this=%p;iPipe.pipeState=%d", iPipe.pipeHandle, this, iPipe.pipeState ); + C_TRACE (( _T("CModemAtPipeController::RemovePipe(%d, 0x%x)"), iPipe.pipeHandle, this )); + C_TRACE (( _T("CModemAtPipeController::RemovePipe( dteID: %d, state: %d)"), iPipe.pipeHandle, iPipe.pipeState )); + + if( KInvalidPipeHandle != iPipe.pipeHandle && + TPipeInfo::EPipeRemoving != iPipe.pipeState && + TPipeInfo::EPipeNoPipe != iPipe.pipeState ) { - if( ( iPipe.pipeState == TPipeInfo::EPipeRemoving ) || - ( iPipe.pipeState == TPipeInfo::EPipeNoPipe ) ) - { - C_TRACE((_L("Already removing pipe or pipe is removed. Handle %d"), iPipe.pipeHandle)); - return; - } - - if( aDteId != iPipe.pipeHandle ) - { - C_TRACE(( _T("Dteid %d is not same as pipehandle %d, so there is no pipe to remove."), aDteId, iPipe.pipeHandle )); - return; - } - - C_TRACE((_L("Remove pipe. Handle %d"), iPipe.pipeHandle)); + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_REMOVEPIPE, "CModemAtPipeController::RemovePipe - start to remove pipe" ); + C_TRACE((_L("CModemAtPipeController::RemovePipe: start to remove pipe"))); ChangePipeState( TPipeInfo::EPipeRemoving ); SendRemovePipeReq( iPipe.pipeHandle ); } else { - C_TRACE((_L("No Pipe to Remove"))); + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATPIPECONTROLLER_REMOVEPIPE, "CModemAtPipeController::RemovePipe - no need to remove pipe" ); + C_TRACE((_L("CModemAtPipeController::RemovePipe: no need to remove pipe"))); } } void CModemAtPipeController::SendRemovePipeReq( const TUint8 aPipeHandle ) { + OstTrace1( TRACE_NORMAL, CMODEMATPIPECONTROLLER_SENDREMOVEPIPEREQ, "CModemAtPipeController::SendRemovePipeReq();aPipeHandle=%d", aPipeHandle ); C_TRACE (( _T(">>CModemAtPipeController::SendRemovePipeReq()") )); C_TRACE((_L("Remove pipe handle %d"), aPipeHandle)); TInt size = ISI_HEADER_SIZE + SIZE_PNS_PIPE_REMOVE_REQ; @@ -463,6 +510,7 @@ aPipeHandle ); //disabled isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REMOVE_REQ_OFFSET_FILLERBYTE1 ,0 ); isimessage.Complete(); + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_SENDREMOVEPIPEREQ, "CModemAtPipeController::SendRemovePipeReq - Created ISI-message" ); C_TRACE(_L("Created ISI-message")); TInt retVal = iIscApi.Send( messageptr ); @@ -470,6 +518,7 @@ delete message; if( !iSchedulerWait ) { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_SENDREMOVEPIPEREQ, "CModemAtPipeController::SendRemovePipeReq - iSchedulerWait->Start()" ); C_TRACE(_L("CModemAtPipeController::SendRemovePipeReq() iSchedulerWait->Start()")); TRAPD(err, iSchedulerWait = new (ELeave) CActiveSchedulerWait); ASSERT_PANIC_ALWAYS( err == KErrNone ); @@ -478,43 +527,38 @@ C_TRACE (( _T("< cant redirect" ); C_TRACE(_L("CModemAtPipeController::RedirectPipe() Pipe is already removed -> cant redirect")); return; } if( aNewDevId == THIS_DEVICE && aNewObjId == iModemAtObjId ) { + OstTrace1( TRACE_NORMAL, DUP3_CMODEMATPIPECONTROLLER_REDIRECTPIPE, "CModemAtPipeController::RedirectPipe - EPipeDisabled.;iModemAtObjId=%x", iModemAtObjId ); C_TRACE((_L("CModemAtPipeController::RedirectPipe() EPipeDisabled. iModemAtObjId: 0x%x"), iModemAtObjId)); - ChangePipeState( TPipeInfo::EPipeDisabled ); + // NOTE: Setting pipe state disabled here won't send command mode yet. + iPipe.pipeState = TPipeInfo::EPipeDisabled; } else { + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATPIPECONTROLLER_REDIRECTPIPE, "CModemAtPipeController::RedirectPipe - EPipeRedirected" ); C_TRACE(_L("CModemAtPipeController::RedirectPipe() EPipeRedirected")); ChangePipeState( TPipeInfo::EPipeRedirected ); } + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATPIPECONTROLLER_REDIRECTPIPE, "CModemAtPipeController::RedirectPipe - Redirecting pipe" ); C_TRACE(_L("CModemAtPipeController::RedirectPipe() Redirecting pipe")); HBufC8* message = HBufC8::New( ISI_HEADER_SIZE + SIZE_PNS_PIPE_REDIRECT_REQ ); @@ -523,25 +567,24 @@ TIsiSend isimessage( messageptr, ISI_HEADER_SIZE + SIZE_PNS_PIPE_REDIRECT_REQ ); isimessage.Set8bit( ISI_HEADER_OFFSET_RESOURCEID,PN_PIPE); isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_REQ_OFFSET_UTID, 0); - isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_REQ_OFFSET_SUBFUNCTION, - PNS_PIPE_REDIRECT_REQ ); + PNS_PIPE_REDIRECT_REQ ); isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_REQ_OFFSET_PIPEHANDLE, - iPipe.pipeHandle ); + iPipe.pipeHandle ); isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_REQ_OFFSET_STATEAFTERCREATION, - PN_PIPE_DISABLE ); + PN_PIPE_DISABLE ); //old pep isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_REQ_OFFSET_OLDPEPDEV, - iPipe.secondDevId ); + iPipe.secondDevId ); isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_REQ_OFFSET_OLDPEPOBJ, - iPipe.secondObjId ); + iPipe.secondObjId ); isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_REQ_OFFSET_OLDPEPTYPE, PN_PEP_TYPE_COMMON); isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_REQ_OFFSET_FILLERBYTE1, KFiller ); isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_REQ_OFFSET_REPLACEMENTPEPDEV, aNewDevId ); isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_REQ_OFFSET_REPLACEMENTPEPOBJ, aNewObjId ); isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_REQ_OFFSET_REPLACEMENTPEPTYPE, - PN_PEP_TYPE_COMMON ); + PN_PEP_TYPE_COMMON ); iPipe.secondDevId = aNewDevId; iPipe.secondObjId = aNewObjId; @@ -549,6 +592,7 @@ isimessage.Set8bit(ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_REQ_OFFSET_NSB, KFiller ); isimessage.Complete(); + OstTrace0( TRACE_NORMAL, DUP6_CMODEMATPIPECONTROLLER_REDIRECTPIPE, "CModemAtPipeController::RedirectPipe - Created ISI-message" ); C_TRACE(_L("Created ISI-message")); TInt retVal = iIscApi.Send( messageptr ); TRACE_ASSERT( retVal == KErrNone ); @@ -557,6 +601,7 @@ void CModemAtPipeController::HandlePipeRedirectResp( const TIsiReceiveC& aReceivedMessage ) { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_HANDLEPIPEREDIRECTRESP, "CModemAtPipeController::HandlePipeRedirectResp" ); C_TRACE (( _T("CModemAtPipeController::HandlePipeRedirectResp()") )); TInt error = aReceivedMessage.Get8bit( ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_RESP_OFFSET_ERRORCODE ); @@ -566,38 +611,18 @@ if( error != PN_PIPE_NO_ERROR ) { - if( pipeHandle == iPipe.pipeHandle ) - { - C_TRACE(( _L("CModemAtPipeController::HandlePipeRedirectResp() pipe error: %d"), error )); - iAtHandler.SendAtModemDataRedirectResultReq( pipeHandle, AT_MODEM_REDIRECT_RESULT_ERROR); - RemovePipe( pipeHandle ); - return; - } - else - { - C_TRACE(( _L("CModemAtPipeController::HandlePipeRedirectResp() pipeHandle not found, pipe error: %d"), error )); - TRACE_ASSERT_ALWAYS; - return; - } + iAtHandler.SendAtModemDataRedirectResultReq( AT_MODEM_REDIRECT_RESULT_ERROR ); + RemovePipe(); } - - if( pipeHandle != iPipe.pipeHandle ) + else { - C_TRACE(( _L("CModemAtPipeController::HandlePipeRedirectResp() unknown pipehandle %d"), pipeHandle )); - TRACE_ASSERT_ALWAYS; - return; - } - - iAtHandler.SendAtModemDataRedirectResultReq( pipeHandle, AT_MODEM_REDIRECT_RESULT_OK ); - - if( iPipe.pipeState != TPipeInfo::EPipeDisabled ) - { - SendEnablePipeReq( pipeHandle ); + iAtHandler.SendAtModemDataRedirectResultReq( AT_MODEM_REDIRECT_RESULT_OK ); } } void CModemAtPipeController::QueryModemAtFromNameService() { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_QUERYMODEMATFROMNAMESERVICE, "CModemAtPipeController::QueryModemAtFromNameService" ); C_TRACE (( _T("CModemAtPipeController::QueryModemAtFromNameService()") )); HBufC8* message = HBufC8::New( ISI_HEADER_SIZE + SIZE_PNS_NAME_QUERY_REQ ); TRACE_ASSERT( message ); @@ -614,6 +639,7 @@ isimessage.Set32bit( ISI_HEADER_SIZE + PNS_NAME_QUERY_REQ_OFFSET_BITMASK, PN_AT_MODEM ); isimessage.Complete(); + OstTraceExt1( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_QUERYMODEMATFROMNAMESERVICE, "CModemAtPipeController::QueryModemAtFromNameService - msg dump;messageptr=%s", messageptr ); DUMP_MESSAGE( messageptr ); TInt retVal = iIscApi.Send( messageptr ); TRACE_ASSERT( retVal == KErrNone ); @@ -621,8 +647,9 @@ } } -void CModemAtPipeController::SendEnablePipeReq( const TUint8 aPipeHandle ) +void CModemAtPipeController::SendEnablePipeReq() { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_SENDENABLEPIPEREQ, "CModemAtPipeController::SendEnablePipeReq" ); C_TRACE (( _T("CModemAtPipeController::SendEnablePipeReq()") )); HBufC8* message = HBufC8::New( ISI_HEADER_SIZE + SIZE_PNS_PIPE_ENABLE_REQ ); ASSERT_PANIC_ALWAYS( message ) @@ -631,7 +658,7 @@ isimessage.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_PIPE ); isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_ENABLE_REQ_OFFSET_UTID, 0 ); isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_ENABLE_REQ_OFFSET_SUBFUNCTION, PNS_PIPE_ENABLE_REQ ); - isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_ENABLE_REQ_OFFSET_PIPEHANDLE , aPipeHandle ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_ENABLE_REQ_OFFSET_PIPEHANDLE , iPipe.pipeHandle ); isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PIPE_ENABLE_REQ_OFFSET_FILLERBYTE1 , 0 ); isimessage.Complete(); @@ -643,44 +670,45 @@ void CModemAtPipeController::HandlePipeEnabledResp( const TIsiReceiveC& aReceivedMessage ) { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_HANDLEPIPEENABLEDRESP, "CModemAtPipeController::HandlePipeEnabledResp" ); C_TRACE (( _T("CModemAtPipeController::HandlePipeEnabledResp()") )); TInt error = aReceivedMessage.Get8bit(ISI_HEADER_SIZE + PNS_PIPE_ENABLE_RESP_OFFSET_ERRORCODE); TInt pipeHandle = aReceivedMessage.Get8bit(ISI_HEADER_SIZE + PNS_PIPE_ENABLE_RESP_OFFSET_PIPEHANDLE); - if( pipeHandle != iPipe.pipeHandle ) - { - C_TRACE((_L("CModemAtPipeController::HandlePipeEnabledResp() unknown pipeHandle received"))); - TRACE_ASSERT_ALWAYS; - return; - } - C_TRACE((_L("CModemAtPipeController::HandlePipeEnabledResp() pipehandle %d"), pipeHandle)); - + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_HANDLEPIPEENABLEDRESP, "CModemAtPipeController::HandlePipeEnabledResp;pipeHandle=%d", pipeHandle ); + C_TRACE((_L("CModemAtPipeController::HandlePipeEnabledResp() pipehandle %d"), pipeHandle)); if( error == PN_PIPE_NO_ERROR ) { ChangePipeState( TPipeInfo::EPipeEnabled ); } else { + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_HANDLEPIPEENABLEDRESP, "CModemAtPipeController::HandlePipeEnabledResp - pipe;error=%d", error ); C_TRACE((_L("CModemAtPipeController::HandlePipeEnabledResp() pipe error: %d"), error)); - TRACE_ASSERT_ALWAYS; } } void CModemAtPipeController::ChangePipeState( TPipeInfo::EPipeState aState ) { - C_TRACE((_L("CModemAtPipeController::ChangePipeState( New state: %d )"), (TInt)aState)); - C_TRACE(( _L("Old iPipe.pipeState = %d"), (TInt)iPipe.pipeState )); + OstTraceExt2( TRACE_NORMAL, CMODEMATPIPECONTROLLER_CHANGEPIPESTATE, "CModemAtPipeController::ChangePipeState;aState=%d;iPipe.pipeHandle=%d", (TInt)aState, iPipe.pipeHandle ); + C_TRACE((_L("CModemAtPipeController::ChangePipeState: pipe handle: %d ( New state: %d )"), iPipe.pipeHandle, (TInt)aState)); + iPipe.pipeState = aState; - if( aState == TPipeInfo::EPipeEnabled ) + if( TPipeInfo::EPipeRedirected == aState ) { + // NOTE: Setting data mode when pipe is being redirected. + // This will fasten the discovery of data mode. + // If pipe fails, we return to command mode. + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_CHANGEPIPESTATE, "CModemAtPipeController::ChangePipeState - DATA MODE" ); C_TRACE(( _T("DATA MODE") )); iAtHandler.HandleCommandModeChange( EDataMode ); } - else if( aState == TPipeInfo::EPipeDisabled ) + else if( TPipeInfo::EPipeDisabled == aState ) { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_CHANGEPIPESTATE, "CModemAtPipeController::ChangePipeState - COMMAND MODE" ); C_TRACE(( _T("COMMAND MODE") )); iAtHandler.HandleCommandModeChange( ECommandMode ); } @@ -688,44 +716,240 @@ void CModemAtPipeController::HandlePepStatusInd( const TIsiReceiveC& aReceivedMessage ) { - C_TRACE(( _L("CModemAtPipeController::HandlePepStatusInd"))); + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_HANDLEPEPSTATUSIND, "CModemAtPipeController::HandlePepStatusInd" ); + C_TRACE(( _L("CModemAtPipeController::HandlePepStatusInd()"))); TUint8 pepType( aReceivedMessage.Get8bit( ISI_HEADER_SIZE + PNS_PEP_STATUS_IND_OFFSET_PEPTYPE ) ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_HANDLEPEPSTATUSIND, "CModemAtPipeController::HandlePepStatusInd;pepType=%d", pepType ); + C_TRACE(( _L("pepType: %d"), pepType )); + + TUint8 pipeHandle( aReceivedMessage.Get8bit( ISI_HEADER_SIZE + + PNS_PEP_STATUS_IND_OFFSET_PIPEHANDLE ) ); + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_HANDLEPEPSTATUSIND, "CModemAtPipeController::HandlePepStatusInd;pipeHandle=%d", pipeHandle ); + C_TRACE(( _L("pipeHandle: %d"), pipeHandle )); + + if( iPipe.pipeHandle != pipeHandle ) + { + C_TRACE( (_L("Unknown pipe handle: %d, iPipe.pipeHandle: %d "), pipeHandle, iPipe.pipeHandle )); + return; + } + if( pepType == PN_PEP_TYPE_COMM ) { TUint8 indicationId( aReceivedMessage.Get8bit( ISI_HEADER_SIZE + PNS_PEP_STATUS_IND_OFFSET_INDICATIONID ) ); + OstTrace1( TRACE_NORMAL, DUP3_CMODEMATPIPECONTROLLER_HANDLEPEPSTATUSIND, "CModemAtPipeController::HandlePepStatusInd;indicationId=%d", indicationId ); + C_TRACE(( _L("indicationId: %d"), indicationId )); if( indicationId == PEP_COMM_IND_ID_ESCAPE ) { - TUint8 pipeHandle( aReceivedMessage.Get8bit( ISI_HEADER_SIZE + - PNS_PEP_STATUS_IND_OFFSET_PIPEHANDLE ) ); - - C_TRACE( (_L("CModemAtPipeController PEP_COMM_IND_ID_ESCAPE received, pipehandle: %d iPipe.pipeHandle: %d"), pipeHandle, iPipe.pipeHandle )); + C_TRACE(( _T("PEP_COMM_IND_ID_ESCAPE -> AT_MODEM_SIGNAL_ESCAPE_DETECTED") )); + iAtHandler.SendSignalDetection( AT_MODEM_SIGNAL_ESCAPE_DETECTED ); + } + else if( indicationId == PEP_COMM_IND_ID_V24_CHANGE ) + { + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATPIPECONTROLLER_HANDLEPEPSTATUSIND, "PEP_COMM_IND_ID_V24_CHANGE" ); + C_TRACE(( _T("PEP_COMM_IND_ID_V24_CHANGE") )); + + TUint8 indicationData( aReceivedMessage.Get8bit( ISI_HEADER_SIZE + + PNS_PEP_STATUS_IND_OFFSET_INDICATIONDATA ) ); + OstTrace1( TRACE_NORMAL, DUP5_CMODEMATPIPECONTROLLER_HANDLEPEPSTATUSIND, "CModemAtPipeController::HandlePepStatusInd;indicationData=%d", indicationData ); + C_TRACE(( _L("indicationData: %d"), indicationData )); - if( pipeHandle == iPipe.pipeHandle ) + if( indicationData == PEP_COMM_SIGNAL_DTR_ON ) + { + OstTrace0( TRACE_NORMAL, DUP6_CMODEMATPIPECONTROLLER_HANDLEPEPSTATUSIND, "AT_MODEM_SIGNAL_DTR_ON" ); + C_TRACE(( _T("PEP_COMM_SIGNAL_DTR_ON -> AT_MODEM_SIGNAL_DTR_ON") )); + iAtHandler.SendSignalDetection( AT_MODEM_SIGNAL_DTR_ON ); + } + else if( indicationData == PEP_COMM_SIGNAL_DTR_OFF ) { - C_TRACE( (_L("SendEscapeSignalDetection dteid %d"), pipeHandle )); - iAtHandler.SendEscapeSignalDetection( pipeHandle ); + OstTrace0( TRACE_NORMAL, DUP7_CMODEMATPIPECONTROLLER_HANDLEPEPSTATUSIND, "AT_MODEM_SIGNAL_DTR_OFF" ); + C_TRACE(( _T("PEP_COMM_SIGNAL_DTR_OF -> AT_MODEM_SIGNAL_DTR_OFF") )); + iAtHandler.SendSignalDetection( AT_MODEM_SIGNAL_DTR_OFF ); + } + else + { + OstTrace0( TRACE_NORMAL, DUP8_CMODEMATPIPECONTROLLER_HANDLEPEPSTATUSIND, "Unknown indication data" ); + C_TRACE(( _T("Unknown indication data") )); } } - // Not know should any other indicationid from comm pep type to be handled else { - C_TRACE((_L("CModemAtPipeController Indication ignored pepType %d indicationId: %d "), pepType, indicationId)); + OstTrace1( TRACE_NORMAL, DUP9_CMODEMATPIPECONTROLLER_HANDLEPEPSTATUSIND, "CModemAtPipeController::HandlePepStatusInd;indicationId=%d", indicationId ); + C_TRACE((_L("Unknown indicationId: %d pepType %d"), indicationId, pepType)); } } - // pep type comm only supported one else { - C_TRACE((_L("CModemAtPipeController Peptype ignored %d "), pepType)); + OstTrace1( TRACE_NORMAL, DUP10_CMODEMATPIPECONTROLLER_HANDLEPEPSTATUSIND, "CModemAtPipeController::HandlePepStatusInd;pepType=%d", pepType ); + C_TRACE((_L("CModemAtPipeController::HandlePepStatusInd() Peptype ignored %d "), pepType)); } } -TUint8 CModemAtPipeController::GetPipeHandle() + +TPipeInfo::EPipeState CModemAtPipeController::GetPipeState() + { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_GETPIPESTATE, "CModemAtPipeController::GetPipeState" ); + C_TRACE((_L("CModemAtPipeController::GetPipeState") ) ); + return iPipe.pipeState; + } + + +void CModemAtPipeController::SendPepCtrlReq( const TUint8 aControlId, TDesC8& aData ) { - C_TRACE((_L("CModemAtPipeController::GetPipeHandle %d"), iPipe.pipeHandle)); - return iPipe.pipeHandle; + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_SENDPEPCTRLREQ, "CModemAtPipeController::SendPepCtrlReq" ); + C_TRACE (( _T("CModemAtPipeController::SendPepCtrlReq()") )); + TInt length( ISI_HEADER_SIZE + SIZE_PNS_PEP_CTRL_REQ ); + TInt fillers( 0 ); + if( aControlId == PEP_COMM_CTRL_ID_ESCAPE ) + { + fillers++; + length += ( KPepCtrlDataSize + fillers ); + } + else if( aControlId == PEP_COMM_CTRL_ID_FLOW_CTRL) + { + length += KPepFlowCtrlDataSize; + } + else + { + TRACE_ASSERT_ALWAYS; + return; + } + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_SENDPEPCTRLREQ, "CModemAtPipeController::SendPepCtrlReq;length=%d", length ); + C_TRACE((_L("ISI message length: %d"), length)); + HBufC8* message = HBufC8::New( length ); + if( message ) + { + TPtr8 messageptr = message->Des(); + TIsiSend isimessage( messageptr, length ); + isimessage.Set8bit( ISI_HEADER_OFFSET_RECEIVERDEVICE, iDpDevId ); + isimessage.Set8bit( ISI_HEADER_OFFSET_RECEIVEROBJECT, iDpObjId ); + isimessage.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_PIPE ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_UTID, 0 ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_SUBFUNCTION, PNS_PEP_CTRL_REQ ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PIPEHANDLE , iPipe.pipeHandle ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPTYPE , PN_PEP_TYPE_COMM ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPCTRLID, aControlId ); + for( TInt i = 0; i < aData.Length(); i++ ) + { + C_TRACE((_L("Setting control data[%d] = 0x%x"), ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPCTRLDATA + i, aData[ i ] )); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPCTRLDATA + i, aData[ i ] ); + } + if( fillers > 0 ) + { + C_TRACE((_L("Setting filler to data[%d] = 0x%x"), length - 1, KFiller )); + isimessage.Set8bit( length - 1, KFiller ); + } + isimessage.Complete(); + + DUMP_MESSAGE( messageptr ); + TInt retVal = iIscApi.Send( messageptr ); + TRACE_ASSERT( KErrNone == retVal ); + delete message; + } + else + { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_SENDPEPCTRLREQ, "CModemAtPipeController::SendPepCtrlReq - No enough memory" ); + C_TRACE (( _T("CModemAtPipeController::SendPepCtrlReq(): No enough memory") )); + } } - #endif // NCP_COMMON_BRIDGE_FAMILY +void CModemAtPipeController::HandlePepCtrlResp( const TIsiReceiveC& aReceivedMessage ) + { + OstTrace0( TRACE_NORMAL, CMODEMATPIPECONTROLLER_HANDLEPEPCTRLRESP, "CModemAtPipeController::HandlePepCtrlResp" ); + C_TRACE(( _L("CModemAtPipeController::HandlePepCtrlResp") )); + TUint8 pepType( aReceivedMessage.Get8bit( ISI_HEADER_SIZE + + PNS_PEP_CTRL_RESP_OFFSET_PEPTYPE ) ); + C_TRACE(( _L("pepType: %d"), pepType )); + + TUint8 pipeHandle( aReceivedMessage.Get8bit( ISI_HEADER_SIZE + + PNS_PEP_CTRL_RESP_OFFSET_PIPEHANDLE ) ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_HANDLEPEPCTRLRESP, "CModemAtPipeController::HandlePepCtrlResp;pipeHandle=%d", pipeHandle ); + C_TRACE(( _L("pipeHandle: %d"), pipeHandle )); + + TUint8 controlId( aReceivedMessage.Get8bit( ISI_HEADER_SIZE + + PNS_PEP_CTRL_RESP_OFFSET_PEPCTRLID ) ); + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_HANDLEPEPCTRLRESP, "CModemAtPipeController::HandlePepCtrlResp;controlId=%d", controlId ); + C_TRACE(( _L("controlId: %d"), controlId )); + + if( PN_PEP_TYPE_COMM == pepType && + PEP_COMM_CTRL_ID_ESCAPE == controlId ) + { + TUint8 error( aReceivedMessage.Get8bit( ISI_HEADER_SIZE + + PNS_PEP_CTRL_RESP_OFFSET_ERRORCODE ) ); + OstTrace1( TRACE_NORMAL, DUP3_CMODEMATPIPECONTROLLER_HANDLEPEPCTRLRESP, "CModemAtPipeController::HandlePepCtrlResp;error=%d", error ); + C_TRACE(( _L("error code: %d"), error )); + switch( error ) + { + case PN_PIPE_NO_ERROR: + { + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATPIPECONTROLLER_HANDLEPEPCTRLRESP, "CModemAtPipeController::HandlePepCtrlResp - PN_PIPE_NO_ERROR" ); + C_TRACE(( _L("PN_PIPE_NO_ERROR"))); + break; + } + case PN_PIPE_ERR_NOT_SUPPORTED: + { + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATPIPECONTROLLER_HANDLEPEPCTRLRESP, "CModemAtPipeController::HandlePepCtrlResp - error:PN_PIPE_ERR_NOT_SUPPORTED" ); + C_TRACE(( _L("error: PN_PIPE_ERR_NOT_SUPPORTED"))); + break; + } + case PN_PIPE_ERR_INVALID_PARAM: + { + OstTrace0( TRACE_NORMAL, DUP6_CMODEMATPIPECONTROLLER_HANDLEPEPCTRLRESP, "CModemAtPipeController::HandlePepCtrlResp - error: PN_PIPE_ERR_INVALID_PARAM" ); + C_TRACE(( _L("error: PN_PIPE_ERR_INVALID_PARAM"))); + break; + } + case PN_PIPE_ERR_INVALID_CTRL_ID: + { + OstTrace0( TRACE_NORMAL, DUP7_CMODEMATPIPECONTROLLER_HANDLEPEPCTRLRESP, "CModemAtPipeController::HandlePepCtrlResp - error: PN_PIPE_ERR_INVALID_CTRL_ID" ); + C_TRACE(( _L("error: PN_PIPE_ERR_INVALID_CTRL_ID"))); + break; + } + case PN_PIPE_ERR_GENERAL: + { + OstTrace0( TRACE_NORMAL, DUP8_CMODEMATPIPECONTROLLER_HANDLEPEPCTRLRESP, "CModemAtPipeController::HandlePepCtrlResp - error: PN_PIPE_ERR_GENERAL" ); + C_TRACE(( _L("error: PN_PIPE_ERR_GENERAL"))); + break; + } + } + } + } +// sending PNS_PEP_STATUS_IND from pipe controller should be moved to PEP ! +void CModemAtPipeController::SendPepStatusIndSignal( const TUint8 aPepCommSignal ) + { + OstTrace1( TRACE_NORMAL, CMODEMATPIPECONTROLLER_SENDPEPSTATUSINDSIGNAL, "CModemAtPipeController::SendPepStatusIndSignal;aPepCommSignal=%x", aPepCommSignal ); + C_TRACE((_L("CModemAtPipeController::SendPepStatusIndSignal() aPepCommSignal: 0x%x"), aPepCommSignal )); + TInt length( ISI_HEADER_SIZE + SIZE_PNS_PEP_STATUS_IND ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATPIPECONTROLLER_SENDPEPSTATUSINDSIGNAL, "CModemAtPipeController::SendPepStatusIndSignal;length=%d", length ); + C_TRACE((_L("ISI message length: %d"), length)); + HBufC8* message = HBufC8::New( length ); + if( message ) + { + TPtr8 messageptr = message->Des(); + TIsiSend isimessage( messageptr, length ); + isimessage.Set8bit( ISI_HEADER_OFFSET_RECEIVERDEVICE, iDpDevId ); + isimessage.Set8bit( ISI_HEADER_OFFSET_RECEIVEROBJECT, iDpObjId ); + isimessage.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_PIPE ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_STATUS_IND_OFFSET_UTID, 0 ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_STATUS_IND_OFFSET_SUBFUNCTION, PNS_PEP_STATUS_IND ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_STATUS_IND_OFFSET_PIPEHANDLE, iPipe.pipeHandle ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_STATUS_IND_OFFSET_PEPTYPE, PN_PEP_TYPE_COMM ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_STATUS_IND_OFFSET_INDICATIONID, PEP_COMM_IND_ID_V24_CHANGE ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_STATUS_IND_OFFSET_FILLERBYTE1, 0 ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_STATUS_IND_OFFSET_FILLERBYTE2, 0 ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_STATUS_IND_OFFSET_INDICATIONDATA, aPepCommSignal ); + isimessage.Complete(); + DUMP_MESSAGE( messageptr ); + TInt retVal = iIscApi.Send( messageptr ); + TRACE_ASSERT( KErrNone == retVal ); + delete message; + } + else + { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATPIPECONTROLLER_SENDPEPSTATUSINDSIGNAL, "CModemAtPipeController::SendPepStatusIndSignal - error: not enough memory" ); + C_TRACE (( _T("CModemAtPipeController::SendPepStatusIndSignal(): Not enough memory") )); + } + } + + diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_exe/src/cmodematsession.cpp --- a/adaptationlayer/modematadaptation/modematcontroller_exe/src/cmodematsession.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_exe/src/cmodematsession.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -21,51 +21,63 @@ #include "cmodematsession.h" #include "modemattrace.h" #include "catmessage.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmodematsessionTraces.h" +#endif CModemAtSession* CModemAtSession::NewL( CModemAtSrv& aServer, const TVersion& aVersion ) { + OstTrace0( TRACE_NORMAL, CMODEMATSESSION_NEWL, "CModemAtSession::NewL" ); return new (ELeave) CModemAtSession( aServer, aVersion ); } CModemAtSession::~CModemAtSession() { - C_TRACE (( _T(">>CModemAtSession::~CModemAtSession()") )); + OstTrace1( TRACE_NORMAL, CMODEMATSESSION_CMODEMATSESSION, "CModemAtSession::~CModemAtSession;this=%x", this ); + C_TRACE (( _T(">>CModemAtSession::~CModemAtSession() 0x%x"), this )); iServer.CancelFifoRequests( this ); if( !iConnectReq.IsNull() ) { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATSESSION_CMODEMATSESSION, "CModemAtSession::~CModemAtSession - iConnectReq canceled" ); C_TRACE(_L("iConnectReq canceled")); iConnectReq.Complete( KErrCancel ); } if( !iUnsolicitedDataReq.IsNull() ) { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATSESSION_CMODEMATSESSION, "CModemAtSession::~CModemAtSession - iUnsolicitedDataReq canceled" ); C_TRACE(_L("iUnsolicitedDataReq canceled")); iUnsolicitedDataReq.Complete( KErrCancel ); } if( !iSignalIndReq.IsNull() ) { + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATSESSION_CMODEMATSESSION, "CModemAtSession::~CModemAtSession - iSignalIndReq canceled" ); C_TRACE(_L("iSignalIndReq canceled")); iSignalIndReq.Complete( KErrCancel ); } if( !iCommandModeReq.IsNull() ) { + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATSESSION_CMODEMATSESSION, "CModemAtSession::~CModemAtSession - iCommandModeReq canceled" ); C_TRACE(_L("iCommandModeReq canceled")); iCommandModeReq.Complete( KErrCancel ); } + iServer.ClientClosed(this); + if(iClientName) { delete iClientName; iClientName = NULL; } - iServer.ClientClosed(this); C_TRACE (( _T("<Des() ); aMessage.Read( KATModemResponseArgumentIndex, iClientNamePtr ); iConnectReq = aMessage; - iServer.ConnectToModem( this, iPluginType ); + iServer.ConnectToModemL( this, iPluginType ); break; - case EReceiveUnsolicitedResult: + case EReceiveUnsolicitedResult: + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - EReceiveUnsolicitedResult" ); C_TRACE(_L("EReceiveUnsolicitedResult")); - iUnsolicitedDataReq = aMessage; + iUnsolicitedDataReq = aMessage; + if( iServer.IsUnsolicitedDataInBuffer() ) + { + // there is data that can be completed + iServer.GetUnsolicitedDataInBuffer( iTemporaryUnsolicitedData ); + if( iTemporaryUnsolicitedData.Length() > 0 ) + { + UnsolicitedData( iTemporaryUnsolicitedData ); + iTemporaryUnsolicitedData.Zero(); + iServer.ResetUnsolicitedDataInBuffer(); + } + break; + } break; case EReceiveUnsolicitedResultCancel: + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - EReceiveUnsolicitedResultCancel" ); + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - Complete" ); C_TRACE(_L("EReceiveUnsolicitedResultCancel")); C_TRACE(_L("Complete")); iUnsolicitedDataReq.Complete(KErrCancel); @@ -201,6 +250,7 @@ break; case EModemATHandleCommandCancel: + OstTrace0( TRACE_NORMAL, DUP6_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - EModemATHandleCommandCancel" ); C_TRACE(_L("EModemATHandleCommandCancel")); // actual message is canceled from fifo iServer.CancelFifoRequests( this ); @@ -208,18 +258,22 @@ break; case EModemATCommandModeCancel: + OstTrace0( TRACE_NORMAL, DUP7_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - EModemATCommandModeCancel" ); C_TRACE (( _T("EModemATCommandModeCancel") )); iCommandModeReq.Complete(KErrCancel); aMessage.Complete(KErrNone); break; case EModemAtRemovePipe: + OstTrace0( TRACE_NORMAL, DUP8_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - EModemAtRemovePipe" ); C_TRACE (( _T("EModemAtRemovePipe") )); - iServer.RemovePipe(); + iServer.RemovePipe( iHandler ); aMessage.Complete(KErrNone); break; case EModemATReceiveSignalIndCancel: + OstTrace0( TRACE_NORMAL, DUP9_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - EModemATReceiveSignalIndCancel" ); + OstTrace0( TRACE_NORMAL, DUP10_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - Complete" ); C_TRACE(_L("EModemATReceiveSignalIndCancel")); C_TRACE(_L("Complete")); iSignalIndReq.Complete(KErrCancel); @@ -227,15 +281,18 @@ break; case EModemATReceiveSignalInd: + OstTrace0( TRACE_NORMAL, DUP11_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - EModemATReceiveSignalInd" ); C_TRACE(_L("EModemATReceiveSignalInd")); iSignalIndReq = aMessage; break; case EModemATHandleCommand: { + OstTrace0( TRACE_NORMAL, DUP12_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - EModemATHandleCommand" ); C_TRACE(_L("EModemATHandleCommand")); CAtMessage* message = new CAtMessage( EAtCmd, this, aMessage ); TRACE_ASSERT( message ); + OstTrace0( TRACE_NORMAL, DUP13_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - iServer.AddToSendFifo EAtCmd" ); C_TRACE(_L("iServer.AddToSendFifo EAtCmd")); iServer.AddToSendFifo( iPluginType, message ); } @@ -243,6 +300,7 @@ case EModemATCommandMode: { + OstTrace0( TRACE_NORMAL, DUP14_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - EModemATCommandMode" ); C_TRACE(_L("EModemATCommandMode")); iCommandModeReq = aMessage; } @@ -250,15 +308,26 @@ case EModemATGetNvramStatus: { + OstTrace0( TRACE_NORMAL, DUP15_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - EModemATGetNvramStatus" ); C_TRACE(_L("EModemATGetNvramStatus")); + if( iServer.IsPipeInDataMode( iHandler ) || + iServer.IsTextMessageMode( iHandler ) ) + { + // AT&V should not be sent from common plugin in data or text message mode + aMessage.Complete( KErrGeneral ); + break; + } + CAtMessage* message = new CAtMessage( EGetNvramStatus, this, aMessage ); TRACE_ASSERT( message ); + OstTrace0( TRACE_NORMAL, DUP16_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - iServer.AddToSendFifo EGetNvramStatus" ); C_TRACE(_L("iServer.AddToSendFifo EGetNvramStatus")); iServer.AddToSendFifo( iPluginType, message ); break; } default: { + OstTrace0( TRACE_NORMAL, DUP17_CMODEMATSESSION_DOSERVICEL, "CModemAtSession::DoServiceL - message not supported" ); C_TRACE(_L("CModemAtSession::DoServiceL message not supported")); aMessage.Complete( KErrNotSupported ); _LIT( KApplicationName, "Modematconroller.exe"); @@ -272,20 +341,42 @@ const TVersion& aVersion ) : iServer( aServer ), iVersion( aVersion ), + iDteId( 0xFF ), iClientName( NULL ), - iClientNamePtr( NULL, 0 ) + iClientNamePtr( NULL, 0 ), + iHandler( NULL ) { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATSESSION_CMODEMATSESSION, "CModemAtSession::CModemAtSession" ); C_TRACE (( _T("CModemAtSession::CModemAtSession()") )); } void CModemAtSession::UnsolicitedData( const TDesC8& aData ) { + OstTrace0( TRACE_NORMAL, CMODEMATSESSION_UNSOLICITEDDATA, "CModemAtSession::UnsolicitedData" ); C_TRACE (( _T("CModemAtSession::UnsolicitedData()") )); if(!iUnsolicitedDataReq.IsNull()) { - iUnsolicitedDataReq.Write(KATModemUnsolicitedDataIndex, aData); - C_TRACE (( _T("iUnsolicitedDataReq.Complete( KErrNone ) iUnsolicitedDataReq: 0x%x"), &iUnsolicitedDataReq )); - iUnsolicitedDataReq.Complete( KErrNone ); + + TInt length = iUnsolicitedDataReq.GetDesMaxLength( KATModemUnsolicitedDataIndex ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATSESSION_UNSOLICITEDDATA, "CModemAtSession::UnsolicitedData - iUnsolicitedDataReq;length=%d", length ); + C_TRACE((_L("iUnsolicitedDataReq length: %d"), length )); + + HBufC8* unsolicitedBuffer = HBufC8::New( length ); + TPtr8 ptr = unsolicitedBuffer->Des(); + iUnsolicitedDataReq.Read( KATModemUnsolicitedDataIndex, ptr ); + unsolicitedBuffer->Des().Append( aData ); + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATSESSION_UNSOLICITEDDATA, "CModemAtSession::UnsolicitedData - unsolicitedBuffer->Des() contents:;ptr=%x", &ptr ); + OstTraceExt1( TRACE_NORMAL, DUP3_CMODEMATSESSION_UNSOLICITEDDATA, "CModemAtSession::UnsolicitedData - dump;aData=%s", aData ); + C_TRACE((_L("unsolicitedBuffer->Des() contents: 0x%x"), &ptr )); + DUMP_MESSAGE( aData ); + + TInt err = iUnsolicitedDataReq.Write( KATModemUnsolicitedDataIndex, unsolicitedBuffer->Des() ); + delete unsolicitedBuffer; + + OstTrace1( TRACE_NORMAL, DUP4_CMODEMATSESSION_UNSOLICITEDDATA, "CModemAtSession::UnsolicitedData - Complete;err=%d", err ); + C_TRACE (( _T("Complete %d"),err )); + iUnsolicitedDataReq.Complete( err ); + } else { @@ -293,89 +384,136 @@ } } +TUint8 CModemAtSession::GetDteId() + { + OstTrace0( TRACE_NORMAL, CMODEMATSESSION_GETDTEID, "CModemAtSession::GetDteId" ); + C_TRACE (( _T("CModemAtSession::GetDteId()") )); + return iDteId; + } + + TATPluginInterface CModemAtSession::GetPluginType() { + OstTrace1( TRACE_NORMAL, CMODEMATSESSION_GETPLUGINTYPE, "CModemAtSession::GetPluginType;iPluginType=%d", iPluginType ); C_TRACE (( _T("CCModemAtSession::GetPluginType(%d)"),iPluginType )); return iPluginType; } TDesC8& CModemAtSession::GetName() { + OstTrace0( TRACE_NORMAL, CMODEMATSESSION_GETNAME, "CModemAtSession::GetName" ); C_TRACE( _T("CModemAtSession::GetName()") ); return *iClientName; } +void CModemAtSession::SetDteId( const TUint8 aDteId ) + { + OstTrace1( TRACE_NORMAL, CMODEMATSESSION_SETDTEID, "CModemAtSession::SetDteId;aDteId=%d", aDteId ); + C_TRACE(( _T("CModemAtSession::SetDteId( %d )"), aDteId )); + iDteId = aDteId; + } + void CModemAtSession::ModemConnected( const TInt aErr ) { + OstTrace1( TRACE_NORMAL, CMODEMATSESSION_MODEMCONNECTED, "CModemAtSession::ModemConnected;aErr=%d", aErr ); C_TRACE(( _T("CModemAtSession::ModemConnected( %d )"), aErr )); if( !iConnectReq.IsNull() ) { + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATSESSION_MODEMCONNECTED, "CModemAtSession::ModemConnected - Complete iConnectReq;aErr=%d", aErr ); C_TRACE (( _T("Complete iConnectReq( %d )"), aErr )); iConnectReq.Complete(aErr); } } -void CModemAtSession::SignalIndReceived() +void CModemAtSession::SignalIndReceived( const TInt aCompleteCode ) { - C_TRACE(( _T("CModemAtSession::SignalIndReceived()") )); + OstTrace1( TRACE_NORMAL, CMODEMATSESSION_SIGNALINDRECEIVED, "CModemAtSession::SignalIndReceived;aCompleteCode=%d", aCompleteCode ); + C_TRACE(( _T("CModemAtSession::SignalIndReceived( %d )"), aCompleteCode )); if(!iSignalIndReq.IsNull()) { - C_TRACE (( _T("Complete iSignalIndReq( KErrNone ) iSignalIndReq: 0x%x"), &iSignalIndReq )); - iSignalIndReq.Complete( KErrNone ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATSESSION_SIGNALINDRECEIVED, "CModemAtSession::SignalIndReceived;iSignalIndReq=%x", &iSignalIndReq ); + C_TRACE (( _T("Complete iSignalIndReq( %d ) iSignalIndReq: 0x%x"), aCompleteCode, &iSignalIndReq )); + iSignalIndReq.Complete( aCompleteCode ); } } void CModemAtSession::CommandModeChanged( TCommandMode aMode ) { + OstTrace1( TRACE_NORMAL, CMODEMATSESSION_COMMANDMODECHANGED, "CModemAtSession::CommandModeChanged;aMode=%d", (TInt)aMode ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATSESSION_COMMANDMODECHANGED, "CModemAtSession::CommandModeChanged - Writing mode to iCommandModeReq;aMode=%d", (TInt)aMode ); C_TRACE((_L("CModemAtSession::CommandModeChanged( %d )"), (TInt) aMode )); C_TRACE((_L("Writing mode to iCommandModeReq %d"), (TInt) aMode )); if( !iCommandModeReq.IsNull() ) { TInt length = iCommandModeReq.GetDesMaxLength( KATModemCommandArgumentIndex ); + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATSESSION_COMMANDMODECHANGED, "CModemAtSession::CommandModeChanged - iCommandModeReq;length=%d", length ); C_TRACE((_L("iCommandModeReq length: %d"), length )); HBufC8* modeBuffer = HBufC8::New( length ); TPtr8 ptr = modeBuffer->Des(); iCommandModeReq.Read( KATModemCommandArgumentIndex, ptr ); modeBuffer->Des().AppendNum( (TInt) aMode ); + OstTrace1( TRACE_NORMAL, DUP3_CMODEMATSESSION_COMMANDMODECHANGED, "CModemAtSession::CommandModeChanged - modeBuffer->Des() contents:;ptr=%x", &ptr ); + OstTraceExt1( TRACE_NORMAL, DUP4_CMODEMATSESSION_COMMANDMODECHANGED, "CModemAtSession::CommandModeChanged - dump;ptr=%s", ptr ); C_TRACE((_L("modeBuffer->Des() contents: 0x%x"), &ptr )); DUMP_MESSAGE( ptr ); TInt err = iCommandModeReq.Write( KATModemCommandArgumentIndex, modeBuffer->Des() ); delete modeBuffer; + OstTrace1( TRACE_NORMAL, DUP5_CMODEMATSESSION_COMMANDMODECHANGED, "CModemAtSession::CommandModeChanged - Complete;err=%d", err ); C_TRACE (( _T("Complete %d"),err )); iCommandModeReq.Complete( err ); } else { + OstTrace1( TRACE_NORMAL, DUP6_CMODEMATSESSION_COMMANDMODECHANGED, "CModemAtSession::CommandModeChanged - CommandModeChanged Ignored!!!;aMode=%d", aMode ); C_TRACE((_L("CommandModeChanged Ignored!!! Mode: %d"), aMode )); } } TBool CModemAtSession::IsUnsolicitedDataReqActive() { + OstTrace1( TRACE_NORMAL, CMODEMATSESSION_ISUNSOLICITEDDATAREQACTIVE, "CModemAtSession::IsUnsolicitedDataReqActive - ret:;%d", (TInt) !iUnsolicitedDataReq.IsNull() ); C_TRACE(( _T("CModemAtSession::IsUnsolicitedDataReqActive ret: %d"), (TInt) !iUnsolicitedDataReq.IsNull() )); return !iUnsolicitedDataReq.IsNull(); } TBool CModemAtSession::IsSignalIndReqActive() { + OstTrace1( TRACE_NORMAL, CMODEMATSESSION_ISSIGNALINDREQACTIVE, "CModemAtSession::IsSignalIndReqActive - ret:;%d", (TInt) !iSignalIndReq.IsNull() ); C_TRACE(( _T("CModemAtSession::IsSignalIndReqActive ret: %d"), (TInt) !iSignalIndReq.IsNull() )); return !iSignalIndReq.IsNull(); } TBool CModemAtSession::IsCommandModeReqActive() { + OstTrace1( TRACE_NORMAL, CMODEMATSESSION_ISCOMMANDMODEREQACTIVE, "CModemAtSession::IsCommandModeReqActive - ret:;%d", (TInt) !iCommandModeReq.IsNull() ); C_TRACE(( _T("CModemAtSession::IsCommandModeReqActive ret: %d"), (TInt) !iCommandModeReq.IsNull() )); return !iCommandModeReq.IsNull(); } TBool CModemAtSession::IsConnectReqActive() { + OstTrace1( TRACE_NORMAL, CMODEMATSESSION_ISCONNECTREQACTIVE, "CModemAtSession::IsConnectReqActive - ret:;%d", (TInt) !iConnectReq.IsNull() ); C_TRACE(( _T("CModemAtSession::IsConnectReqActive ret: %d"), (TInt) !iConnectReq.IsNull() )); return !iConnectReq.IsNull(); } +void CModemAtSession::SetHandler( CModemAtHandler* aHandler ) + { + OstTrace1( TRACE_NORMAL, CMODEMATSESSION_SETHANDLER, "CModemAtSession::SetHandler;aHandler=%x", aHandler ); + C_TRACE (( _T("CModemAtSession::SetHandler() 0x%x"), aHandler )); + TRACE_ASSERT( NULL != aHandler ); + iHandler = aHandler; + } +CModemAtHandler* CModemAtSession::GetHandler() + { + OstTrace0( TRACE_NORMAL, CMODEMATSESSION_GETHANDLER, "CModemAtSession::GetHandler" ); + C_TRACE (( _T("CModemAtSession::GetHandler()") )); + return iHandler; + } + + diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_exe/src/cmodematsrv.cpp --- a/adaptationlayer/modematadaptation/modematcontroller_exe/src/cmodematsrv.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_exe/src/cmodematsrv.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -15,8 +15,8 @@ * */ - - +#include +#include #include "cmodematsrv.h" #include "modematclientsrv.h" #include "modematsecpolicy.h" @@ -24,17 +24,71 @@ #include "cmodemathandler.h" #include "modemattrace.h" #include "catmessage.h" +#include "cmodematpipecontroller.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmodematsrvTraces.h" +#endif +_LIT8( KCursor, ">" ); +_LIT8( KOkResponse, "OK" ); +_LIT8( KErrorResponse, "ERROR" ); +_LIT8( KOkResponseNoVerbose, "0" ); +_LIT8( KErrorResponseNoVerbose, "4" ); + +_LIT8( KAtv, "ATV" ); +_LIT8( KAtv1, "ATV1" ); +_LIT8( KAtv0, "ATV0" ); +_LIT8( KAtq, "ATQ" ); +_LIT8( KAtq1, "ATQ1" ); +_LIT8( KAtq0, "ATQ0" ); +_LIT8( KAte, "ATE" ); +_LIT8( KAte1, "ATE1" ); +_LIT8( KAte0, "ATE0" ); + +_LIT8( KCmgs, "+CMGS" ); +_LIT8( KCmgc, "+CMGC" ); +_LIT8( KCmgsQuery, "+CMGS=?" ); +_LIT8( KCmgcQuery, "+CMGC=?" ); + +// Carriage return needs to be checked from ATS3, or the following AT&V +// fails, because its not yet informed to upper layers. +_LIT8( KAts3, "ATS3=" ); +const TUint8 KDefaultCarriageChar( 0xd ); // 13 + +const TUint8 KOff( 0x00 ); +const TUint8 KOn( 0x01 ); + +const TInt KEchoOn( 1 ); +const TInt KEchoOff( 2 ); +const TInt KVerboseOn( 3 ); +const TInt KVerboseOff( 4 ); +const TInt KQuietOn( 5 ); +const TInt KQuietOff( 6 ); +const TInt KReplyTypeEditorStart( 1 ); +const TInt KReplyTypeEditorEnd( 2 ); CModemAtSrv::CModemAtSrv( TInt aPriority ) : CPolicyServer( aPriority, KSrvPolicy ), iHandler(NULL), - iDteId( 0 ) // iDteId defaults to 0 and it is updated by PNS_PIPE_CREATE_RESP + iEcho( KOn ), + iEchoNotified( KInitialValue ), + iEchoQueryIsOngoing( EFalse ), + iVerbose( KOff ), + iVerboseNotified( KInitialValue ), + iVerboseQueryIsOngoing( EFalse ), + iQuiet( KOff ), + iQuietNotified( KInitialValue ), + iQuietQueryIsOngoing( EFalse ), + iCarriageReturn( KDefaultCarriageChar ), + iCarriageReturnFound( EFalse ) { + OstTrace0( TRACE_NORMAL, CMODEMATSRV_CMODEMATSRV, "CModemAtSrv::CModemAtSrv" ); } CModemAtSrv::~CModemAtSrv() { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATSRV_CMODEMATSRV, "CModemAtSrv::~CModemAtSrv" ); C_TRACE (( _L(">>CModemAtSrv::~CModemAtSrv()") )); iAtMessageArray.ResetAndDestroy(); iAtMessageArray.Close(); @@ -43,6 +97,7 @@ CModemAtSrv* CModemAtSrv::NewLC() { + OstTrace0( TRACE_NORMAL, CMODEMATSRV_NEWLC, "CModemAtSrv::NewLC" ); CModemAtSrv* self = new (ELeave) CModemAtSrv( EPriorityNormal ); CleanupStack::PushL( self ); self->ConstructL(); @@ -51,27 +106,60 @@ return self; } -void CModemAtSrv::RemovePipe() +void CModemAtSrv::RemovePipe( CModemAtHandler* aHandler ) { + OstTrace0( TRACE_NORMAL, CMODEMATSRV_REMOVEPIPE, "CModemAtSrv::RemovePipe" ); C_TRACE((_L("CModemAtSrv::RemovePipe()") )); - iHandler->RemovePipe( iDteId ); + ASSERT_PANIC_ALWAYS( NULL != aHandler ); + aHandler->RemovePipe(); } void CModemAtSrv::ClientClosed( CModemAtSession* aSession ) { - C_TRACE (( _L("CModemAtSrv::ClientClosed()") )); + OstTrace0( TRACE_NORMAL, CMODEMATSRV_CLIENTCLOSED, "CModemAtSrv::ClientClosed" ); + C_TRACE (( _L(">>CModemAtSrv::ClientClosed()") )); TInt index = iSessions.Find( aSession ); if( index >= 0 ) { - - if( iSessions.Count() == 1 ) + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATSRV_CLIENTCLOSED, "CModemAtSrv::ClientClosed - Removing session;iSessions[index]->GetPluginType()=%d", iSessions[index]->GetPluginType() ); + C_TRACE((_L("Removing session (plugin type %d)"), iSessions[index]->GetPluginType() )); + iSessions.Remove( index ); + + if( ECommonPlugin == aSession->GetPluginType() ) { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATSRV_CLIENTCLOSED, "CModemAtSrv::ClientClosed - Disconnecting ISI message handler" ); C_TRACE((_L("Disconnecting ISI message handler ") )); - iHandler->Disconnect( iDteId ); + aSession->GetHandler()->Disconnect(); } - C_TRACE((_L("Removing session (plugin type %d)"), iSessions[index]->GetPluginType() )); - iSessions.Remove( index ); + for( int i = 0; i < iDteInfo.Count(); i++ ) + { + if( aSession == iDteInfo[i].iSession ) + { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATSRV_CLIENTCLOSED, "CModemAtSrv::ClientClosed - removing dte info" ); + C_TRACE((_T("CModemAtSrv::ClientClosed() removing dte info") )); + iDteInfo.Remove( i ); + } + } + + TBool pluginsFound( EFalse ); + for( int i = 0; i < iSessions.Count(); i++ ) + { + if( 0 == iSessions[i]->GetName().Compare( aSession->GetName() ) ) + { + pluginsFound = ETrue; + break; + } + } + + if( !pluginsFound && + iHandler != aSession->GetHandler() ) + { + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATSRV_CLIENTCLOSED, "CModemAtSrv::ClientClosed - Deleting handler" ); + C_TRACE((_L("Deleting handler") )); + iFreeChannels.Append( aSession->GetHandler()->GetChannelId() ); + delete aSession->GetHandler(); + } C_TRACE((_T("<( *this ); CModemAtSession* session = CModemAtSession::NewL( thisServer, aVersion ); @@ -91,46 +180,105 @@ void CModemAtSrv::ConstructL() { + OstTrace0( TRACE_NORMAL, CMODEMATSRV_CONSTRUCTL, "CModemAtSrv::ConstructL" ); C_TRACE (( _T("CModemAtSrv::ConstructL()") )); - iHandler = CModemAtHandler::NewL( *this ); - } + iHandler = CModemAtHandler::NewL( *this, EIscNokiaAtController ); -void CModemAtSrv::HandleSignalInd( const TUint8 aDteId ) + iFreeChannels.Append( EIscNokiaAtController2 ); + iFreeChannels.Append( EIscNokiaAtController3 ); + } + +void CModemAtSrv::HandleSignalInd( const TUint8 aDteId, const TInt aCompleteCode ) { - C_TRACE ((_T("CModemAtSrv::HandleSignalInd aDteId = %d sessions = %d"), aDteId, iSessions.Count() )); + C_TRACE((_T("CModemAtSrv::HandleSignalInd aDteId = %d sessions = %d, code = %d"), aDteId, iSessions.Count(), aCompleteCode )); for( TInt i = 0; i < iSessions.Count(); i++ ) { - if( iDteId == aDteId && iSessions[i]->IsSignalIndReqActive() ) + if( iSessions[i]->GetDteId() == aDteId && iSessions[i]->IsSignalIndReqActive() ) { C_TRACE (( _T("CModemAtSrv::HandleSignalInd() session found") )); - iSessions[i]->SignalIndReceived(); + iSessions[i]->SignalIndReceived( aCompleteCode ); } } } void CModemAtSrv::HandleUnsolicitedData( const TUint8 aDteId, const TDesC8& aData ) { + OstTraceExt2( TRACE_NORMAL, CMODEMATSRV_HANDLEUNSOLICITEDDATA, "CModemAtSrv::HandleUnsolicitedData;aDteId=%d;iSessions.Count()=%d", aDteId, iSessions.Count() ); C_TRACE ((_T("CModemAtSrv::HandleUnsolicitedData aDteId = %d sessions = %d"), aDteId, iSessions.Count() )); + TBool unsolicitedDataHandled( EFalse ); + + _LIT8( KNoCarrier, "NO CARRIER" ); + if( aData.Find( KNoCarrier ) != KErrNotFound ) + { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATSRV_HANDLEUNSOLICITEDDATA, "CModemAtSrv::HandleUnsolicitedData - NO CARRIER -> COMMAND MODE" ); + C_TRACE(_L("NO CARRIER -> COMMAND MODE")); + HandleCommandModeChange( aDteId, ECommandMode ); + } + for( TInt i = 0; i < iSessions.Count(); i++ ) { - if( ( iDteId == aDteId || aDteId == KUnsolicitedDataDteId )&& + if( ( iSessions[i]->GetDteId() == aDteId || aDteId == KUnsolicitedDataDteId )&& iSessions[i]->IsUnsolicitedDataReqActive() && iSessions[i]->GetPluginType() == EATExtPlugin ) { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATSRV_HANDLEUNSOLICITEDDATA, "CModemAtSrv::HandleUnsolicitedData - session found" ); C_TRACE (( _T("CModemAtSrv::HandleUnsolicitedData() session found") )); iSessions[i]->UnsolicitedData( aData ); + unsolicitedDataHandled = ETrue; + return; } } + if( ! unsolicitedDataHandled ) + { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATSRV_HANDLEUNSOLICITEDDATA, "CModemAtSrv::HandleUnsolicitedData - request is not active yet so save message to the server" ); + C_TRACE (( _T("CModemAtSrv::HandleSignalInd() request is not active yet so save message to the server") )); + + // Note: If call is received with unsolicited "RING", it will not be sent, because request is not active in data mode. + // After that "NO CARRIER" will copy over the "RING", and it will be sent, when returning to command mode. + iTemporaryUnsolicitedData = aData; + } } -void CModemAtSrv::HandleCommandModeChange( TCommandMode aMode ) +TBool CModemAtSrv::IsUnsolicitedDataInBuffer() + { + OstTrace1( TRACE_NORMAL, CMODEMATSRV_ISUNSOLICITEDDATAINBUFFER, "CModemAtSrv::IsUnsolicitedDataInBuffer;%d", (TInt) iTemporaryUnsolicitedData.Length() ); + C_TRACE ((_T("CModemAtSrv::IsUnsolicitedDataInBuffer %d"), (TInt) iTemporaryUnsolicitedData.Length() )); + if( iTemporaryUnsolicitedData.Length() > 0) + { + return ETrue; + } + else + { + return EFalse; + } + } + +void CModemAtSrv::ResetUnsolicitedDataInBuffer() { + OstTrace0( TRACE_NORMAL, CMODEMATSRV_RESETUNSOLICITEDDATAINBUFFER, "CModemAtSrv::ResetUnsolicitedDataInBuffer" ); + C_TRACE (( _T("CModemAtSrv::ResetUnsolicitedDataInBuffer()") )); + iTemporaryUnsolicitedData.Zero(); + } + +void CModemAtSrv::GetUnsolicitedDataInBuffer( TDes8& aData ) + { + OstTrace0( TRACE_NORMAL, CMODEMATSRV_GETUNSOLICITEDDATAINBUFFER, "CModemAtSrv::GetUnsolicitedDataInBuffer" ); + C_TRACE (( _T("CModemAtSrv::GetUnsolicitedDataInBuffer()") )); + aData.Copy( iTemporaryUnsolicitedData ); + } + + +void CModemAtSrv::HandleCommandModeChange( TUint8 aDteId, TCommandMode aMode ) + { + OstTraceExt2( TRACE_NORMAL, CMODEMATSRV_HANDLECOMMANDMODECHANGE, "CModemAtSrv::HandleCommandModeChange;iSessions.Count()=%d;aMode=%d", iSessions.Count(), (TInt)aMode ); C_TRACE ((_T("CModemAtSrv::HandleCommandModeChange sessions = %d mode = %d"), iSessions.Count(), (TInt) aMode )); for( TInt i = 0; i < iSessions.Count(); i++ ) { if( iSessions[i]->IsCommandModeReqActive() && - iSessions[i]->GetPluginType() == ECommonPlugin ) + ECommonPlugin == iSessions[i]->GetPluginType() && + aDteId == iSessions[i]->GetDteId() ) { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATSRV_HANDLECOMMANDMODECHANGE, "CModemAtSrv::HandleCommandModeChange - session found" ); C_TRACE (( _T("CModemAtSrv::HandleCommandModeChange() session found") )); iSessions[i]->CommandModeChanged( aMode ); } @@ -142,32 +290,135 @@ const TDesC8& aResponse, const TUint8 aCommand ) { + OstTraceExt2( TRACE_NORMAL, CMODEMATSRV_HANDLEINTERMEDIATEDATAIND, "CModemAtSrv::HandleIntermediateDataInd;aDteId=%d;iSessions.Count()=%d", aDteId, iSessions.Count() ); C_TRACE ((_T("CModemAtSrv::HandleIntermediateDataInd aDteId = %d sessions = %d "), aDteId, iSessions.Count() )); C_TRACE ((_T("plugintype = %d command = %d"), (TInt)aPluginType, aCommand )); if ( iAtMessageArray.Count() > 0 ) { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATSRV_HANDLEINTERMEDIATEDATAIND, "CModemAtSrv::HandleIntermediateDataInd - iAtMessageArray[0]->ReceiveATResponse Intermediate data" ); C_TRACE((_L("iAtMessageArray[0]->ReceiveATResponse Intermediate data"))); - iAtMessageArray[0]->ReceiveATResponse( aResponse, EFalse ); + iAtMessageArray[0]->ReceiveATResponse( aResponse, EFalse, KErrNone ); } else { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATSRV_HANDLEINTERMEDIATEDATAIND, "CModemAtSrv::HandleIntermediateDataInd - INTERMEDIATE DATA received but no request active" ); C_TRACE ((_T("CModemAtSrv::HandleIntermediateDataInd INTERMEDIATE DATA received but no request active") )); + HandleUnsolicitedData( aDteId, aResponse); } } -void CModemAtSrv::HandleATResponse( const TUint8 aDteId, const TDesC8& aResponse, const TUint8 aCommand ) +void CModemAtSrv::HandleATResponse( + const TUint8 aDteId, + CModemAtHandler* aHandler, + const TDesC8& aResponse, + const TUint8 aCommand ) { + OstTraceExt2( TRACE_NORMAL, CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse;aDteId=%d;iSessions.Count()=%d", aDteId, iSessions.Count() ); C_TRACE ((_T(">>CModemAtSrv::HandleATResponse aDteId = %d sessions = %d "), aDteId, iSessions.Count() )); C_TRACE ((_T("CModemAtSrv::HandleATResponse command = %d"), aCommand )); - + TRACE_ASSERT( NULL != aHandler ) + TInt completeCode( KErrNone ); + if( IsTextMessageMode( aHandler ) ) + { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - Text message mode is on" ); + C_TRACE(_L("Text message mode is on")); + if( aResponse.Find( KCursor ) != KErrNotFound ) + { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - detected during text message mode" ); + C_TRACE(_L("> detected during text message mode")); + completeCode = KReplyTypeEditorStart; // replace later with EReplyTypeEditorStart + } + else if( aResponse.Find( KOkResponse ) != KErrNotFound || + aResponse.Find( KErrorResponse ) != KErrNotFound || + aResponse.Find( KOkResponseNoVerbose ) != KErrNotFound || + aResponse.Find( KErrorResponseNoVerbose ) != KErrNotFound ) + { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - Response detected after text message mode" ); + C_TRACE(_L("Response detected after text message mode")); + aHandler->SetTextMessageMode( EFalse ); + completeCode = KReplyTypeEditorEnd; // replace later with EReplyTypeEditorEnd + } + if( completeCode == KErrNone ) + { + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - Response detected after text message mode (quiet mode)" ); + C_TRACE(_L("Response detected after text message mode (quiet mode)")); + aHandler->SetTextMessageMode( EFalse ); + completeCode = KReplyTypeEditorEnd; + } + } + + if( iEchoQueryIsOngoing ) + { + OstTraceExt2( TRACE_NORMAL, DUP5_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - Echo query ongoing.;iEcho=%d;iEchoNitified=%d", iEcho, iEchoNotified ); + C_TRACE((_L("Echo query ongoing. current: %d, notified %d"), iEcho, iEchoNotified )); + if( iEcho == KOff && iEchoNotified != KOff ) + { + OstTrace0( TRACE_NORMAL, DUP7_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - Echo off, notify common plug-in." ); + C_TRACE(_L("Echo off, notify common plug-in.")); + HandleSignalInd( aDteId, KEchoOff ); + iEchoNotified = KOff; + } + else if( iEcho == KOn && iEchoNotified != KOn ) + { + OstTrace0( TRACE_NORMAL, DUP8_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - Echo on, notify common plug-in." ); + C_TRACE(_L("Echo on, notify common plug-in.")); + HandleSignalInd( aDteId, KEchoOn ); + iEchoNotified = KOn; + } + iEchoQueryIsOngoing = EFalse; + } + else if( iVerboseQueryIsOngoing ) + { + OstTraceExt2( TRACE_NORMAL, DUP9_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - Verbose query ongoing.;iVerbose=%d;iVerboseNotified=%d", iVerbose, iVerboseNotified ); + C_TRACE((_L("Verbose query ongoing. current: %d, notified %d"), iVerbose, iVerboseNotified )); + if( iVerbose == KOff && iVerboseNotified != KOff ) + { + OstTrace0( TRACE_NORMAL, DUP10_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - Verbose off received, notify common plug-in." ); + C_TRACE(_L("Verbose off received, notify common plug-in.")); + HandleSignalInd( aDteId, KVerboseOff ); + iVerboseNotified = KOff; + } + else if( iVerbose == KOn && iVerboseNotified != KOn ) + { + OstTrace0( TRACE_NORMAL, DUP11_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - Verbose on received, notify common plug-in." ); + C_TRACE(_L("Verbose on received, notify common plug-in.")); + HandleSignalInd( aDteId, KVerboseOn ); + iVerboseNotified = KOn; + } + iVerboseQueryIsOngoing = EFalse; + } + else if( iQuietQueryIsOngoing ) + { + OstTraceExt2( TRACE_NORMAL, DUP12_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - Quiet query ongoing.;iQuiet=%d;iQuietNotified=%d", iQuiet, iQuietNotified ); + C_TRACE((_L("Quiet query ongoing. current: %d, notified %d"), iQuiet, iQuietNotified )); + if( iQuiet == KOff && iQuietNotified != KOff ) + { + OstTrace0( TRACE_NORMAL, DUP13_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - Quiet off, notify common plug-in." ); + C_TRACE(_L("Quiet off, notify common plug-in.")); + HandleSignalInd( aDteId, KQuietOff ); + iQuietNotified = KOff; + } + else if( iQuiet == KOn && iQuietNotified != KOn ) + { + OstTrace0( TRACE_NORMAL, DUP14_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - Quiet on, notify common plug-in." ); + C_TRACE(_L("Quiet on, notify common plug-in.")); + HandleSignalInd( aDteId, KQuietOn ); + iQuietNotified = KOn; + } + iQuietQueryIsOngoing = EFalse; + } + if ( iAtMessageArray.Count() > 0 ) { CAtMessage* tmp = iAtMessageArray[0]; + OstTrace1( TRACE_NORMAL, DUP15_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - iAtMessageArray[0]->ReceiveATResponse;tmp=%x", tmp ); C_TRACE((_L("iAtMessageArray[0]->ReceiveATResponse 0x%x"), tmp )); - tmp->ReceiveATResponse( aResponse, ETrue ); + tmp->ReceiveATResponse( aResponse, ETrue, completeCode ); + OstTrace0( TRACE_NORMAL, DUP16_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - Remove the first message in Fifo" ); C_TRACE((_L("CModemAtSrv::HandleATResponse Remove the first message in Fifo"))); RemoveFirstFromSendFifo(); + OstTrace0( TRACE_NORMAL, DUP17_CMODEMATSRV_HANDLEATRESPONSE, "CModemAtSrv::HandleATResponse - SendNextFromFifo" ); C_TRACE((_L("CModemAtSrv::HandleATResponse SendNextFromFifo"))); SendNextFromFifo(); } @@ -178,56 +429,280 @@ C_TRACE ((_T("<>CModemAtSrv::ConnectToModem 0x%x"), aSession)); + OstTraceExt2( TRACE_NORMAL, DUP1_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL;iSessions.Count()=%d;aPluginType=%d", iSessions.Count(), (TInt)aPluginType ); C_TRACE(( _L("session count: %d, type: %d"), iSessions.Count(), (TInt) aPluginType )); if( aPluginType == ECommonPlugin ) { + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Common plug-in connecting;aSession=%x", aSession ); C_TRACE ((_T("Common plug-in connecting"))); - C_TRACE ((_T("<Connect( iDteId ); + C_TRACE ((_T("<= GetDteCount() ) + { + TBool handlerAttached( EFalse ); + for( TInt i = 0; i < iSessions.Count(); i++ ) + { + if( iHandler == iSessions[i]->GetHandler() ) + { + handlerAttached = ETrue; + break; + } + } + + TUint8 devId( 0 ); + TUint8 objId( 0 ); + TBool dteFound( EFalse ); + OstTrace1( TRACE_NORMAL, DUP3_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL;iDteInfo.Count()=%d", iDteInfo.Count() ); + C_TRACE ((_T("iDteInfo.Count(): %d"), iDteInfo.Count())); + for( TInt j = 0; j < iDteInfo.Count(); j++ ) + { + if( NULL == iDteInfo[j].iSession ) + { + dteFound = ETrue; + CModemAtHandler* handler( NULL ); + devId = iDteInfo[j].iDevId; + objId = iDteInfo[j].iObjId; + if( handlerAttached ) + { + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Creating new handler" ); + C_TRACE ((_T("Creating new handler"))); + TUint8 channelId( 0 ); + if( KErrNone == GetFreeChannelId( channelId ) ) + { + handler = CModemAtHandler::NewL( + *this, + channelId ); + iDteInfo[j].iSession = aSession; + aSession->SetHandler( handler ); + } + else + { + TRACE_ASSERT_ALWAYS; + aSession->ModemConnected( KErrGeneral ); + OstTrace0( TRACE_NORMAL, DUP14_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL No free channel id" ); + C_TRACE ((_T("No free channel id"))); + return KErrGeneral; + } + } + else + { + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Using already created handler" ); + C_TRACE ((_T("Using already created handler"))); + iDteInfo[j].iSession = aSession; + aSession->SetHandler( iHandler ); + } + break; + } + } + if( dteFound ) + { + return aSession->GetHandler()->Connect( devId, objId ); + } + else + { + OstTrace0( TRACE_NORMAL, DUP6_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - No dte info found. Possibly PNS_NAME_ADD_IND not received -> creating default pipe." ); + C_TRACE ((_T("No dte info found. Possibly PNS_NAME_ADD_IND not received -> creating default pipe."))); + + CModemAtHandler* handler( NULL ); + + TUint KInitialDpObjId( 0x2f ); + TUint dataportObjectid( KInitialDpObjId ); + TBool found( EFalse ); + + if( !handlerAttached ) + { + OstTrace0( TRACE_NORMAL, DUP7_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Using already created handler" ); + C_TRACE ((_T("Using already created handler"))); + aSession->SetHandler( iHandler ); + + OstTrace0( TRACE_NORMAL, DUP8_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Calling GetDataportObjectId()" ); + C_TRACE ((_T("Calling GetDataportObjectId()"))); + aSession->GetHandler()->GetDataportObjectId( dataportObjectid ); + + OstTrace0( TRACE_NORMAL, DUP9_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Calling AddDevice()" ); + C_TRACE ((_T("Calling AddDevice()"))); + AddDevice( THIS_DEVICE, (TUint8)dataportObjectid ); + + OstTrace0( TRACE_NORMAL, DUP10_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Set session to this device" ); + C_TRACE ((_T("Set session to this device"))); + for( TInt j = 0; j < iDteInfo.Count(); j++ ) + { + if( NULL == iDteInfo[j].iSession ) // if iSession is NULL, the device handler is not attached + { + OstTrace0( TRACE_NORMAL, DUP11_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Device session found" ); + C_TRACE ((_T("Device session found"))); + iDteInfo[j].iSession = aSession; + found = ETrue; + } + } + if( !found ) + { + OstTrace0( TRACE_NORMAL, DUP12_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Device session not found" ); + C_TRACE ((_T("Device session not found"))); + if( iDteInfo.Count() == 1 ) + { + OstTrace0( TRACE_NORMAL, DUP13_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Set session to first device" ); + C_TRACE ((_T("Set session to first device"))); + iDteInfo[0].iSession = aSession; + } + } + } + else + { + // NOTE: It might be possible to have second device attached and then no pipe has been created + // before this, EIscNokiaDataport2 has been used with first device. Now we need use + // EIscNokiaDataport4. EIscNokiaDataport5 is not currently supported without PNS_NAME_ADD_IND. + TUint8 channelId( 0 ); + if( KErrNone == GetFreeChannelId( channelId ) ) + { + C_TRACE ((_T("Creating new handler"))); + handler = CModemAtHandler::NewL( + *this, + channelId ); + OstTrace0( TRACE_NORMAL, DUP15_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Using just created handler" ); + C_TRACE ((_T("Using just created handler"))); + aSession->SetHandler( handler ); + + OstTrace0( TRACE_NORMAL, DUP16_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Calling GetDataportObjectId()" ); + C_TRACE ((_T("Calling GetDataportObjectId()"))); + + // Get dataport 4 + aSession->GetHandler()->GetSecondaryDataportObjectId( dataportObjectid ); + + OstTrace0( TRACE_NORMAL, DUP17_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Calling AddDevice()" ); + C_TRACE ((_T("Calling AddDevice()"))); + AddDevice( THIS_DEVICE, (TUint8)dataportObjectid ); + + + OstTrace0( TRACE_NORMAL, DUP18_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Set session to the second device" ); + C_TRACE ((_T("Set session to the second device"))); + + for( TInt j = 0; j < iDteInfo.Count(); j++ ) + { + if( NULL == iDteInfo[j].iSession ) + { + OstTrace0( TRACE_NORMAL, DUP19_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Device session found" ); + C_TRACE ((_T("Device session found"))); + iDteInfo[j].iSession = aSession; + found = ETrue; + } + } + if( !found ) + { + OstTrace0( TRACE_NORMAL, DUP20_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Device 2 session not found" ); + C_TRACE ((_T("Device 2 session not found"))); + if( iDteInfo.Count() == 2 ) + { + OstTrace0( TRACE_NORMAL, DUP21_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Set session to second device" ); + C_TRACE ((_T("Set session to second device"))); + iDteInfo[1].iSession = aSession; + } + } + } + else + { + TRACE_ASSERT_ALWAYS; + aSession->ModemConnected( KErrGeneral ); + OstTrace0( TRACE_NORMAL, DUP26_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL No free channel id" ); + C_TRACE ((_T("No free channel id"))); + } + } + if( found ) + { + OstTrace0( TRACE_NORMAL, DUP22_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Calling Connect( THIS_DEVICE, dataportObjectid )" ); + C_TRACE ((_T("Calling Connect( THIS_DEVICE, dataportObjectid )"))); + return aSession->GetHandler()->Connect( THIS_DEVICE, dataportObjectid ); + } + else + { + C_TRACE ((_T("no dte info found, connect failed"))); + OstTrace0( TRACE_NORMAL, DUP27_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL no dte info found, connect failed" ); + aSession->ModemConnected( KErrGeneral ); + } + } + } + else + { + OstTrace0( TRACE_NORMAL, DUP23_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Too many connections, connect failed" ); + C_TRACE ((_T("Too many connections, connect failed"))); + aSession->ModemConnected( KErrGeneral ); + } } else { + OstTrace0( TRACE_NORMAL, DUP24_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL - Atext plug-in connecting" ); C_TRACE ((_T("Atext plug-in connecting"))); + for( TInt i = 0; i < iSessions.Count(); i++ ) + { + if( ECommonPlugin == iSessions[i]->GetPluginType() && + 0 == iSessions[i]->GetName().Compare( aSession->GetName() ) ) + { + aSession->SetDteId( iSessions[i]->GetDteId() ); + aSession->SetHandler( iSessions[i]->GetHandler() ); + break; + } + } aSession->ModemConnected( KErrNone ); + + OstTrace1( TRACE_NORMAL, DUP25_CMODEMATSRV_CONNECTTOMODEML, "CModemAtSrv::ConnectToModemL;aSession=%x", aSession ); C_TRACE ((_T("<SendATCommand( iDteId, - aPluginType, - aMessage->GetMessageType(), - aMessage->GetBuffer() ); + CModemAtSession* session = aMessage->GetSession(); + if( session ) + { + CModemAtHandler* handler( session->GetHandler() ); + PeekAtCommand( handler, aMessage->GetBuffer() ); + + handler->SendATCommand( + aPluginType, + aMessage->GetMessageType(), + aMessage->GetBuffer() ); + } + else + { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATSRV_ADDTOSENDFIFO, "CModemAtSrv::AddToSendFifo - Session NULL" ); + C_TRACE((_L("Session NULL"))); + TRACE_ASSERT_ALWAYS; + } } } void CModemAtSrv::RemoveFirstFromSendFifo() { + OstTrace1( TRACE_NORMAL, CMODEMATSRV_REMOVEFIRSTFROMSENDFIFO, "CModemAtSrv::RemoveFirstFromSendFifo;iAtMessageArray.Count()=%d", iAtMessageArray.Count() ); C_TRACE(( _T("CModemAtSrv::RemoveFirstFromSendFifo iAtMessageArray.Count = %d"), iAtMessageArray.Count() )); if( iAtMessageArray.Count( ) > 0 ) { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATSRV_REMOVEFIRSTFROMSENDFIFO, "CModemAtSrv::RemoveFirstFromSendFifo - 1" ); C_TRACE (( _T("CModemAtSrv::RemoveFirstFromSendFifo 1") )); CAtMessage* msg = iAtMessageArray[0]; + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATSRV_REMOVEFIRSTFROMSENDFIFO, "CModemAtSrv::RemoveFirstFromSendFifo - 2;msg=%x", msg ); C_TRACE (( _T("CModemAtSrv::RemoveFirstFromSendFifo 2 0x%x"), msg )); iAtMessageArray.Remove(0); if( msg ) { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATSRV_REMOVEFIRSTFROMSENDFIFO, "CModemAtSrv::RemoveFirstFromSendFifo - 3" ); C_TRACE (( _T("CModemAtSrv::RemoveFirstFromSendFifo 3") )); delete msg; } @@ -235,49 +710,71 @@ { TRACE_ASSERT_ALWAYS; } + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATSRV_REMOVEFIRSTFROMSENDFIFO, "CModemAtSrv::RemoveFirstFromSendFifo - 4" ); C_TRACE (( _T("CModemAtSrv::RemoveFirstFromSendFifo 4") )); } + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATSRV_REMOVEFIRSTFROMSENDFIFO, "CModemAtSrv::RemoveFirstFromSendFifo - 5" ); C_TRACE (( _T("CModemAtSrv::RemoveFirstFromSendFifo 5") )); } void CModemAtSrv::SendNextFromFifo() { + OstTrace1( TRACE_NORMAL, CMODEMATSRV_SENDNEXTFROMFIFO, "CModemAtSrv::SendNextFromFifo - fifo message count;iAtMessageArray.Count()=%d", iAtMessageArray.Count() ); C_TRACE ((_T("CModemAtSrv::SendNextFromFifo fifo has %d message(s)"), iAtMessageArray.Count() )); - TPtr8 ptr(0,0); + TPtr8 ptr( 0, 0 ); if( iAtMessageArray.Count() > 0 ) { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATSRV_SENDNEXTFROMFIFO, "CModemAtSrv::SendNextFromFifo - Messages in buffer... Sending message" ); C_TRACE((_L("Messages in buffer... Sending message"))); ptr.Set( iAtMessageArray[0]->GetBuffer() ); - - C_TRACE (( _T("iHandler->SendATCommand()") )); - iHandler->SendATCommand( iDteId, - iAtMessageArray[0]->GetSession()->GetPluginType(), - iAtMessageArray[0]->GetMessageType(), - ptr ); + + CModemAtHandler* handler( iAtMessageArray[0]->GetSession()->GetHandler() ); + if( handler ) + { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATSRV_SENDNEXTFROMFIFO, "CModemAtSrv::SendNextFromFifo - iHandler->SendATCommand()" ); + C_TRACE (( _T("iHandler->SendATCommand()") )); + PeekAtCommand( handler, ptr ); + handler->SendATCommand( + iAtMessageArray[0]->GetSession()->GetPluginType(), + iAtMessageArray[0]->GetMessageType(), + ptr ); + } + else + { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATSRV_SENDNEXTFROMFIFO, "CModemAtSrv::SendNextFromFifo - Handler NULL" ); + C_TRACE((_L("Handler NULL"))); + TRACE_ASSERT_ALWAYS; + } } } void CModemAtSrv::CancelFifoRequests( const CModemAtSession* aSession ) { + OstTrace1( TRACE_NORMAL, CMODEMATSRV_CANCELFIFOREQUESTS, "CModemAtSrv::CancelFifoRequests;iAtMessageArray.Count()=%d", iAtMessageArray.Count() ); C_TRACE((_T(">>CModemAtSrv::CancelFifoRequests count: %d"), iAtMessageArray.Count() )); TInt messageCount = iAtMessageArray.Count(); for( TInt i = 0; i < messageCount; i++ ) { + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATSRV_CANCELFIFOREQUESTS, "CModemAtSrv::CancelFifoRequests - ;i=%d", i ); C_TRACE((_T("CancelFifoRequests %d"), i )); CAtMessage* msg = iAtMessageArray[ i ]; if( msg ) { + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATSRV_CANCELFIFOREQUESTS, "CModemAtSrv::CancelFifoRequests - Found Request:;msg=%x", msg ); C_TRACE((_T("Found Request: 0x%x"),msg )); if( msg->GetSession() == aSession) { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATSRV_CANCELFIFOREQUESTS, "CModemAtSrv::CancelFifoRequests - canceling request" ); C_TRACE((_T("CancelFifoRequests - canceling request") )); msg->CancelRequest(); + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATSRV_CANCELFIFOREQUESTS, "CModemAtSrv::CancelFifoRequests - delete msg" ); C_TRACE (( _T("CModemAtSrv::CancelFifoRequest delete msg") )); delete msg; } } } + OstTrace1( TRACE_NORMAL, DUP5_CMODEMATSRV_CANCELFIFOREQUESTS, "CModemAtSrv::CancelFifoRequests - iAtMessageArray.Remove;messageCount=%d", messageCount ); C_TRACE (( _T("CModemAtSrv::CancelFifoRequest iAtMessageArray.Remove %d messages"), messageCount )); for( TInt j = 0; j < messageCount && iAtMessageArray.Count() > 0; j++ ) { @@ -288,23 +785,255 @@ TInt CModemAtSrv::SessionCount() { + OstTrace1( TRACE_NORMAL, CMODEMATSRV_SESSIONCOUNT, "CModemAtSrv::SessionCount;iSessions.Count()=%d", iSessions.Count() ); C_TRACE(( _T("CModemAtSrv::SessionCount() %d"), iSessions.Count() )); return iSessions.Count(); } void CModemAtSrv::SetDteIdAndConnect( const TUint8 aDteId, const TInt aConnectionError ) { + OstTrace1( TRACE_NORMAL, CMODEMATSRV_SETDTEIDANDCONNECT, "CModemAtSrv::SetDteIdAndConnect;aDteId=%d", aDteId ); C_TRACE(( _T("CModemAtSrv::SetDteIdAndConnect( %d )"), aDteId )); - iDteId = aDteId; + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATSRV_SETDTEIDANDCONNECT, "CModemAtSrv::SetDteIdAndConnect;iSessions.Count()=%d", iSessions.Count() ); + C_TRACE ((_T("sessions = %d"), iSessions.Count() )); - C_TRACE ((_T("sessions = %d"), iSessions.Count() )); for( TInt i = 0; i < iSessions.Count(); i++ ) { if( iSessions[i]->IsConnectReqActive() ) { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATSRV_SETDTEIDANDCONNECT, "CModemAtSrv::SetDteIdAndConnect - set sessions to connected" ); C_TRACE (( _T("set sessions to connected") )); + iSessions[i]->SetDteId( aDteId ); iSessions[i]->ModemConnected( aConnectionError ); } } } +TBool CModemAtSrv::IsPipeInDataMode( CModemAtHandler* aHandler ) + { + OstTrace1( TRACE_NORMAL, CMODEMATSRV_ISPIPEINDATAMODE, "CModemAtSrv::IsPipeInDataMode;aHandler=%x", aHandler ); + C_TRACE(( _T("CModemAtSrv::IsPipeInDataMode() handler: 0x%x"), aHandler )); + TRACE_ASSERT( NULL != aHandler ) + return aHandler->IsPipeInDataMode(); + } + +TBool CModemAtSrv::IsTextMessageMode( CModemAtHandler* aHandler ) + { + OstTrace1( TRACE_NORMAL, CMODEMATSRV_ISTEXTMESSAGEMODE, "CModemAtSrv::IsTextMessageMode;aHandler=%x", aHandler ); + C_TRACE(( _T("CModemAtSrv::IsTextMessageMode() handler: 0x%x"), aHandler )); + TRACE_ASSERT( NULL != aHandler ) + return aHandler->IsTextMessageMode(); + } + +void CModemAtSrv::PeekAtCommand( CModemAtHandler* aHandler, TDes8& aCmd ) + { + OstTrace1( TRACE_NORMAL, CMODEMATSRV_PEEKATCOMMAND, "CModemAtSrv::PeekAtCommand;aHandler=%x", aHandler ); + C_TRACE(( _T("CModemAtSrv::PeekAtCommand() handler: 0x%x"), aHandler )); + TRACE_ASSERT( NULL != aHandler ) + + if( ( aCmd.Find( KCmgs ) != KErrNotFound || + aCmd.Find( KCmgc ) != KErrNotFound ) && + aCmd.Find( KCmgsQuery ) == KErrNotFound && + aCmd.Find( KCmgcQuery ) == KErrNotFound ) + { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATSRV_PEEKATCOMMAND, "CModemAtSrv::PeekAtCommand - +CMGS or +CMGC detected. The indications after this will be ignored." ); + C_TRACE(_L("+CMGS or +CMGC detected. The indications after this will be ignored.")); + aHandler->SetTextMessageMode( ETrue ); + } + // no else + + if( aCmd.Find( KAtv1 ) != KErrNotFound ) + { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATSRV_PEEKATCOMMAND, "CModemAtSrv::PeekAtCommand - ATV1 received" ); + C_TRACE(( _T("ATV1 received") )); + iVerbose = KOn; + iVerboseQueryIsOngoing = ETrue; + } + else if( aCmd.Find( KAtv0 ) != KErrNotFound || + aCmd.Find( KAtv ) != KErrNotFound ) + { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATSRV_PEEKATCOMMAND, "CModemAtSrv::PeekAtCommand - ATV0 received" ); + C_TRACE(( _T("ATV(0) received") )); + iVerbose = KOff; + iVerboseQueryIsOngoing = ETrue; + } + else if( aCmd.Find( KAtq1 ) != KErrNotFound ) + { + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATSRV_PEEKATCOMMAND, "CModemAtSrv::PeekAtCommand - ATQ1 received" ); + C_TRACE(( _T("ATQ1 received") )); + iQuiet = KOn; + iQuietQueryIsOngoing = ETrue; + } + else if( aCmd.Find( KAtq0 ) != KErrNotFound || + aCmd.Find( KAtq ) != KErrNotFound ) + { + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATSRV_PEEKATCOMMAND, "CModemAtSrv::PeekAtCommand - ATQ0 received" ); + C_TRACE(( _T("ATQ(0) received") )); + iQuiet = KOff; + iQuietQueryIsOngoing = ETrue; + } + else if( aCmd.Find( KAte1 ) != KErrNotFound ) + { + OstTrace0( TRACE_NORMAL, DUP6_CMODEMATSRV_PEEKATCOMMAND, "CModemAtSrv::PeekAtCommand - ATE1 received" ); + C_TRACE(( _T("ATE(1) received") )); + iEcho = KOn; + iEchoQueryIsOngoing = ETrue; + } + else if( aCmd.Find( KAte0 ) != KErrNotFound || + aCmd.Find( KAte ) != KErrNotFound ) + { + OstTrace0( TRACE_NORMAL, DUP7_CMODEMATSRV_PEEKATCOMMAND, "CModemAtSrv::PeekAtCommand - ATE0 received" ); + C_TRACE(( _T("ATE(0) received") )); + iEcho = KOff; + iEchoQueryIsOngoing = ETrue; + } + else if( aCmd.Find( KAts3 ) != KErrNotFound ) + { + OstTrace0( TRACE_NORMAL, DUP8_CMODEMATSRV_PEEKATCOMMAND, "CModemAtSrv::PeekAtCommand - ATS3 received" ); + C_TRACE(( _T("ATS3= received, saving it for the next profile query") )); + + TInt valueLength = aCmd.Length() - KAts3().Length() - 1; + OstTrace1( TRACE_NORMAL, DUP9_CMODEMATSRV_PEEKATCOMMAND, "CModemAtSrv::PeekAtCommand;valueLength=%d", valueLength ); + OstTrace1( TRACE_NORMAL, DUP10_CMODEMATSRV_PEEKATCOMMAND, "CModemAtSrv::PeekAtCommand;KAts3Length=%d", KAts3().Length() ); + C_TRACE(( _T("Reading %d char's starting from %d."), valueLength, KAts3().Length() )); + if( valueLength > 0 ) + { + TLex8 lex( aCmd.Mid( KAts3().Length(), valueLength ) ); + TInt value; + if( lex.Val(value) == KErrNone ) + { + C_TRACE(( _T("iCarriageReturn 0x%x "), value )); + iCarriageReturn = (TUint8)value; + iCarriageReturnFound = ETrue; + } + } + // no else + } + + if( aCmd.Find( KAts3 ) == KErrNotFound && + iCarriageReturnFound ) + { + OstTrace0( TRACE_NORMAL, DUP11_CMODEMATSRV_PEEKATCOMMAND, "CModemAtSrv::PeekAtCommand - ATE=? received" ); + C_TRACE(( _T("ATS3 has set the carriage return, using it once for profile query that will notify it to upper layers") )); + aCmd.Copy( aCmd.Mid( 0, aCmd.Length() - 1 ) ); + aCmd.Append( iCarriageReturn ); + iCarriageReturnFound = EFalse; + } + + } + +TBool CModemAtSrv::IsEchoNotified( const TUint8 aEchoValue ) + { + OstTrace1( TRACE_NORMAL, CMODEMATSRV_ISECHONOTIFIED, "CModemAtSrv::IsEchoNotified;aEchoValue=%d", aEchoValue ); + C_TRACE(( _T("CModemAtSrv::IsEchoNotified( %d )"), aEchoValue )); + if( aEchoValue != iEchoNotified ) + { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATSRV_ISECHONOTIFIED, "CModemAtSrv::IsEchoNotified - Echo value is not notified yet." ); + C_TRACE(( _T("Echo value is not notified yet.") )); + return EFalse; + } + else + { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATSRV_ISECHONOTIFIED, "CModemAtSrv::IsEchoNotified - Echo value is the same as before" ); + C_TRACE(( _T("Echo value is the same as before") )); + return ETrue; + } + } + +TBool CModemAtSrv::IsSettingQueryOngoing() + { + OstTrace0( TRACE_NORMAL, CMODEMATSRV_ISSETTINGQUERYONGOING, "CModemAtSrv::IsSettingQueryOngoing" ); + C_TRACE(( _T("CModemAtSrv::IsSettingQueryOngoing()") )); + if ( iEchoQueryIsOngoing || iVerboseQueryIsOngoing || iQuietQueryIsOngoing ) + { + return ETrue; + } + else + { + return EFalse; + } + } + + +void CModemAtSrv::AddDevice( TUint8 aDevId, TUint8 aObjId ) + { + OstTrace0( TRACE_NORMAL, CMODEMATSRV_ADDDEVICE, "CModemAtSrv::AddDevice" ); + C_TRACE(( _T("CModemAtSrv::AddDevice()") )); + TBool alreadyFound( EFalse ); + + for( int i = 0; i < iDteInfo.Count(); i++ ) + { + if( aDevId == iDteInfo[i].iDevId && aObjId == iDteInfo[i].iObjId ) + { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATSRV_ADDDEVICE, "CModemAtSrv::AddDevice - dte already found" ); + C_TRACE(( _T("CModemAtSrv::AddDevice() dte already found") )); + alreadyFound = ETrue; + break; + } + } + if( !alreadyFound ) + { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATSRV_ADDDEVICE, "CModemAtSrv::AddDevice - adding dte" ); + C_TRACE(( _T("CModemAtSrv::AddDevice() adding dte") )); + TDteInfo devInfo; + devInfo.iDevId = aDevId; + devInfo.iObjId = aObjId; + devInfo.iSession = NULL; + iDteInfo.Append( devInfo ); + } + } + + +void CModemAtSrv::RemoveDevice( TUint8 aDevId, TUint8 aObjId ) + { + OstTrace0( TRACE_NORMAL, CMODEMATSRV_REMOVEDEVICE, "CModemAtSrv::RemoveDevice" ); + C_TRACE(( _T("CModemAtSrv::RemoveDevice()") )); + + for( int i = 0; i < iDteInfo.Count(); i++ ) + { + if( aDevId == iDteInfo[i].iDevId && aObjId == iDteInfo[i].iObjId ) + { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATSRV_REMOVEDEVICE, "CModemAtSrv::RemoveDevice - CModemAtSrv::RemoveDevice() device found" ); + C_TRACE(( _T("CModemAtSrv::RemoveDevice() device found") )); + iDteInfo.Remove( i ); + break; + } + } + } + +TUint8 CModemAtSrv::GetDteCount() + { + OstTrace0( TRACE_NORMAL, CMODEMATSRV_GETDTECOUNT, "CModemAtSrv::GetDteCount" ); + C_TRACE(( _T("CModemAtSrv::GetDteCount()") )); + TUint8 count( 0 ); + for( int i = 0; i < iSessions.Count(); i++ ) + { + if( ECommonPlugin == iSessions[i]->GetPluginType() ) + { + count++; + } + } + return count; + } + +// ----------------------------------------------------------------------------- +// CModemAtSrv::GetFreeChannelId +// Gets free ISC channel id for new connection +// ----------------------------------------------------------------------------- +// +TInt CModemAtSrv::GetFreeChannelId( TUint8& aChannel ) + { + OstTrace0( TRACE_NORMAL, CMODEMATSRV_GETFREECHANNELID, "CModemAtSrv::GetFreeChannelId" ); + C_TRACE(( _T("CModemAtSrv::GetFreeChannelId()") )); + TInt ret( KErrNotFound ); + + if( 0 < iFreeChannels.Size() ) + { + ret = KErrNone; + aChannel = iFreeChannels[0]; + iFreeChannels.Delete( 0, 1 ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATSRV_GETFREECHANNELID, "CModemAtSrv::GetFreeChannelId free channel found: 0x%x", aChannel ); + C_TRACE(( _T("CModemAtSrv::GetFreeChannelId: free channel found: 0x%x"), aChannel )); + } + return ret; + } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematcontroller_exe/src/main.cpp --- a/adaptationlayer/modematadaptation/modematcontroller_exe/src/main.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematcontroller_exe/src/main.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -56,7 +56,7 @@ if ( find.Next(name) == KErrNone ) { // Server is already up - C_TRACE((_L("ext srv already running."))); + C_TRACE((_L("modematcontroller.exe already running."))); return; } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematext_dll/group/modematext_dll.mmp --- a/adaptationlayer/modematadaptation/modematext_dll/group/modematext_dll.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematext_dll/group/modematext_dll.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -37,6 +37,7 @@ USERINCLUDE ../inc USERINCLUDE ../../modematcontroller_dll/inc USERINCLUDE ../../modematcontroller_exe/inc +USERINCLUDE ../traces OS_LAYER_SYSTEMINCLUDE NON_FOUNDATION_ADAPT_LAYER_SYSTEMINCLUDE diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematext_dll/inc/modemat_atext.h --- a/adaptationlayer/modematadaptation/modematext_dll/inc/modemat_atext.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematext_dll/inc/modemat_atext.h Tue Oct 19 13:16:20 2010 +0300 @@ -23,6 +23,7 @@ #include "rmodematcontroller.h" const TInt KNameLength(256); +const TUint8 KMaxSmsBufferSize = 161; NONSHARABLE_CLASS(CModemATExt) : public CATExtPluginBase, public MAtControllerObserver { @@ -222,10 +223,24 @@ //Constructor void ConstructL(); - //Returns AT command by index + //Returns AT command by index TPtrC8 GetAtCommand( TInt aNumber ); - + /** + * Buffers data in editor mode + * @param aCmd data to be buffered + * @param aReply reply data for upper layers is copied to this paramerer + */ + void AddDataToBuffer( const TDesC8& aCmd, RBuf8& aReply ); + + /** + * Sends data in editor mode + * @param aReply reply data for upper layers is copied to this paramerer + * @param aReplyNeeded reply is needed if the buffer has not been exceeded + * @param aCancel cancel the message by sending esc to modem + */ + void SendSmsBuffer( RBuf8& aReply, TBool aReplyNeeded, TBool aCancel ); + private: // Data RModemAtController iRModemAt; @@ -237,6 +252,9 @@ RBuf8* iReply; TBool iReplyNeeded; HBufC8* iCommandBuf; + TBool iIsTextInputMode; + TBuf8 iSmsBuffer; + TBool iDiscardNextReply; }; #endif //MODEMAT_ATEXT_IMPL_H diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematext_dll/src/modemat_atext.cpp --- a/adaptationlayer/modematadaptation/modematext_dll/src/modemat_atext.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematext_dll/src/modemat_atext.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -19,6 +19,19 @@ #include "modemat_atext.h" #include "modemattrace.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "modemat_atextTraces.h" +#endif + +const TInt KReplyTypeEditorStart( 1 ); +const TInt KReplyTypeEditorEnd( 2 ); +const TInt KReplyTypeOther( 3 ); +const TInt KReplyTypeEditor( 4 ); +const TUint8 KEscChar( 0x1B ); // from ascii table +const TUint8 KCtrlZChar( 0x1A ); // from ascii table +const TUint8 KEscDataSize( 2 ); +const TUint8 KErrorSize( 9 ); const char* const atCommands[] = { @@ -103,10 +116,6 @@ ("ATO0"), ("AT+DS"), ("AT+DR"), - ("ATB"), - ("ATB0"), - ("ATB1"), - ("ATB2"), ("AT+CSTA"), ("AT+CHUP"), ("AT+CR"), @@ -151,14 +160,10 @@ ("AT+CGDSCONT"), ("AT+CGTFT"), ("AT+CGCMOD"), - ("AT+CRSM"), ("AT+CSIM"), ("AT+CPNET"), ("AT+CPNSTAT"), ("AT+CGPADDR"), - ("AT+CPLS"), - ("AT+ES"), - ("AT+ESA"), ("AT"), ("LAST") }; @@ -175,6 +180,7 @@ TPtrC8 CModemATExt::GetAtCommand( TInt aNumber ) //list of supported commands for this plugin { + OstTrace1( TRACE_NORMAL, CMODEMATEXT_GETATCOMMAND, "CModemATExt::GetAtCommand;aNumber=%d", aNumber ); C_TRACE((_L("CModemATExt::GetAtCommand(%d)"), aNumber)); const TUint8 **keys = (const TUint8**) atCommands; TPtrC8 keyword( aNumber < KMaxCommandCount ? keys[ aNumber ] : keys[ KMaxCommandCount - 1 ] ); @@ -183,6 +189,7 @@ CModemATExt* CModemATExt::NewL() { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_NEWL, "CModemATExt::NewL" ); C_TRACE((_L("CModemATExt::NewL"))); CModemATExt* self = new (ELeave) CModemATExt(); CleanupStack::PushL(self); @@ -193,6 +200,7 @@ CModemATExt::~CModemATExt() { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_CMODEMATEXT, "CModemATExt::~CModemATExt" ); C_TRACE((_L("CModemATExt::~CModemATExt()"))); if (iReplyBuffer) { @@ -215,25 +223,31 @@ TBool CModemATExt::IsCommandSupported( const TDesC8& aCmd) { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_ISCOMMANDSUPPORTED, "CModemATExt::IsCommandSupported" ); C_TRACE((_L("CModemATExt::IsCommandSupported"))); DUMP_MESSAGE((aCmd)); if(aCmd.Find( KATDCommand )!=KErrNotFound) { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATEXT_ISCOMMANDSUPPORTED, "CModemATExt::IsCommandSupported - ATD" ); C_TRACE((_L("ATD"))); return ETrue; } if(aCmd.Find(KATICommand)!=KErrNotFound) { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATEXT_ISCOMMANDSUPPORTED, "CModemATExt::IsCommandSupported - ATI" ); C_TRACE((_L("ATI"))); return ETrue; } for ( TInt i = 0; i < KMaxCommandCount; i++ ) { + OstTrace1( TRACE_NORMAL, DUP3_CMODEMATEXT_ISCOMMANDSUPPORTED, "CModemATExt::IsCommandSupported - round;i=%d", i ); C_TRACE((_L("round %d"),i)); if( GetAtCommand(i).Find(KLastCommand) != KErrNotFound) { // All messages have been searched so the command is not supported + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATEXT_ISCOMMANDSUPPORTED, "CModemATExt::IsCommandSupported - ********* COMMAND IS NOT SUPPORTED ********* " ); + OstTraceExt1( TRACE_NORMAL, DUP5_CMODEMATEXT_ISCOMMANDSUPPORTED, "CModemATExt::IsCommandSupported;aCmd=%s", aCmd ); C_TRACE((_L("********* COMMAND IS NOT SUPPORTED ********* "))); DUMP_MESSAGE(aCmd); return EFalse; @@ -242,62 +256,83 @@ if(aCmd.Find(GetAtCommand(i))!=KErrNotFound) { //just command + OstTrace1( TRACE_NORMAL, DUP6_CMODEMATEXT_ISCOMMANDSUPPORTED, "CModemATExt::IsCommandSupported - Command;i=%d", i ); C_TRACE((_L("Command"),i)); if(aCmd.Length()==GetAtCommand(i).Length()) { + OstTrace1( TRACE_NORMAL, DUP7_CMODEMATEXT_ISCOMMANDSUPPORTED, "CModemATExt::IsCommandSupported - Ok;i=%d", i ); C_TRACE((_L("Ok"),i)); return ETrue; } if(aCmd.Length()>GetAtCommand(i).Length()) //setting command { + OstTrace0( TRACE_NORMAL, DUP8_CMODEMATEXT_ISCOMMANDSUPPORTED, "CModemATExt::IsCommandSupported - Setting" ); C_TRACE((_L("Setting"))); if( aCmd[GetAtCommand(i).Length()] == '=' || aCmd[GetAtCommand(i).Length()] == '?' ) { - C_TRACE((_L("Ok"),i)); + OstTrace1( TRACE_NORMAL, DUP9_CMODEMATEXT_ISCOMMANDSUPPORTED, "CModemATExt::IsCommandSupported - Ok;i=%d", i ); + C_TRACE((_L("Ok"),i)); return ETrue; } } } } + OstTrace0( TRACE_NORMAL, DUP10_CMODEMATEXT_ISCOMMANDSUPPORTED, "CModemATExt::IsCommandSupported - return EFalse" ); C_TRACE((_L("return EFalse"))); return EFalse; } void CModemATExt::HandleCommand( const TDesC8& aCmd, RBuf8& aReply, TBool aReplyNeeded ) { - C_TRACE((_L("CModemATExt::HandleCommand()" ))); + OstTrace1( TRACE_NORMAL, CMODEMATEXT_HANDLECOMMAND, "CModemATExt::HandleCommand() - is reply needed;aReplyNeeded=%d", aReplyNeeded ); + OstTraceExt1( TRACE_NORMAL, DUP1_CMODEMATEXT_HANDLECOMMAND, "CModemATExt::HandleCommand - dump;aCmd=%s", aCmd ); + C_TRACE((_L("CModemATExt::HandleCommand() is reply needed: %d" ), aReplyNeeded)); DUMP_MESSAGE(aCmd); - iReply = &aReply; - iReplyNeeded = aReplyNeeded; - if( iCommandBuf ) - { - delete iCommandBuf; - iCommandBuf = NULL; - } - iCommandBuf = HBufC8::New( aCmd.Length() + 1 ); - TPtr8 ptr = iCommandBuf->Des(); - ptr.Append( aCmd ); - ptr.Append( iCarriageReturn ); - iRModemAt.HandleATCommand( ptr, iReplyPtr ); + if( iIsTextInputMode ) + { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATEXT_HANDLECOMMAND, "CModemATExt::HandleCommand - text mode on" ); + C_TRACE((_L("CModemATExt::HandleCommand: text mode on") )); + AddDataToBuffer( aCmd, aReply ); + } + else + { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATEXT_HANDLECOMMAND, "CModemATExt::HandleCommand - normal mode on" ); + C_TRACE((_L("CModemATExt::HandleCommand: normal mode on") )); + iReply = &aReply; + iReplyNeeded = aReplyNeeded; + if( iCommandBuf ) + { + delete iCommandBuf; + iCommandBuf = NULL; + } + iCommandBuf = HBufC8::New( aCmd.Length() + 1 ); + TPtr8 ptr = iCommandBuf->Des(); + ptr.Append( aCmd ); + ptr.Append( iCarriageReturn ); + iRModemAt.HandleATCommand( ptr, iReplyPtr ); + } } void CModemATExt::HandleCommandCancel() { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_HANDLECOMMANDCANCEL, "CModemATExt::HandleCommandCancel" ); C_TRACE((_L("CModemATExt::HandleCommandCancel()"))); iRModemAt.HandleATCommandCancel(); } TInt CModemATExt::NextReplyPartLength() { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_NEXTREPLYPARTLENGTH, "CModemATExt::NextReplyPartLength" ); C_TRACE((_L("CModemATExt::NextReplyPartLength()"))); return Min( iReplyPtr.Length(), KPartLength); } TInt CModemATExt::GetNextPartOfReply( RBuf8& aNextReply ) { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_GETNEXTPARTOFREPLY, "CModemATExt::GetNextPartOfReply" ); C_TRACE((_L("CModemATExt::GetNextPartOfReply()"))); aNextReply.Create(iReplyPtr,KPartLength); iReplyPtr.Delete(0,KPartLength); @@ -306,12 +341,14 @@ void CModemATExt::ReceiveUnsolicitedResult() { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_RECEIVEUNSOLICITEDRESULT, "CModemATExt::ReceiveUnsolicitedResult" ); C_TRACE((_L("CModemATExt::ReceiveUnsolicitedResult()"))); - iRModemAt.ReceiveUnsolicitedResult(iUnsolicitedPtr); + iRModemAt.ReceiveUnsolicitedResult( iUnsolicitedPtr ); } void CModemATExt::ReceiveUnsolicitedResultCancel() { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_RECEIVEUNSOLICITEDRESULTCANCEL, "CModemATExt::ReceiveUnsolicitedResultCancel" ); C_TRACE((_L("CModemATExt::ReceiveUnsolicitedResultCancel"))); iRModemAt.ReceiveUnsolicitedResultCancel(); } @@ -320,12 +357,14 @@ RBuf8& /*aReply*/, TBool& /*aEchoOn*/) { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_HANDLEEDITORMODEINPUT, "CModemATExt::HandleEditorModeInput" ); C_TRACE((_L("CModemATExt::HandleEditorModeInput()"))); return EFalse; //commands are execute commands, this function is newer called } void CModemATExt::ReportNvramStatusChange( const TDesC8& /*aNvram*/ ) { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_REPORTNVRAMSTATUSCHANGE, "CModemATExt::ReportNvramStatusChange" ); C_TRACE((_L("CModemATExt::ReportNvramStatusChange()"))); //Ignored in this plugin } @@ -337,21 +376,27 @@ iUnsolicitedPtr(0, 0), iUnsolicitedBuffer(NULL), iReply(NULL), - iReplyNeeded(EFalse) + iReplyNeeded(EFalse), + iIsTextInputMode( EFalse ), + iDiscardNextReply( EFalse ) { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATEXT_CMODEMATEXT, "CModemATExt::CModemATExt" ); C_TRACE((_L("CModemATExt::CModemATExt()"))); } void CModemATExt::ConstructL() { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_CONSTRUCTL, "CModemATExt::ConstructL" ); C_TRACE((_L("CModemATExt::ConstructL()"))); iReplyBuffer = HBufC8::NewL( KDefaultCmdBufLength * KPackets ); iReplyPtr.Set( iReplyBuffer->Des() ); - iUnsolicitedBuffer = HBufC8::NewL(KDefaultCmdBufLength); + iUnsolicitedBuffer = HBufC8::NewL( KDefaultCmdBufLength ); + iUnsolicitedPtr.Set( iUnsolicitedBuffer->Des() ); } void CModemATExt::ReportConnectionName( const TDesC8& aName ) { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_REPORTCONNECTIONNAME, "CModemATExt::ReportConnectionName" ); C_TRACE((_L("CModemATExt::ReportConnectionName()"))); DUMP_MESSAGE((aName)); iName.Copy(aName); @@ -360,43 +405,110 @@ void CModemATExt::HandleATCommandCompleted( TInt aErr ) { - C_TRACE((_L("CModemATExt::HandleATCommandCompleted()"))); - - if(iReplyNeeded) + OstTrace1( TRACE_NORMAL, CMODEMATEXT_HANDLEATCOMMANDCOMPLETED, "CModemATExt::HandleATCommandCompleted;aErr=%d", aErr ); + C_TRACE((_L("CModemATExt::HandleATCommandCompleted( %d )"), aErr)); + + if( !iDiscardNextReply ) { - C_TRACE((_L("Reply needed"))); - iReply->Create( iReplyPtr,KPartLength ); + if(iReplyNeeded) + { + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATEXT_HANDLEATCOMMANDCOMPLETED, "CModemATExt::HandleATCommandCompleted - Reply needed" ); + C_TRACE((_L("Reply needed"))); + iReply->Create( iReplyPtr,KPartLength ); + } + iReplyPtr.Delete(0, KPartLength); + + if( aErr == KErrNone) + { + OstTrace0( TRACE_NORMAL, DUP2_CMODEMATEXT_HANDLEATCOMMANDCOMPLETED, "CModemATExt::HandleATCommandCompleted - No errors" ); + C_TRACE((_L("No errors"))); + if( iIsTextInputMode ) + { + iIsTextInputMode = EFalse; + } + HandleCommandCompleted( aErr, EReplyTypeOk); + } + else if( aErr == KErrGeneral ) + { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATEXT_HANDLEATCOMMANDCOMPLETED, "CModemATExt::HandleATCommandCompleted - Not supported (EReplyTypeUndefined)" ); + C_TRACE((_L("Not supported (EReplyTypeUndefined)"))); + if( iIsTextInputMode ) + { + iIsTextInputMode = EFalse; + } + HandleCommandCompleted( aErr, EReplyTypeUndefined ); + } + else if( aErr == KReplyTypeOther ) + { + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATEXT_HANDLEATCOMMANDCOMPLETED, "CModemATExt::HandleATCommandCompleted - No errors (EReplyTypeOther)" ); + C_TRACE((_L("No errors (EReplyTypeOther)"))); + if( iIsTextInputMode ) + { + iIsTextInputMode = EFalse; + } + HandleCommandCompleted( KErrNone, EReplyTypeOther); + } + else if( aErr == KReplyTypeEditorStart ) + { + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATEXT_HANDLEATCOMMANDCOMPLETED, "CModemATExt::HandleATCommandCompleted - EReplyTypeEditorStart" ); + C_TRACE((_L("EReplyTypeEditorStart"))); + if( !iIsTextInputMode ) + { + iIsTextInputMode = ETrue; + HandleCommandCompleted( KErrNone, static_cast( KReplyTypeEditor ) ); + } + } + else if( aErr == KReplyTypeEditorEnd ) + { + OstTrace0( TRACE_NORMAL, DUP6_CMODEMATEXT_HANDLEATCOMMANDCOMPLETED, "CModemATExt::HandleATCommandCompleted - EReplyTypeEditorEnd" ); + C_TRACE((_L("EReplyTypeEditorEnd"))); + iIsTextInputMode = EFalse; + HandleCommandCompleted( KErrNone, EReplyTypeOk); + } + else + { + OstTrace0( TRACE_NORMAL, DUP7_CMODEMATEXT_HANDLEATCOMMANDCOMPLETED, "CModemATExt::HandleATCommandCompleted - Reply Error" ); + C_TRACE((_L("Reply Error"))); + if( iIsTextInputMode ) + { + iIsTextInputMode = EFalse; + } + HandleCommandCompleted( aErr, EReplyTypeError ); + } } - - iReplyPtr.Delete(0, KPartLength); - C_TRACE((_L("Error status %d"),aErr)); - - if( aErr == KErrNone) + else { - C_TRACE((_L("No errors"))); - HandleCommandCompleted(aErr, EReplyTypeOk); - } - else - { - C_TRACE((_L("Reply Error"))); - HandleCommandCompleted(aErr, EReplyTypeError); + OstTrace0( TRACE_NORMAL, DUP8_CMODEMATEXT_HANDLEATCOMMANDCOMPLETED, "CModemATExt::HandleATCommandCompleted - reply discarded" ); + C_TRACE((_L("CModemATExt::HandleATCommandCompleted: reply discarded"))); + iDiscardNextReply = EFalse; } } -void CModemATExt::HandleUnsolicitedResultReceived( TInt /*aErr*/ ) +void CModemATExt::HandleUnsolicitedResultReceived( TInt aErr ) { - C_TRACE((_L("CModemATExt::HandleUnsolicitedResultReceived"))); - SendUnsolicitedResult( iUnsolicitedPtr ); + OstTrace1( TRACE_NORMAL, CMODEMATEXT_HANDLEUNSOLICITEDRESULTRECEIVED, "CModemATExt::HandleUnsolicitedResultReceived;aErr=%d", aErr ); + C_TRACE((_L("CModemATExt::HandleUnsolicitedResultReceived > ( %d )"), aErr)); + if( KErrNone == aErr ) + { + SendUnsolicitedResult( iUnsolicitedPtr ); + TInt length = iUnsolicitedPtr.Length(); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATEXT_HANDLEUNSOLICITEDRESULTRECEIVED, "CModemATExt::HandleUnsolicitedResultReceived - reply discarded;length=%d", length ); + C_TRACE((_L("clear unsolicited data buffer, length %d"), length)); + iUnsolicitedPtr.Delete( 0, length ); + } + C_TRACE((_L("CModemATExt::HandleUnsolicitedResultReceived <"))); } void CModemATExt::HandleSignalIndication( TInt /*aErr*/ ) { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_HANDLESIGNALINDICATION, "CModemATExt::HandleSignalIndication" ); C_TRACE((_L("CModemATExt::HandleSignalIndication"))); //COMMON plugin handles signal indications } void CModemATExt::ReportExternalHandleCommandError() { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_REPORTEXTERNALHANDLECOMMANDERROR, "CModemATExt::ReportExternalHandleCommandError" ); C_TRACE((_L("CModemATExt::ReportExternalHandleCommandError()"))); //external error occurred, cancel AT-command iRModemAt.HandleATCommandCancel(); @@ -404,7 +516,142 @@ void CModemATExt::HandleCommandModeChanged( TInt /*aErr*/, TCommandMode /*aMode*/ ) { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_HANDLECOMMANDMODECHANGED, "CModemATExt::HandleCommandModeChanged" ); C_TRACE((_L("CModemATExt::HandleCommandModeChanged()"))); //COMMON plugin handles mode change requests } -// End of File + +void CModemATExt::AddDataToBuffer( + const TDesC8& aCmd, + RBuf8& aReply ) + { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_ADDDATATOBUFFER, "CModemATExt::AddDataToBuffer" ); + C_TRACE((_L("CModemATExt::AddDataToBuffer()"))); + + TBool bufferingCanEnd( EFalse ); + TBool bufferExceeded( EFalse ); + + TInt offsetEscChar = aCmd.Locate( KEscChar ); + TInt offsetCtrlZChar = aCmd.Locate( KCtrlZChar ); + OstTrace1( TRACE_NORMAL, DUP1_CMODEMATEXT_ADDDATATOBUFFER, "CModemATExt::AddDataToBuffer: offsetEscChar: %d", offsetEscChar ); + OstTrace1( TRACE_NORMAL, DUP2_CMODEMATEXT_ADDDATATOBUFFER, "CModemATExt::AddDataToBuffer: offsetCtrlZChar: %d", offsetCtrlZChar ); + C_TRACE(( _L("CModemATExt::AddDataToBuffer: offsets: esc: %d, ctrl-z: %d"), offsetEscChar, offsetCtrlZChar )); + + if( KErrNotFound != offsetEscChar || + KErrNotFound != offsetCtrlZChar ) + { + OstTrace0( TRACE_NORMAL, DUP3_CMODEMATEXT_ADDDATATOBUFFER, "CModemATExt::AddDataToBuffer - end char detected" ); + C_TRACE((_L("CModemATExt::AddDataToBuffer: end char detected") )); + bufferingCanEnd = ETrue; + } + + if( KMaxSmsBufferSize < ( aCmd.Length() + iSmsBuffer.Length() ) ) + { + if( bufferingCanEnd ) + { + TInt offset = 0; + if( KErrNotFound != offsetEscChar ) + { + OstTrace0( TRACE_NORMAL, DUP4_CMODEMATEXT_ADDDATATOBUFFER, "CModemATExt::AddDataToBuffer: (truncated, esc)" ); + C_TRACE((_L("CModemATExt::AddDataToBuffer: buffering data (truncated) (esc char detected)") )); + offset = offsetEscChar + 1; + } + else + { + OstTrace0( TRACE_NORMAL, DUP5_CMODEMATEXT_ADDDATATOBUFFER, "CModemATExt::AddDataToBuffer: (truncated, ctrl-z)" ); + C_TRACE((_L("CModemATExt::AddDataToBuffer: buffering data (truncated) (ctrl-z detected)") )); + offset = offsetCtrlZChar + 1; + } + TInt smsBufferSize = iSmsBuffer.Length() + aCmd.Mid( 0, offset ).Length(); + OstTrace1( TRACE_NORMAL, DUP6_CMODEMATEXT_ADDDATATOBUFFER, "CModemATExt::AddDataToBuffer: current + received: %d", smsBufferSize ); + C_TRACE((_L("CModemATExt::AddDataToBuffer: current + received buffer length: %d"), smsBufferSize )); + if( KMaxSmsBufferSize >= smsBufferSize ) + { + iSmsBuffer.Append( aCmd.Mid( 0, offset ) ); + C_TRACE((_L("CModemATExt::AddDataToBuffer: sending data (end char detected)") )); + SendSmsBuffer( aReply, ETrue, EFalse ); + } + else + { + bufferExceeded = ETrue; + } + } + + if( !bufferingCanEnd || + bufferExceeded ) + { + OstTrace0( TRACE_NORMAL, DUP7_CMODEMATEXT_ADDDATATOBUFFER, "CModemATExt::AddDataToBuffer - too big data or esc" ); + C_TRACE((_L("CModemATExt::AddDataToBuffer: data is too big to buffer or esc char detected") )); + + iDiscardNextReply = ETrue; + iIsTextInputMode = EFalse; + + SendSmsBuffer( aReply, EFalse, ETrue ); + + TBuf8 reply; + reply.Append( iCarriageReturn ); + reply.Append( iLineFeed ); + reply.Append( _L( "ERROR" ) ); + reply.Append( iCarriageReturn ); + reply.Append( iLineFeed ); + + aReply.Create( reply, reply.Length() ); + HandleCommandCompleted( KErrNone, EReplyTypeOk ); + } + } + else + { + OstTrace0( TRACE_NORMAL, DUP8_CMODEMATEXT_ADDDATATOBUFFER, "CModemATExt::AddDataToBuffer - buffering data" ); + C_TRACE((_L("CModemATExt::AddDataToBuffer: buffering data") )); + iSmsBuffer.Append( aCmd ); + if( bufferingCanEnd ) + { + OstTrace0( TRACE_NORMAL, DUP9_CMODEMATEXT_ADDDATATOBUFFER, "CModemATExt::AddDataToBuffer - sending data in text mode" ); + C_TRACE((_L("CModemATExt::AddDataToBuffer: sending data in text mode") )); + SendSmsBuffer( aReply, ETrue, EFalse ); + } + else + { + OstTrace0( TRACE_NORMAL, DUP10_CMODEMATEXT_ADDDATATOBUFFER, "CModemATExt::AddDataToBuffer - data is not sent yet, completing request" ); + C_TRACE((_L("CModemATExt::AddDataToBuffer: data is not sent yet, let's complete request") )); + HandleCommandCompleted( KErrNone, static_cast( KReplyTypeEditor ) ); + } + } + } + +void CModemATExt::SendSmsBuffer( + RBuf8& aReply, + TBool aReplyNeeded, + TBool aCancel ) + { + OstTrace0( TRACE_NORMAL, CMODEMATEXT_SENDSMSBUFFER, "CModemATExt::SendSmsBuffer()" ); + C_TRACE((_L("CModemATExt::SendSmsBuffer() replyNeeded: %d, cancel: %d"), (TInt) aReplyNeeded, (TInt) aCancel )); + iReply = &aReply; + iReplyNeeded = aReplyNeeded; + if( iCommandBuf ) + { + delete iCommandBuf; + iCommandBuf = NULL; + } + if( !aCancel ) + { + iCommandBuf = HBufC8::New( iSmsBuffer.Length() + 1 ); + TPtr8 ptr = iCommandBuf->Des(); + ptr.Append( iSmsBuffer ); + ptr.Append( iCarriageReturn ); + iRModemAt.HandleATCommand( ptr, iReplyPtr ); + } + else + { + iCommandBuf = HBufC8::New( KEscDataSize ); + TPtr8 ptr = iCommandBuf->Des(); + ptr.Append( KEscChar ); + ptr.Append( iCarriageReturn ); + iRModemAt.HandleATCommand( ptr, iReplyPtr ); + } + iSmsBuffer.Zero(); + OstTrace0( TRACE_NORMAL, DUP1_CMODEMATEXT_SENDSMSBUFFER, "CModemATExt::SendSmsBuffer() done" ); + } + +// End of File + diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/modematadaptation/modematext_dll/src/modemat_atext.rss --- a/adaptationlayer/modematadaptation/modematext_dll/src/modemat_atext.rss Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/modematadaptation/modematext_dll/src/modemat_atext.rss Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-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" @@ -58,7 +58,7 @@ implementation_uid = 0x20022E87; version_no = 1; display_name = "Modem AT EXT"; - default_data = "PAT+WS46|PATA|PATH|PATH0|PATO|PATO0|PAT+DS|PAT+DR|PATB|PATB0|PATB1|PATB2|PAT+CSTA|PAT+CHUP|PAT+CR|PAT+CEER|PAT+CRC|PAT+CSNS|PAT+CVHU|PAT+CREG|PAT+CLIP|PAT+CLIR|PAT+COLP|PAT+CCFC|PAT+CCWA|PAT+CHLD|PAT+CLCC|PAT+CSSN|PAT+CPAS"; + default_data = "PAT+WS46|PATA|PATH|PATH0|PATO|PATO0|PAT+DS|PAT+DR|PAT+CSTA|PAT+CHUP|PAT+CR|PAT+CEER|PAT+CRC|PAT+CSNS|PAT+CVHU|PAT+CREG|PAT+CLIP|PAT+CLIR|PAT+COLP|PAT+CCFC|PAT+CCWA|PAT+CHLD|PAT+CLCC|PAT+CSSN|PAT+CPAS"; opaque_data = ""; rom_only = 0; }, @@ -76,7 +76,7 @@ implementation_uid = 0x20022E89; version_no = 1; display_name = "Modem AT EXT"; - default_data = "PAT+CGTFT|PAT+CGCMOD|PAT|PATD*|PATI|PATI0|PATI1|PATI2|PATI3|PATI4|PATI9|PATI10|PATI11|PAT+CPNET|PAT+CPNSTAT|PAT+CGPADDR|PAT+ES|PAT+ESA|PAT+CRSM|PAT+CSIM|PAT+CPLS"; + default_data = "PAT+CGTFT|PAT+CGCMOD|PAT|PATD*|PATI|PATI0|PATI1|PATI2|PATI3|PATI4|PATI9|PATI10|PATI11|PAT+CPNET|PAT+CPNSTAT|PAT+CGPADDR|PAT+CSIM"; opaque_data = ""; rom_only = 0; } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/rom/adaptationlayer.iby --- a/adaptationlayer/rom/adaptationlayer.iby Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/rom/adaptationlayer.iby Tue Oct 19 13:16:20 2010 +0300 @@ -20,10 +20,14 @@ #define ADAPTATIONLAYER_IBY #include +#include #include #include -#include +#include +#include +#include #include +#include #endif // ADAPTATIONLAYER_IBY diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/systemstatemanageradaptation/group/bld.inf --- a/adaptationlayer/systemstatemanageradaptation/group/bld.inf Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/systemstatemanageradaptation/group/bld.inf Tue Oct 19 13:16:20 2010 +0300 @@ -23,18 +23,15 @@ BASEDEFAULT PRJ_EXPORTS -../rom/sspluginsadaptation.iby NON_FOUNDATION_CORE_ADAPT_LAYER_IBY_EXPORT_PATH(sspluginsadaptation.iby) +../rom/systemstatemanageradaptation.iby NON_FOUNDATION_CORE_ADAPT_LAYER_IBY_EXPORT_PATH(systemstatemanageradaptation.iby) PRJ_MMPFILES ../ssm_misc_adaptation_dll/group/miscadaptation.mmp ../ssm_emergencycallrf_adaptation_dll/group/emergencycallrfadaptation.mmp - /* - Only miscadaptation and emergencycallrfadaptation are supported. Others are commented out. - - ../ssm_state_adaptation_dll/group/stateadaptationref.mmp - ../ssm_sim_adaptation_dll/group/simadaptationref.mmp - ../ssm_rtc_adaptation_dll/group/rtcadaptationref.mmp - */ + ../ssm_state_adaptation_dll/group/stateadaptation.mmp + +// TEST MMPs +// ../internal/ssma_tester/group/ssma_tester.mmp // End of File diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/systemstatemanageradaptation/iscservice/src/sa_common_isc_service.cpp --- a/adaptationlayer/systemstatemanageradaptation/iscservice/src/sa_common_isc_service.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/systemstatemanageradaptation/iscservice/src/sa_common_isc_service.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -3,8 +3,8 @@ * Name: sa_common_isc_service.cpp * Part of: System adaptation * Description: Implementation of CSACommonIscService class -* %version: 1 % -* %date_modified: Tue Dec 29 15:59:32 2009 % +* %version: 2 % +* %date_modified: Tue May 04 09:25:00 2010 % * * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. @@ -107,7 +107,7 @@ TRequestStatus status; /* Open ISC channel */ - OstTrace0( TRACE_API, SA_COMMON_ISC_SERVICE_AUTOMATED_4, + OstTrace0( TRACE_BORDER, SA_COMMON_ISC_SERVICE_AUTOMATED_4, "ISCSERVICE - CSACommonIscService::ConstructL() - Opening ISC channel" ); API_TRACE( ( _L( "ISCSERVICE - CSACommonIscService::ConstructL() - Opening ISC channel" ) ) ); iIscApi.Open( iChannelNumber, status ); @@ -196,7 +196,7 @@ iSACommonIscServiceChannelListener = NULL; /* Close ISC channel */ - OstTrace0( TRACE_API, SA_COMMON_ISC_SERVICE_AUTOMATED_10, + OstTrace0( TRACE_BORDER, SA_COMMON_ISC_SERVICE_AUTOMATED_10, "ISCSERVICE - CSACommonIscService::~CSACommonIscService - Close ISC channel" ); API_TRACE( ( _L( "ISCSERVICE - CSACommonIscService::~CSACommonIscService - Close ISC channel" ) ) ); iIscApi.Close(); @@ -219,7 +219,7 @@ "ISCSERVICE # CSACommonIscService::SendMessageL(0x%x)", (TUint)&aMessage ); INTERNAL_TRACE( ( _L( "ISCSERVICE # CSACommonIscService::SendMessageL(0x%x)" ), (TUint)&aMessage ) ); - OstTrace1( TRACE_API, SA_COMMON_ISC_SERVICE_AUTOMATED_13, + OstTrace1( TRACE_BORDER, SA_COMMON_ISC_SERVICE_AUTOMATED_13, "ISCSERVICE - CSACommonIscService::SendMessageL() - Sending ISI Message;aData=%x", (TUint)&aMessage ); ISIMSG_API_TRACE( _L("ISCSERVICE # CSACommonIscService::SendMessageL() - Sending ISI Message: "), aMessage); @@ -247,7 +247,7 @@ if ( !IsActive() ) { - OstTrace0( TRACE_API, SA_COMMON_ISC_SERVICE_AUTOMATED_17, + OstTrace0( TRACE_BORDER, SA_COMMON_ISC_SERVICE_AUTOMATED_17, "ISCSERVICE - CSACommonIscService::ReceiveMessageL() - Receiving message" ); API_TRACE( ( _L( "ISCSERVICE - CSACommonIscService::ReceiveMessageL() - Receiving message" ) ) ); @@ -294,7 +294,7 @@ if ( iBufferPtr.Length() >= KSASMinIscMessageLength ) { /* Forward receive message to System Adaptation proxy */ - OstTrace1( TRACE_API, SA_COMMON_ISC_SERVICE_AUTOMATED_20, + OstTrace1( TRACE_BORDER, SA_COMMON_ISC_SERVICE_AUTOMATED_20, "ISCSERVICE - CSACommonIscService::RunL() - Receive ISI Message;iBufferPtr=%x", (TUint)&(iBufferPtr) ); ISIMSG_API_TRACE( _L("ISCSERVICE - CSACommonIscService::RunL() - Receive ISI Message: " ), diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/systemstatemanageradaptation/iscservice/src/sa_common_trace.cpp --- a/adaptationlayer/systemstatemanageradaptation/iscservice/src/sa_common_trace.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/systemstatemanageradaptation/iscservice/src/sa_common_trace.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -141,7 +141,7 @@ // ----------------------------------------------------------------------------- void DataDumpTraceFunc( const TDesC& aPrefix, const TDesC8& aData ) { - HBufC* buffer = HBufC::New( 255 ); // TODO: max line length + HBufC* buffer = HBufC::New( 255 ); // max line length if ( buffer ) { diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/systemstatemanageradaptation/ssm_emergencycallrf_adaptation_dll/src/ssm_emergencycallrf_adaptation.cpp --- a/adaptationlayer/systemstatemanageradaptation/ssm_emergencycallrf_adaptation_dll/src/ssm_emergencycallrf_adaptation.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/systemstatemanageradaptation/ssm_emergencycallrf_adaptation_dll/src/ssm_emergencycallrf_adaptation.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -4,8 +4,8 @@ * Part of: SSMA EmergencyCallRfAdaptation * Interface: N/A * Description: Declaration of CEmergencyCallRfAdaptation class -* %version: 3 % -* %date_modified: Fri Feb 12 10:59:11 2010 % +* %version: 4 % +* %date_modified: Tue May 04 09:25:04 2010 % * * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. @@ -87,7 +87,7 @@ self->ConstructL(); CleanupStack::Pop( self ); - OstTrace1( TRACE_API, CEMERGENCYCALLRFADAPTATION_NEWL_2, + OstTrace1( TRACE_BORDER, CEMERGENCYCALLRFADAPTATION_NEWL_2, "SSMA # CEmergencyCallRfAdaptation::NewL - return 0x%08x", self ); API_TRACE((_L("SSMA # CEmergencyCallRfAdaptation::NewL - return 0x%08x"), self )); return self; @@ -110,7 +110,7 @@ /* Delete iCSACommonIscServicePtr */ if ( iCSACommonIscServicePtr ) { - OstTrace0( TRACE_API, CEMERGENCYCALLRFADAPTATION_CEMERGENCYCALLRFADAPTATION_D2, + OstTrace0( TRACE_BORDER, CEMERGENCYCALLRFADAPTATION_CEMERGENCYCALLRFADAPTATION_D2, "SSMA - CEmergencyCallRfAdaptation::~CEmergencyCallRfAdaptation - Delete iCSACommonIscServicePtr" ); API_TRACE((_L( "SSMA - CEmergencyCallRfAdaptation::~CEmergencyCallRfAdaptation - Delete iCSACommonIscServicePtr" ))); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/systemstatemanageradaptation/ssm_emergencycallrf_adaptation_dll/traces/OstTraceDefinitions.h --- a/adaptationlayer/systemstatemanageradaptation/ssm_emergencycallrf_adaptation_dll/traces/OstTraceDefinitions.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/systemstatemanageradaptation/ssm_emergencycallrf_adaptation_dll/traces/OstTraceDefinitions.h Tue Oct 19 13:16:20 2010 +0300 @@ -1,7 +1,21 @@ +/* +* Copyright (c) 2009-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". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + #ifndef __OSTTRACEDEFINITIONS_H__ #define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -//#define OST_TRACE_COMPILER_IN_USE #include #endif diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/systemstatemanageradaptation/ssm_misc_adaptation_dll/src/ssm_misc_adaptation.cpp --- a/adaptationlayer/systemstatemanageradaptation/ssm_misc_adaptation_dll/src/ssm_misc_adaptation.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/systemstatemanageradaptation/ssm_misc_adaptation_dll/src/ssm_misc_adaptation.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -4,8 +4,8 @@ * Part of: SSMA MiscAdaptation * Interface: N/A * Description: Implementation of CMiscAdaptation class -* %version: 2 % -* %date_modified: Fri Feb 12 10:56:14 2010 % +* %version: 3 % +* %date_modified: Tue May 04 09:25:07 2010 % * * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. @@ -78,7 +78,7 @@ self->ConstructL(); CleanupStack::Pop( self ); - OstTrace1( TRACE_API, CMISCADAPTATION_NEWL_2, + OstTrace1( TRACE_BORDER, CMISCADAPTATION_NEWL_2, "SSMA # CEmergencyCallRfAdaptation::NewL - return 0x%08x", self ); INTERNAL_TRACE((_L("SSMA # CEmergencyCallRfAdaptation::NewL - return 0x%08x"), self )); return self; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/group/bld.inf --- a/adaptationlayer/tsy/group/bld.inf Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/group/bld.inf Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* 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" @@ -27,8 +27,7 @@ //NCP_COMMON_S60_VERSION_SUPPORT flag. #if defined(NCP_COMMON_S60_VERSION_SUPPORT) && (NCP_COMMON_S60_VERSION_SUPPORT==S60_VERSION_32) ../nokiatsy_dll/inc/cmmmessagerouter.h /epoc32/include/cmmmessagerouter.h -// Temporarily removed for Bridge camp! -//../simatktsy_dll/inc/csatmessaging.h /epoc32/include/satmessaging.h +../simatktsy_dll/inc/csatmessaging.h /epoc32/include/satmessaging.h #endif // NCP_COMMON_S60_VERSION_SUPPORT ../rom/tsy.iby NON_FOUNDATION_CORE_ADAPT_LAYER_IBY_EXPORT_PATH(tsy.iby) @@ -39,9 +38,8 @@ ../nokiatsy_dll/group/nokiatsy_dll.mmp ../nokiatsy_dll/group/nokiatsylib.mmp ../customapiext_dll/group/customapiext_dll.mmp -// Temporarily removed for Bridge camp! -// ../simatktsy_dll/group/simatktsy.mmp -//../simatktsy_dll/group/simatktsylib.mmp +../simatktsy_dll/group/simatktsy.mmp +../simatktsy_dll/group/simatktsylib.mmp //NCP_COMMON_S60_VERSION_SUPPORT flag. #if defined(NCP_COMMON_S60_VERSION_SUPPORT ) && (NCP_COMMON_S60_VERSION_SUPPORT>S60_VERSION_32) diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/licenseetsy_dll/group/licenseetsy_dll.mmp --- a/adaptationlayer/tsy/licenseetsy_dll/group/licenseetsy_dll.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/licenseetsy_dll/group/licenseetsy_dll.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* 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" @@ -41,8 +41,7 @@ CAPABILITY CAP_GENERAL_DLL USERINCLUDE ../inc USERINCLUDE ../traces -// Temporarily removed for Bridge camp! -//USERINCLUDE ../../simatktsy_dll/inc +USERINCLUDE ../../simatktsy_dll/inc USERINCLUDE ../../nokiatsy_dll/inc // Dependencies from other components @@ -56,8 +55,7 @@ LIBRARY flogger.lib // Logging // Telephonyadaptation -// Temporarily removed for Bridge camp! -// LIBRARY simatktsy.lib +LIBRARY simatktsy.lib LIBRARY nokiatsy.lib #if defined(WINSCW) diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/licenseetsy_dll/src/licenseetsy.cpp --- a/adaptationlayer/tsy/licenseetsy_dll/src/licenseetsy.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/licenseetsy_dll/src/licenseetsy.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* 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" @@ -19,8 +19,7 @@ // INCLUDE FILES #include "cmmmessagerouter.h" -// Temporarily removed for Bridge camp! -//#include "satmessaging.h" +#include "satmessaging.h" #include "licenseetsy.h" #include "tsylogger.h" @@ -70,7 +69,7 @@ { // none TFLOGSTRING("tsyfactory: CNokiaTSYFactory::CNokiaTSYFactory"); -OstTrace0( TRACE_NORMAL, CNOKIATSYFACTORY_CNOKIATSYFACTORY, "CNokiaTSYFactory::CNokiaTSYFactory" ); +OstTrace0( TRACE_NORMAL, CNOKIATSYFACTORY_CNOKIATSYFACTORY_TD, "CNokiaTSYFactory::CNokiaTSYFactory" ); iSatMessaging = NULL; iMMessageRouter = NULL; @@ -85,7 +84,7 @@ { TFLOGSTRING("tsyfactory: CNokiaTSYFactory::~CNokiaTSYFactory"); -OstTrace0( TRACE_NORMAL, DUP1_CNOKIATSYFACTORY_CNOKIATSYFACTORY, "CNokiaTSYFactory::~CNokiaTSYFactory" ); +OstTrace0( TRACE_NORMAL, DUP1_CNOKIATSYFACTORY_CNOKIATSYFACTORY_TD, "CNokiaTSYFactory::~CNokiaTSYFactory" ); delete iMMessageRouter; iMMessageRouter = NULL; @@ -101,7 +100,7 @@ { TFLOGSTRING("tsyfactory: MLtsyFactoryBase::TCtsyInterfaceVersion"); -OstTrace0( TRACE_NORMAL, CNOKIATSYFACTORY_VERSION, "CNokiaTSYFactory::Version" ); +OstTrace0( TRACE_NORMAL, CNOKIATSYFACTORY_VERSION_TD, "CNokiaTSYFactory::Version" ); return EIfVersion1; } @@ -116,7 +115,7 @@ { TFLOGSTRING("tsyfactory: CNokiaTSYFactory::Release"); -OstTrace0( TRACE_NORMAL, CNOKIATSYFACTORY_RELEASE, "CNokiaTSYFactory::Release" ); +OstTrace0( TRACE_NORMAL, CNOKIATSYFACTORY_RELEASE_TD, "CNokiaTSYFactory::Release" ); // Call destructor delete ( this ); @@ -135,7 +134,7 @@ { TFLOGSTRING("tsyfactory: CNokiaTSYFactory::GetMessageRouter"); -OstTrace0( TRACE_NORMAL, CNOKIATSYFACTORY_GETMESSAGEROUTER, "CNokiaTSYFactory::GetMessageRouter" ); +OstTrace0( TRACE_NORMAL, CNOKIATSYFACTORY_GETMESSAGEROUTER_TD, "CNokiaTSYFactory::GetMessageRouter" ); if ( NULL == iMMessageRouter ) { @@ -155,13 +154,12 @@ { TFLOGSTRING("tsyfactory: CNokiaTSYFactory::GetSatMessagingService"); -OstTrace0( TRACE_NORMAL, CNOKIATSYFACTORY_GETSATMESSAGINGSERVICE, "CNokiaTSYFactory::GetSatMessagingService" ); +OstTrace0( TRACE_NORMAL, CNOKIATSYFACTORY_GETSATMESSAGINGSERVICE_TD, "CNokiaTSYFactory::GetSatMessagingService" ); if ( NULL == iSatMessaging ) { - // Temporarily removed for Bridge camp! - //iSatMessaging = CTsySatMessaging::NewL( iMMessageRouter ); - //iMMessageRouter->iSatMessaging = iSatMessaging; + iSatMessaging = CTsySatMessaging::NewL( iMMessageRouter ); + iMMessageRouter->iSatMessaging = iSatMessaging; } @@ -181,14 +179,13 @@ { TFLOGSTRING("tsyfactory: CNokiaTSYFactory::GetSatMessagingService"); -OstTrace0( TRACE_NORMAL, DUP1_CNOKIATSYFACTORY_GETSATMESSAGINGSERVICE, "CNokiaTSYFactory::GetSatMessagingService" ); +OstTrace0( TRACE_NORMAL, DUP1_CNOKIATSYFACTORY_GETSATMESSAGINGSERVICE_TD, "CNokiaTSYFactory::GetSatMessagingService" ); if ( NULL == iSatMessaging ) { - // Temporarily removed for Bridge camp! - // iSatMessaging = CTsySatMessaging::NewL( iMMessageRouter ); - // iMMessageRouter->iSatMessaging = iSatMessaging; + iSatMessaging = CTsySatMessaging::NewL( iMMessageRouter ); + iMMessageRouter->iSatMessaging = iSatMessaging; } @@ -209,7 +206,7 @@ { TFLOGSTRING("tsyfactory: LtsyFactoryL / Created new CNokiaTSYFactory object"); -OstTrace0( TRACE_NORMAL, _LTSYFACTORYL, "::LtsyFactoryL" ); +OstTrace0( TRACE_NORMAL, _LTSYFACTORYL_TD, "::LtsyFactoryL" ); MLtsyFactoryBase* ltsyFactory = NULL; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/doc/operator_namelist.mdl --- a/adaptationlayer/tsy/nokiatsy_dll/doc/operator_namelist.mdl Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/doc/operator_namelist.mdl Tue Oct 19 13:16:20 2010 +0300 @@ -8460,28 +8460,28 @@ tool "VC++" name "ClassMethods" value (value Text -|*_body=// ToDo: Add your specialized code here and/or call the base class +|*_body=// Add your specialized code here and/or call the base class |cm1=$NAME() |cm2=$NAME(orig:const $NAME&) |cm3=<> ~$NAME() |cm4=operator=(rhs:$NAME&):$NAME& -|cm4_body=// ToDo: Add your specialized code here and/or call the base class||return rhs; +|cm4_body=// Add your specialized code here and/or call the base class||return rhs; |cm5=<> operator==(rhs:const $NAME&):bool -|cm5_body=// ToDo: Add your specialized code here and/or call the base class||return false; +|cm5_body=// Add your specialized code here and/or call the base class||return false; |cm6=<> operator!=(rhs:$NAME&):bool -|cm6_body=// ToDo: Add your specialized code here and/or call the base class||return false; +|cm6_body=// Add your specialized code here and/or call the base class||return false; |cm7=<> operator<(rhs:$NAME&):bool -|cm7_body=// ToDo: Add your specialized code here and/or call the base class||return false; +|cm7_body=// Add your specialized code here and/or call the base class||return false; |cm8=<> operator>(rhs:$NAME&):bool -|cm8_body=// ToDo: Add your specialized code here and/or call the base class||return false; +|cm8_body=// Add your specialized code here and/or call the base class||return false; |cm9=<> operator<=(rhs:$NAME&):bool -|cm9_body=// ToDo: Add your specialized code here and/or call the base class||return false; +|cm9_body=// Add your specialized code here and/or call the base class||return false; |cm10=<> operator>=(rhs:$NAME&):bool -|cm10_body=// ToDo: Add your specialized code here and/or call the base class||return false; +|cm10_body=// Add your specialized code here and/or call the base class||return false; |cm11=<> operator>>(i:istream&, rhs:$NAME&):istream& -|cm11_body=// ToDo: Add your specialized code here and/or call the base class||return i; +|cm11_body=// Add your specialized code here and/or call the base class||return i; |cm12=<> operator<<(o:ostream&, rhs:const $NAME&):ostream& -|cm12_body=// ToDo: Add your specialized code here and/or call the base class||return o; +|cm12_body=// Add your specialized code here and/or call the base class||return o; )) (object Attribute tool "VC++" diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/cmmcallmesshandler.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmcallmesshandler.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmcallmesshandler.h Tue Oct 19 13:16:20 2010 +0300 @@ -643,14 +643,13 @@ /** * Creates PnsPipeCreateReq ISI message and sends it to Phonet. - * @param aPipeStateAfter: pipe state - * @return error value: Symbian error code + * @return error value: Symbian error code */ - TInt PnsPipeCreateReq( const TUint8 aPipeStateAfter ) const; + TInt PnsPipeCreateReq() const; /** * Creates PnsPipeRemoveReq ISI message and sends it to Phonet. - * @return error value: Symbian error code + * @return error value: Symbian error code */ TInt PnsPipeRemoveReq(); @@ -661,6 +660,18 @@ */ void PnsPipeCreateResp( const TIsiReceiveC &aIsiMessage ); + /** + * Builds PNS_PIPE_ENABLE_REQ ISI message and sends it to Phonet. + * @return error value: Symbian error code + */ + TInt PnsPipeEnableReq() const; + + /** + * Handles PNS_PIPE_ENABLE_RESP. + * @param aIsiMessage, reference to the received message. + */ + void PnsPipeEnableResp( const TIsiReceiveC &aIsiMessage ); + public: // Data // None diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/cmmcustommesshandler.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmcustommesshandler.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmcustommesshandler.h Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* 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" @@ -95,8 +95,7 @@ const TUint8 KHomeZoneActiveBit = 0x01; const TUint8 KCityZoneActiveBit = 0x02; -const TUint8 KSimNumberOfCbMsgIds = 15; -const TUint KUnusedCbMsgId = 0xffff; +const TUint16 KUnusedCbMsgId = 0xffff; const TUint8 KCustomTransId = 6; @@ -212,7 +211,7 @@ */ ~CMmCustomMessHandler(); - public: // New Functions + public: // New Functions /** * Creates CallReleaseReq ISI message and sends it to Phonet. @@ -415,7 +414,7 @@ * @param aFileData File data * @return void */ - void UiccReadFieldResp( TInt aStatus, const TDesC8& aFileData ); + void UiccReadFieldResp( TUint8 aStatus, const TDesC8& aFileData ); /** * Read ciphering indicator status from SIM/USIM @@ -448,7 +447,7 @@ * @param aFileData File data * @return none */ - void UiccOperatorResp( TInt aStatus, const TDesC8& aFileData ); + void UiccOperatorResp( TUint8 aStatus, const TDesC8& aFileData ); /** * Disconnects UICC server from smartcard and @@ -563,7 +562,7 @@ * @return void */ void UiccReadCbMsgIdsResp( - TInt aStatus, + TUint8 aStatus, TInt aTraId, const TDesC8& aFileData ); @@ -572,7 +571,7 @@ * @param aStatus Status * @return void */ - void UiccDeleteCbMsgIdResp( TInt aStatus ); + void UiccDeleteCbMsgIdResp( TUint8 aStatus ); /** * Read home zone parameters from UICC @@ -587,7 +586,7 @@ * @return void */ void UiccReadViagHomeZoneParametersResp( - TInt aStatus, + TUint8 aStatus, const TDesC8& aFileData ); /** @@ -605,7 +604,7 @@ * @return void */ void UiccReadViagHomeZoneCacheResp( - TInt aStatus, + TUint8 aStatus, const TDesC8& aFileData ); /** @@ -621,7 +620,7 @@ * @param aStatus Status * @return void */ - void UiccWriteViagHomeZoneUhziueSettingsResp( TInt aStatus ); + void UiccWriteViagHomeZoneUhziueSettingsResp( TUint8 aStatus ); /** * Write Viag Home Zone cache from UICC @@ -638,9 +637,9 @@ * @param aStatus Status * @return void */ - void UiccWriteViagHomeZoneCacheResp( TInt aStatus ); + void UiccWriteViagHomeZoneCacheResp( TUint8 aStatus ); - public: // Functions from base classes + public: // Functions from base classes /** * ISI message for CustomMessageHandler received @@ -1355,6 +1354,14 @@ */ void UiccHandleIsimActivationResp( TInt aStatus ); + /** + * Collects cellbroadcast topic IDs into array. Leaves if nothig found + * @param aFileData elementary file data + * @return array with topic IDs + */ + CArrayFixFlat* CollectCbTopicIdsL( + const TDesC16& aTopicIds ) const; + protected: // Data // Pointer to the PhonetSender @@ -1420,7 +1427,7 @@ TInt iCbMsgIdsMaxCount; // Saves the SIM CB topic number for deletion - TUint iSimCBTopicToBeDeleted; + TUint16 iSimCBTopicToBeDeleted; // Is the SIM topic is being deleted (ETrue ) or not (EFalse) TBool iTopicInSimMemoryDelete; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/cmmmessagerouter.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmmessagerouter.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmmessagerouter.h Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* 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" @@ -66,8 +66,7 @@ class CMmSmsMessHandler; class CMmSecurityMessHandler; class CMmPhoneMessHandler; -// Temporarily removed for bridge camp! -//class CTsySatMessagingBase; +class CTsySatMessagingBase; class CMmUiccMessHandler; #if (NCP_COMMON_S60_VERSION_SUPPORT==S60_VERSION_32) @@ -210,8 +209,7 @@ public: // pointer to SAT Messaging - // Temporarily removed for bridge camp! - //CTsySatMessagingBase* iSatMessaging; + CTsySatMessagingBase* iSatMessaging; // protected attributes protected: diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/cmmnetmesshandler.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmnetmesshandler.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmnetmesshandler.h Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* 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" @@ -593,6 +593,8 @@ // For storing latest received NET_MODEM_REG_STATUS_IND HBufC8* iLastNetModemRegStatusInd; + // Heap-based instance + RMobilePhone::TMobilePhoneNetworkInfoV5 iNetworkInfoHelper; protected: // Data // Pointer to the PhonetSender diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/cmmpacketcontextmesshandler.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmpacketcontextmesshandler.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmpacketcontextmesshandler.h Tue Oct 19 13:16:20 2010 +0300 @@ -475,10 +475,12 @@ * This function starts the third phase of the context initialisation. * @param aStatus: GPDS Status * @param aContextId: Context Id + * @param aTrId: transaction id used in context initialisation sequence */ void InitialiseContextPhase3( - const TUint8 aStatus, - const TUint8 aContextId ); + TUint8 aStatus, + TUint8 aContextId, + TUint8 aTrId ); /** * Set configuration data for context. @@ -506,12 +508,11 @@ /** * This function starts the second phase of the context activation. - * @param aPipeHandle: pipe handle - * @param aTransactionId: transaction id + * @param aDataPackage: data package from CommonTSY + * @return TInt: KErrNone or error code */ - void ActivatePhase2( - const TUint8 aPipeHandle, - const TUint8 aTransactionId ); + TInt ActivatePhase2( + const CMmDataPackage& aDataPackage ); /** * Map the Packet API pdp type to the Gpds server pdp type. @@ -841,6 +842,18 @@ */ TInt getProxyId(const TInfoName& contextName); + /** + * PnsNameAdd indication. + * @param aIsiMessage, reference to the received message. + */ + void PnsNameAddInd( const TIsiReceiveC& aIsiMessage ); + + /** + * PnsNameRemove indication. + * @param aIsiMessage, reference to the received message. + */ + void PnsNameRemoveInd( const TIsiReceiveC& aIsiMessage ); + public: // Data // None diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/cmmpacketmesshandlercontextlist.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmpacketmesshandlercontextlist.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmpacketmesshandlercontextlist.h Tue Oct 19 13:16:20 2010 +0300 @@ -73,6 +73,10 @@ RIscApi iIscApi; TBool iChannelOpened; + + TBool iLoanReturning; + TUint8 iExtDevId; + TUint8 iExtObjId; }; // FUNCTION PROTOTYPES @@ -283,6 +287,15 @@ const TUint8 aTransactionId ); /** + * Gets transaction used in activation + * @param aContextId: context id + * @return TUint8: activation transaction id + * (KUInt8NotDefined if not found) + */ + TUint8 GetActivationTraId( + TUint8 aContextId ); + + /** * Gets and resets transaction used in activation * @param aContextId: context id * @return TUint8: activation transaction id @@ -617,6 +630,51 @@ TUint8 GetContextTypeById( const TUint8 aContextId ); /** + * Sets boolean to indicate returning of pipe loan. + * @param aPipeHandle: pipe handle + * @param aFlag: ETrue if returning loan, otherwise EFalse + * @return TBool: ETrue if set, EFalse if context not found + */ + TBool SetLoanReturning( + TUint8 aPipeHandle, + TBool aFlag ); + + /** + * Gets boolean indicating about pipe loan returning. + * @param aPipeHandle: pipe handle + * @return TBool: ETrue if set, EFalse if context not found + */ + TBool IsLoanReturning( + TUint8 aPipeHandle ) const; + + /** + * Sets deviceId and objectId of loaning pep. + * @param aChannelId: channel id + * @param aDevId: device id + * @param aObjId: object id + * @return TInt: KErrNone if succesful, + * KErrNotFound if no matching channels in context list. + */ + TInt SetExternalDevice( + TUint8 aChannelId, + TUint8 aDevId, + TUint8 aObjId ); + + /** + * Gets deviceId and objectId of loaning pep. + * @param aChannelId: channel id + * @param aDevId: device id + * @param aObjId: object id + * @return TInt: KErrNone if succesful, + * KErrNotFound if no matching channels in context list. + */ + TInt GetExternalDevice( + TUint8 aChannelId, + TUint8& aDevId, + TUint8& aObjId ); + + + /** * Initialize context info list * @param aContextId: id of the context * @return none diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/cmmphonebookoperationinit.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmphonebookoperationinit.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmphonebookoperationinit.h Tue Oct 19 13:16:20 2010 +0300 @@ -199,7 +199,7 @@ * @param const TDes8& aFileData: UICC Message * @return TInt: KErrNone or error value. */ - TInt HandleMBIFileResp( const TDesC8 &aFileData , TInt aStatus ); + void HandleMBIFileResp( const TDesC8 &aFileData , TInt aStatus ); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/cmmphonetreceiver.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmphonetreceiver.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmphonetreceiver.h Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* 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" @@ -135,10 +135,16 @@ */ virtual TInt SetSatMessHandler( MMmMessageReceiver* aSatMessHandler ); - /** + /** + * Gets SAT MessageHandler. + * @return MMmMessageReceiver*: pointer to SAT message handler + */ + virtual MMmMessageReceiver* SatMessHandler(); + + /** * Sat ready indication - * @param TUint8: Message to be retrieved. - * @return TInt: success/failure if msg was found + * @param TUint8: Message to be retrieved. + * @return TInt: success/failure if msg was found */ virtual TInt SatReady( TUint8 aMsg ); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/cmmpipecontrol.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmpipecontrol.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmpipecontrol.h Tue Oct 19 13:16:20 2010 +0300 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: +* Description: * */ @@ -37,17 +37,17 @@ // CONSTANTS const TUint8 KFirstPepType = PN_PEP_TYPE_COMMON; // First PEP type -const TUint8 KSecondPepType = PN_PEP_TYPE_GPRS; // Second PEP type -const TUint8 KSecondPepDevice = 0x00; // Device Id of second PEP -const TUint8 KSecondPepObject = 0x33; // Object Id of second PEP +const TUint8 KSecondPepType = PN_PEP_TYPE_COMMON; // Second PEP type +const TUint8 KFirstPepDevice = PN_DEV_OWN; // Device Id of first PEP +const TUint8 KSecondPepDevice = PN_DEV_MODEM; // Device Id of second PEP +const TUint8 KSecondPepObject = PN_OBJ_PEP_GPDS; // Object Id of second PEP + const TUint8 KUnknownTransID = 0x00; const TUint8 KInvalidPipeHandle = 0xFF; // Maximum number of simultaneous PipeHandle supported by this phone. const TInt KMmMaxNumberOfPipeHandles = KMmMaxNumberOfContexts; - -const TUint8 KFirstPepDevice = PN_DEV_HOST; // Device Id of first PEP #ifdef DUMMY_NIF_PEP_FOR_PACKET_DATA_TESTING_DOS @@ -106,11 +106,11 @@ // CMmPipeControl is used to create and send GSM-specific pipe control // ISI messages to PhoNet via PhoNetSender. It also receives // GSM-specific pipe control ISI messages from Phonet via PhoNetReceiver. -class CMmPipeControl : public CBase, +class CMmPipeControl : public CBase, public MMmMessageReceiver { public: // Constructors and destructor. - + /** * NewL method is used to create a new instance of class. * @param CMmPhoNetSender*: pointer to phonet sender @@ -131,7 +131,7 @@ ~CMmPipeControl(); public: // New classes - + // TPipeOperationInfo class TPipeOperationInfo { @@ -141,12 +141,12 @@ }; public: // Functions from base classes - + /** * Isimsg received by PhonetReceiver. * @param TIsiReceiveC, reference to the received message. */ - void ReceiveMessageL( const TIsiReceiveC& aIsiMessage ); + void ReceiveMessageL( const TIsiReceiveC& aIsiMessage ); public: // New functions @@ -155,7 +155,7 @@ * @param aTransId: transaction Id * @param aPipeState: pipe state * @param aFirstPepObject: First PEP object Id - * @return error value: Symbian error code + * @return error value: Symbian error code */ TInt PnsPipeCreateReq( const TUint8 aTransId, @@ -164,17 +164,20 @@ /** * Creates PnsPipeEnableReq ISI message and sends it to Phonet. - * @param aPackage: data package - * @return error value: Symbian error code + * @param aPipeHandle: pipe to be enabled + * @param aTransId: transaction Id + * @return error value: Symbian error code */ - TInt PnsPipeEnableReq( const CMmDataPackage& aPackage ) const; + TInt PnsPipeEnableReq( + TUint8 aPipeHandle, + TUint8 aTransId ) const; /** * Creates PnsPipeResetReq ISI message and sends it to Phonet. * @param aTransId: transaction Id * @param aPipeHandle: pipe handle * @param aStateAfterReset: pipe state after reset - * @return error value: Symbian error code + * @return error value: Symbian error code */ TInt PnsPipeResetReq( const TUint8 aTransId, @@ -185,15 +188,52 @@ * Creates PnsPipeRemoveReq ISI message and sends it to Phonet. * @param aTransId: transaction Id * @param aPipeHandle: pipe handle - * @return error value: Symbian error code + * @return error value: Symbian error code */ TInt PnsPipeRemoveReq( const TUint8 aTransId, const TUint8 aPipeHandle ); - + + /** + * Creates PnsPipeRedirectReq ISI message and sends it to Phonet. + * @param aTransId: transaction Id + * @param aPipeHandle: pipe handle + * @param aOldPepDevId: Device ID to remove from + * @param aOldPepObjId: Object ID to remove from + * @param aReplacementPepDevId: Device ID to redirect to + * @param aReplacementPepObjId: Object ID to redirect to + * @return error value: Symbian error code + */ + TInt PnsPipeRedirectReq( + TUint8 aTransId, + TUint8 aPipeHandle, + TUint8 aOldPepDevId, + TUint8 aOldPepObjId, + TUint8 aReplacementPepDevId, + TUint8 aReplacementPepObjId); + + /** + * Creates PnsPepCtrlReq ISI message and sends it to Phonet. + * @param aDevId: device Id + * @param aObjId: object Id + * @param aTransId: transaction Id + * @param aPipeHandle: pipe handle + * @param aControlId: control id + * @param aStatus: status code + * @return error value: Symbian error code + */ + TInt PnsPepCtrlReq( + TUint8 aDevId, + TUint8 aObjId, + TUint8 aTransId, + TUint8 aPipeHandle, + TUint8 aControlId, + TUint8 aStatus, + TUint8 aChannelId ); + public: // Functions from base classes // None - + protected: // New functions // None @@ -212,16 +252,8 @@ */ void ConstructL(); -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING /** - * Creates PnsNameQueryReq ISI message and sends it to Phonet. - * @return error value: Symbian error code - */ - TInt PnsNameQueryReq() const; -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - - /** - * PnsPipeCreate response. + * PnsPipeCreate response. * @param aIsiMessage, reference to the received message. */ void PnsPipeCreateResp( const TIsiReceiveC &aIsiMessage ); @@ -233,54 +265,59 @@ void PnsPipeEnableResp( const TIsiReceiveC& aIsiMessage ); /** - * PnsPipeReset response. + * PnsPipeReset response. * @param aIsiMessage, reference to the received message. */ void PnsPipeResetResp( const TIsiReceiveC& aIsiMessage ); /** - * PnsPipeRemove response. + * PnsPipeRemove response. * @param aIsiMessage, reference to the received message. */ void PnsPipeRemoveResp( const TIsiReceiveC& aIsiMessage ); -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING - /** - * PnsNameQuery response. + /** + * PnsPipeRedirect response. * @param aIsiMessage, reference to the received message. */ - void PnsNameQueryResp( const TIsiReceiveC& aIsiMessage ); -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ + void PnsPipeRedirectResp( const TIsiReceiveC& aIsiMessage ); /** - * Initialize lists. + * PnsPepCtrl response. + * @param aIsiMessage, reference to the received message. + */ + void PnsPepCtrlResp( const TIsiReceiveC& aIsiMessage ); + + + /** + * Initialize lists. */ void InitLists(); /** - * Set Pipe Handle. + * Set Pipe Handle. * @param aPipeHandle: pipe handle */ void SetPipeHandle( const TUint8 aPipeHandle ); /** - * Set Transaction Id. + * Set Transaction Id. * @param aPipeHandle: pipe handle * @param aTransId: transaction Id */ void SetTransactionId( - const TUint8 aPipeHandle, + const TUint8 aPipeHandle, const TUint8 aTransId ); /** - * Return Transaction Id. + * Return Transaction Id. * @param aPipeHandle: pipe handle - * @return TUint8, Transaction Id + * @return TUint8, Transaction Id */ TUint8 TransactionId( const TUint8 aPipeHandle ) const; /** - * Reset Pipe Handle. + * Reset Pipe Handle. * @param aPipeHandle: pipe handle */ void ResetPipeHandle( const TUint8 aPipeHandle ); @@ -291,7 +328,7 @@ */ TBool IsOperationCalled( const TUint8 aPipeHandle ) const; -#ifdef DUMMY_NIF_PEP_FOR_PACKET_DATA_TESTING_DOS +#ifdef DUMMY_NIF_PEP_FOR_PACKET_DATA_TESTING_DOS /** * PnsPepConnect request. * @param aIsiMessage, reference to the received message. @@ -305,19 +342,19 @@ void PnsPepDisconnectReq( const TIsiReceiveC& aIsiMessage ); /** - * PnsPepReset request. + * PnsPepReset request. * @param aIsiMessage, reference to the received message. */ void PnsPepResetReq( const TIsiReceiveC& aIsiMessage ); /** - * PnsPepEnable request. + * PnsPepEnable request. * @param aIsiMessage, reference to the received message. */ void PnsPepEnableReq( const TIsiReceiveC& aIsiMessage ); /** - * PnsPepConnect response. + * PnsPepConnect response. * @param aTransId: transaction Id * @param aPipeHandle: pipe handle */ @@ -326,7 +363,7 @@ const TUint8 aPipeHandle ); /** - * PnsPepDisconnect response. + * PnsPepDisconnect response. * @param aTransId: transaction Id * @param aPipeHandle: pipe handle */ @@ -344,7 +381,7 @@ const TUint8 aPipeHandle ); /** - * PnsPepEnable response. + * PnsPepEnable response. * @param aTransId: transaction Id * @param aPipeHandle: pipe handle */ @@ -363,13 +400,13 @@ // A pointer to the context messhandler. CMmPacketContextMessHandler* iContextMessHandler; - + // Pointer to contextlist CMmPacketContextMesshandlerList* iContextList; // A pointer to the PhonetSender. CMmPhoNetSender* iPhoNetSender; - + // Pipe Operation Array contains TPipeOperation elements. TPipeOperationInfo iPipeOperationArray[KMmMaxNumberOfPipeHandles]; @@ -391,5 +428,5 @@ }; #endif // CMMPIPECONTROL_H - + // End of File diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/cmmsecuritymesshandler.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmsecuritymesshandler.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmsecuritymesshandler.h Tue Oct 19 13:16:20 2010 +0300 @@ -60,9 +60,9 @@ * @since 2.6 */ class CMmSecurityMessHandler - : public CBase, - public MMmMessHandlerBase, - public MMmMessageReceiver, + : public CBase, + public MMmMessHandlerBase, + public MMmMessageReceiver, public MUiccOperationBase { @@ -241,26 +241,6 @@ #endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ /** - * Forms UICC_REQ ISI message - * return Error code - */ - TInt UiccReq() const; - - /** - * Response to UICC_REQ - * @param aIsiMessage Received ISI message - * @return void - */ - void UiccResp( const TIsiReceiveC& aIsiMessage ); - - /** - * Handles UICC_IND - * @param aIsiMessage Received ISI message - * @return void - */ - void UiccInd( const TIsiReceiveC& aIsiMessage ); - - /** * Handles UICC_CARD_IND * @param aIsiMessage Received ISI message * @return void @@ -443,7 +423,7 @@ * @return void */ void WriteEfEstResp( const TInt aStatus ); - + /** * Handles INVALIDATE/REHABILITATE command response * in case of ICC card @@ -487,6 +467,13 @@ TInt aStatus, const TDesC8& aFileData ); + /** + * Sends pin verified event notification to upper level. + * @param aStatus Status + * @return void + */ + void CompleteIfCodeVerified( const TUint8 aStatus ); + protected: /** @@ -496,6 +483,9 @@ private: // Data + //keep record of security code type when verify it + RMobilePhone::TMobilePhoneSecurityCode iSecurityCode; + //Pointer to the Message Router CMmMessageRouter* iMessageRouter; @@ -545,7 +535,7 @@ // Security code type RMobilePhone::TMobilePhoneSecurityCode iCodeType; - + // variable to store FDN state which is going // to be set RMobilePhone::TMobilePhoneFdnSetting iFdnSetting; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/cmmsmsmesshandler.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmsmsmesshandler.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmsmsmesshandler.h Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 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" @@ -432,25 +432,25 @@ * @param aIsiMsg ISI message * @param aDestAddressLength Destination address length * @param aMsgOffset Offset of ISI message where to append subblock - * @return void + * @return length of composed subblock */ - void BuildSmsSbSubmit( + TUint16 BuildSmsSbSubmit( const TDesC8& aMsgData, TIsiSend& aIsiMsg, TUint8 aDestAddressLength, - TUint8 aMsgOffset ) const; + TUint aMsgOffset ) const; /** * Creates SMS_SB_COMMAND subblock and appends it to ISI message * @param aMsgData SMS TPDU * @param aIsiMsg ISI message * @param aMsgOffset Offset of ISI message where to append subblock - * @return void + * @return length of composed subblock */ - void BuildSmsSbCommand( + TUint16 BuildSmsSbCommand( const TDesC8& aMsgData, TIsiSend& aIsiMsg, - TUint8 aMsgOffset ) const; + TUint aMsgOffset ) const; /** * Creates SMS_SB_ADDRESS subblock and appends it to ISI message @@ -460,11 +460,11 @@ * @param aMsgOffset Offset of ISI message where to append subblock * @return Length of created subblock */ - TUint8 BuildSmsSbAddress( + TUint16 BuildSmsSbAddress( const TDesC8& aAddress, TIsiSend& aIsiMsg, TUint8 aAddressType, - TUint8 aMsgOffset ) const; + TUint aMsgOffset ) const; /** * Creates SMS_SB_USER_DATA subblock and appends it to ISI message @@ -476,13 +476,13 @@ * @param aMsgOffset Offset of ISI message where to append subblock * @return Length of created subblock */ - TUint8 BuildSmsSbUserData( + TUint16 BuildSmsSbUserData( const TDesC8& aMsgData, TIsiSend& aIsiMsg, TUint8 aTpUdl, TUint8 aTpUserDataIndex, TBool aDefaultAlphabet, - TUint8 aMsgOffset ) const; + TUint aMsgOffset ) const; /** * Creates SMS_SB_VALIDITY_PERIOD subblock and appends it to ISI message @@ -491,25 +491,25 @@ * @param aTpVpIndex Index of validity period in TPDU * @param aTpVpLength Length of validity period * @param aMsgOffset Offset of ISI message where to append subblock - * @return void + * @return Length of created subblock */ - void BuildSmsSbValidityPeriod( + TUint16 BuildSmsSbValidityPeriod( const TDesC8& aMsgData, TIsiSend& aIsiMsg, TUint8 aTpVpIndex, TUint8 aTpVpLength, - TUint8 aMsgOffset )const; + TUint aMsgOffset )const; /** * Creates SMS_SB_CHECK_INFO sub block with SMS_CHECK_DISABLE_FDN and appends it * to ISI message. * @param aIsiMsg ISI message * @param aMsgOffset Offset of ISI message where to append subblock - * @return void + * @return Length of created subblock */ - void BuildSmsCheckInfo( + TUint16 BuildSmsCheckInfo( TIsiSend& aIsiMsg, - TUint8 aMsgOffset )const; + TUint aMsgOffset )const; /** * Read SMS or EF SMS record count from SIM/USIM @@ -649,6 +649,20 @@ * @return Symbian error code */ TInt UiccSmsUpdateParameterReq( const CMmDataPackage* aDataPackage ); + + /** + * Handles SMS resouce conf information + * @param aIsiMsg message data + * @return void + */ + void SmsResourceConfInd( const TIsiReceiveC& aIsiMsg ); + + /** + * Sends SMS_RESOURCE_CONF_REQ for disabling resource control + * @return void + */ + void SmsResourceConfReq(); + //ATTRIBUTES public: //none @@ -707,11 +721,11 @@ // Flag to check is the case class 2 SMS write or EMobileStoreWrite TBool iSMSClass2Write; - // Client has no storage to receive anymore SM's - TBool iMemoryCapacityExceeded; - // Record number of EF smsp TUint8 iSmspRecordNumber; + + // pointer to phonet receiver + CMmPhoNetReceiver* iPhonetReceiver; }; #endif // _CMMSMSMESSHANDLER_H_ diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/cmmsupplservmesshandler.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmsupplservmesshandler.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmsupplservmesshandler.h Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* 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" @@ -420,20 +420,34 @@ */ void UiccHandleCallFwdFlagsResp( TInt aStatus, - TInt aTrId, + TInt aTrId, const TDesC8& aFileData ); /** * Write call forwarding flags REL4 + * @param aVoiceStatus voice flag value + * @param aFaxStatus fax flag value + * @param aDataStatus data flag status * @return KErrNone or error code */ - TInt UiccWriteCallFwdFlagsRel4Req(); + TInt UiccWriteCallFwdFlagsRel4Req( + TUint8 aVoiceStatus, + TUint8 aFaxStatus, + TUint8 aDataStatus ); /** * Write call forwarding flags CPHS + * @param aVoiceLine1Status voice line 1 flag value + * @param aVoiceLine2Status voice line 2 flag value + * @param aFaxStatus fax flag value + * @param aDataStatus data flag value * @return KErrNone or error code */ - TInt UiccWriteCallFwdFlagsCPHSReq(); + TInt UiccWriteCallFwdFlagsCPHSReq( + TUint8 aVoiceLine1Status, + TUint8 aVoiceLine2Status, + TUint8 aFaxStatus, + TUint8 aDataStatus ); /** * Read voice message flags REL4 @@ -761,15 +775,6 @@ // Mobile address RMobilePhone::TMobileAddress iCFAddress; - // Stores voice indicator status read from the USIM - TUint8 iVoiceStatus; - - // Stores data indicator status read from the USIM - TUint8 iDataStatus; - - // Stores fax indicator status read from the USIM - TUint8 iFaxStatus; - // Stores Call Forwarding Number read from the USIM TBuf iCFTelNumberFromSim; @@ -788,18 +793,6 @@ // Stores Call Forwarding indicators read from the USIM RMmCustomAPI::TCFIndicators iTCFIndicators; - // Stores voice line1 flag read from the USIM - TUint8 iVoiceLine1; - - // Stores voice line2 flag read from the USIM - TUint8 iVoiceLine2; - - // Stores fax flag read from the USIM - TUint8 iFax; - - // Stores data flag read from the USIM - TUint8 iData; - // Current ALS line used RMobilePhone::TMobilePhoneALSLine iAlsLine; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/cmmuiccmesshandler.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmuiccmesshandler.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmuiccmesshandler.h Tue Oct 19 13:16:20 2010 +0300 @@ -205,6 +205,8 @@ ETrIdEnStoreRead, ETrIdEnStoreGetInfo, ETrIdEMmTsyONStoreGetInfo, + ETrIdGetUiccStatus, + ETrIdGetCardStatus, ENumOfUiccTrIds }; @@ -432,7 +434,7 @@ TInt CreateUiccApplicationReq( const TUiccParamsBase& aParams, TUint8 aServiceType, - TUint8 aApplType = UICC_APPL_TYPE_UICC_USIM ); + TUint8 aApplType ); /** * Provide UICC application ID @@ -621,6 +623,18 @@ * @return UICC client ID */ TUint8 GetUiccClientId(); + + /** + * Get UICC application status + * @return UICC application status + */ + TUint8 GetUiccApplicationStatus(); + + /** + * Forms UICC_REQ ISI message + * return Error code + */ + TInt CreateUiccReq(); public: // Functions from base classes @@ -716,6 +730,26 @@ TIsiSend& aIsiMsg, TUint8 aMsgOffset, TUint8 aApplType = UICC_APPL_TYPE_UICC_USIM ); + + /** + * Create and append UICC_SB_APPL_INFO + * @param aIsiMsg ISI message + * @param aMsgOffset Offset where subblock is appended + * @return void + */ + void CreateUiccSbApplInfo( + TIsiSend& aIsiMsg, + TUint8 aMsgOffset ); + + /** + * Create and append UICC_SB_AID + * @param aIsiMsg ISI message + * @param aMsgOffset Offset where subblock is appended + * @return void + */ + void CreateUiccSbAid( + TIsiSend& aIsiMsg, + TUint8 aMsgOffset ); /** * Get file data @@ -755,6 +789,20 @@ TInt HandleUiccApplicationResp( const TIsiReceiveC& aIsiMsg ); /** + * Handle UICC_APPLICATION_RESP ISI message for service type UICC_APPL_LIST + * @param aIsiMsg ISI message + * @return KErrNone or error code + */ + TInt HandleUiccApplListResp( const TIsiReceiveC& aIsiMsg ); + + /** + * Handle UICC_APPLICATION_RESP ISI message for service type UICC_APPL_HOST_ACTIVATE + * @param aIsiMsg ISI message + * @return KErrNone or error code + */ + TInt HandleUiccApplHostActivate( const TIsiReceiveC& aIsiMsg ); + + /** * Get apdu data * @param aIsiMsg Received ISI message * @return APDU data @@ -799,6 +847,13 @@ void CphsInformationCacheResp( TInt aStatus, const TDesC8& aFileData ); + + /** + * Handles card response according card status + * @param aIsiMsg ISI message + * @return none + */ + void UiccCardRespStatus( const TIsiReceiveC& aIsiMsg ); private: // Data diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/nokiatsy_release.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/nokiatsy_release.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/nokiatsy_release.h Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* 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" @@ -22,7 +22,7 @@ #define NOKIATSY_RELEASE_H // UPDATE THIS STRING FOR EVERY RELEASE!!! -#define NOKIATSY_RELEASE_STR "TSY: RELEASE --> modemadaptation-MCL_201015" +#define NOKIATSY_RELEASE_STR "TSY: RELEASE --> modemadaptation-MCL_201039" #endif // NOKIATSY_RELEASE_H // End of File \ No newline at end of file diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/inc/operators.h --- a/adaptationlayer/tsy/nokiatsy_dll/inc/operators.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/inc/operators.h Tue Oct 19 13:16:20 2010 +0300 @@ -18,7 +18,7 @@ // This file is autogenerated from operators.txt -// Generation date: 09-Apr-2010 08:13:42 +// Generation date: 01-Sep-2010 14:37:36 struct TOperator @@ -92,7 +92,8 @@ { 88, "F - Contact", NULL }, }; -const TOperator operators_212[1] = { // MCO +const TOperator operators_212[2] = { // MCO + { 1, "vala", NULL }, { 10, "Monaco", NULL }, }; @@ -109,7 +110,7 @@ }; const TOperator operators_216[3] = { // HU - { 1, "H pannon 3G", NULL }, + { 1, "Telenor HU", NULL }, { 30, "T-Mobile H", NULL }, { 70, "vodafone HU", NULL }, }; @@ -339,13 +340,14 @@ { 5, "3 IRL", NULL }, }; -const TOperator operators_274[6] = { // ISL +const TOperator operators_274[7] = { // ISL { 1, "Siminn", NULL }, { 2, "Vodafone", NULL }, { 4, "Viking", NULL }, { 7, "IS-IceCell", NULL }, { 8, "On-waves", NULL }, { 11, "NOVA IS", NULL }, + { 12, "Siminn", NULL }, }; const TOperator operators_276[4] = { // ALB @@ -425,13 +427,14 @@ { 77, "LI TANGO", NULL }, }; -const TOperator operators_302[9] = { // CAN +const TOperator operators_302[10] = { // CAN { 220, "TELUS", NULL }, { 350, "FIRST", NULL }, { 370, "Fido", NULL }, { 380, "DMTS GSM", NULL }, { 490, "WIND", NULL }, { 610, "Bell", NULL }, + { 660, "MTS", NULL }, { 720, "ROGERS", NULL }, { 730, "TStarSol", NULL }, { 880, "3G Plus", NULL }, @@ -442,7 +445,7 @@ { 2, "SPM-PROSODIE", NULL }, }; -const TOperator operators_310[79] = { // USA +const TOperator operators_310[81] = { // USA { 0, "Mid-Tex", NULL }, { 11, "WTTCKy", NULL }, { 20, "Union Tel", NULL }, @@ -460,6 +463,7 @@ { 80, "Corr", NULL }, { 90, "Edge", NULL }, { 100, "US PLATEAU", NULL }, + { 140, "USA Mpluse", NULL }, { 150, "AT&T", NULL }, { 160, "T-Mobile", NULL }, { 170, "AT&T", NULL }, @@ -475,7 +479,7 @@ { 270, "T-Mobile", NULL }, { 280, "T-Mobile", NULL }, { 290, "NEP Wireless", NULL }, - { 300, "iSmartUS", NULL }, + { 300, "BigSkyUS", NULL }, { 310, "T-Mobile", NULL }, { 311, "FARMERS", NULL }, { 320, "Cell", NULL }, @@ -507,6 +511,7 @@ { 690, "IMMIX", NULL }, { 700, "USA BIGFOOT", NULL }, { 710, "USA ASTAC", NULL }, + { 730, "U.S.Cellular", NULL }, { 740, "Telemetrix", NULL }, { 760, "PTSI", NULL }, { 770, "IWS", NULL }, @@ -560,9 +565,10 @@ { 11, "Blue Sky", NULL }, }; -const TOperator operators_334[2] = { // MEX +const TOperator operators_334[3] = { // MEX { 3, "movistar", NULL }, { 20, "TELCEL GSM", NULL }, + { 50, "Iusacell GSM", NULL }, }; const TOperator operators_338[4] = { // JAM @@ -1085,7 +1091,7 @@ }; const TOperator operators_437[3] = { // KGZ - { 1, "BITEL", NULL }, + { 1, "Beeline KG", NULL }, { 5, "MEGACOM", NULL }, { 9, "O!", NULL }, }; @@ -1180,7 +1186,7 @@ { 2, "AKTEL", NULL }, { 3, "Banglalink", NULL }, { 4, "BGD bMobile", NULL }, - { 7, "WARID BD", NULL }, + { 7, "Airtel", NULL }, }; const TOperator operators_472[2] = { // MDV @@ -1269,8 +1275,9 @@ { 88, "Digicel", NULL }, }; -const TOperator operators_540[1] = { // SLB +const TOperator operators_540[2] = { // SLB { 1, "SI BREEZE", NULL }, + { 2, "SIS", NULL }, }; const TOperator operators_541[2] = { // VUT @@ -1349,13 +1356,15 @@ { 4, "QCell", NULL }, }; -const TOperator operators_608[2] = { // SEN +const TOperator operators_608[3] = { // SEN { 1, "ALIZE", NULL }, { 2, "SENTEL", NULL }, + { 3, "SEN expresso", NULL }, }; -const TOperator operators_609[1] = { // MRT +const TOperator operators_609[2] = { // MRT { 1, "MR MATTEL", NULL }, + { 2, "MR Expresso", NULL }, }; const TOperator operators_610[2] = { // MLI @@ -1469,8 +1478,9 @@ { 3, "Zain GA", NULL }, }; -const TOperator operators_629[3] = { // COG +const TOperator operators_629[4] = { // COG { 1, "CELTEL RC", NULL }, + { 2, "AZUR COG", NULL }, { 7, "WARID RC", NULL }, { 10, "COG MTN", NULL }, }; @@ -1663,7 +1673,7 @@ const TOperator operators_714[3] = { // PAN { 1, "PANCW", NULL }, { 3, "CLARO PA", NULL }, - { 20, "movistar", NULL }, + { 20, "Movistar", NULL }, }; const TOperator operators_716[3] = { // PER @@ -1672,10 +1682,11 @@ { 17, "PERN3", NULL }, }; -const TOperator operators_722[4] = { // ARG - { 7, "movistar", NULL }, +const TOperator operators_722[5] = { // ARG + { 7, "Movistar", NULL }, { 34, "PERSONAL", NULL }, { 35, "PORT-HABLE", NULL }, + { 36, "AR PERSONAL", NULL }, { 310, "CLARO AR", NULL }, }; @@ -1699,7 +1710,7 @@ const TOperator operators_730[4] = { // CHL { 1, "ENTEL PCS", NULL }, - { 2, "movistar", NULL }, + { 2, "Movistar", NULL }, { 3, "CLARO CHL", NULL }, { 10, "ENTEL PCS", NULL }, }; @@ -1708,7 +1719,7 @@ { 101, "COMCEL", NULL }, { 103, "TIGO COL", NULL }, { 111, "TIGO COL", NULL }, - { 123, "movistar", NULL }, + { 123, "Movistar", NULL }, }; const TOperator operators_734[5] = { // VEN @@ -1731,7 +1742,7 @@ }; const TOperator operators_740[2] = { // ECU - { 0, "movistar", NULL }, + { 0, "Movistar", NULL }, { 1, "PORTA GSM", NULL }, }; @@ -1749,7 +1760,7 @@ }; const TOperator operators_748[2] = { // URY - { 7, "MOVISTAR", NULL }, + { 7, "Movistar", NULL }, { 10, "CLARO UY", NULL }, }; @@ -1782,7 +1793,7 @@ { 204, "NLD", 5, operators_204 }, { 206, "BEL", 3, operators_206 }, { 208, "FRA", 6, operators_208 }, - { 212, "MCO", 1, operators_212 }, + { 212, "MCO", 2, operators_212 }, { 213, "AND", 1, operators_213 }, { 214, "ESP", 5, operators_214 }, { 216, "HU", 3, operators_216 }, @@ -1813,7 +1824,7 @@ { 268, "PRT", 3, operators_268 }, { 270, "LUX", 3, operators_270 }, { 272, "IRL", 4, operators_272 }, - { 274, "ISL", 6, operators_274 }, + { 274, "ISL", 7, operators_274 }, { 276, "ALB", 4, operators_276 }, { 278, "MLT", 3, operators_278 }, { 280, "CYP", 2, operators_280 }, @@ -1827,9 +1838,9 @@ { 293, "SVN", 4, operators_293 }, { 294, "MKD", 3, operators_294 }, { 295, "LIE", 4, operators_295 }, - { 302, "CAN", 9, operators_302 }, + { 302, "CAN", 10, operators_302 }, { 308, "SPM", 2, operators_308 }, - { 310, "USA", 79, operators_310 }, + { 310, "USA", 81, operators_310 }, { 311, "USA", 25, operators_311 }, { 312, "USA", 0, NULL }, { 313, "USA", 0, NULL }, @@ -1838,7 +1849,7 @@ { 316, "USA", 0, NULL }, { 330, "PRI", 1, operators_330 }, { 332, "USA", 1, operators_332 }, - { 334, "MEX", 2, operators_334 }, + { 334, "MEX", 3, operators_334 }, { 338, "JAM", 4, operators_338 }, { 340, "FRA", 5, operators_340 }, { 342, "BRB", 4, operators_342 }, @@ -1912,7 +1923,7 @@ { 530, "NZL", 4, operators_530 }, { 537, "PNG", 2, operators_537 }, { 539, "TON", 2, operators_539 }, - { 540, "SLB", 1, operators_540 }, + { 540, "SLB", 2, operators_540 }, { 541, "VUT", 2, operators_541 }, { 542, "FJI", 1, operators_542 }, { 544, "AS", 1, operators_544 }, @@ -1929,8 +1940,8 @@ { 605, "TUN", 3, operators_605 }, { 606, "LBY", 2, operators_606 }, { 607, "GMB", 4, operators_607 }, - { 608, "SEN", 2, operators_608 }, - { 609, "MRT", 1, operators_609 }, + { 608, "SEN", 3, operators_608 }, + { 609, "MRT", 2, operators_609 }, { 610, "MLI", 2, operators_610 }, { 611, "GIN", 4, operators_611 }, { 612, "CIV", 5, operators_612 }, @@ -1950,7 +1961,7 @@ { 626, "STP", 1, operators_626 }, { 627, "GNQ", 2, operators_627 }, { 628, "GAB", 3, operators_628 }, - { 629, "COG", 3, operators_629 }, + { 629, "COG", 4, operators_629 }, { 630, "COD", 6, operators_630 }, { 631, "AGO", 1, operators_631 }, { 632, "GNB", 3, operators_632 }, @@ -1984,7 +1995,7 @@ { 712, "CRI", 3, operators_712 }, { 714, "PAN", 3, operators_714 }, { 716, "PER", 3, operators_716 }, - { 722, "ARG", 4, operators_722 }, + { 722, "ARG", 5, operators_722 }, { 724, "BRA", 15, operators_724 }, { 730, "CHL", 4, operators_730 }, { 732, "COL", 4, operators_732 }, diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmbroadmesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmbroadmesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmbroadmesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 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" @@ -11,7 +11,7 @@ * * Contributors: * -* Description: +* Description: * */ @@ -70,7 +70,7 @@ CMmBroadMessHandler::CMmBroadMessHandler() { TFLOGSTRING("TSY: CMmBroadMessHandler::CMmBroadMessHandler"); -OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_CMMBROADMESSHANDLER, "CMmBroadMessHandler::CMmBroadMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_CMMBROADMESSHANDLER_TD, "CMmBroadMessHandler::CMmBroadMessHandler" ); } // ----------------------------------------------------------------------------- @@ -81,7 +81,7 @@ void CMmBroadMessHandler::ConstructL() { TFLOGSTRING("TSY: CMmBroadMessHandler::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_CONSTRUCTL, "CMmBroadMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_CONSTRUCTL_TD, "CMmBroadMessHandler::ConstructL" ); // Initialise the array. Maximun of pages in a WCDMA CBS message is 15 iCbsMsg = new( ELeave ) CArrayPtrFlat< TWcdmaCbsMsg >( 10 ); @@ -103,7 +103,7 @@ ) { TFLOGSTRING("TSY: CMmBroadMessHandler::NewL"); -OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_NEWL, "CMmBroadMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_NEWL_TD, "CMmBroadMessHandler::NewL" ); CMmBroadMessHandler* mmBroadMessHandler = new( ELeave ) CMmBroadMessHandler(); @@ -134,7 +134,7 @@ CMmBroadMessHandler::~CMmBroadMessHandler() { TFLOGSTRING("TSY: CMmBroadMessHandler::~CMmBroadMessHandler"); -OstTrace0( TRACE_NORMAL, DUP1_CMMBROADMESSHANDLER_CMMBROADMESSHANDLER, "CMmBroadMessHandler::~CMmBroadMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMBROADMESSHANDLER_CMMBROADMESSHANDLER_TD, "CMmBroadMessHandler::~CMmBroadMessHandler" ); if ( iCbsMsg ) { iCbsMsg->ResetAndDestroy(); @@ -153,14 +153,14 @@ TUint8 messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); TFLOGSTRING3("TSY: CMmBroadMessHandler::ReceiveMessageL. Resource:%d, MsgId:%d", resource,messageId); -OstTraceExt2( TRACE_NORMAL, CMMBROADMESSHANDLER_RECEIVEMESSAGEL, "CMmBroadMessHandler::ReceiveMessageL;resource=%hhd;messageId=%hhx", resource, messageId ); +OstTraceExt2( TRACE_NORMAL, CMMBROADMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmBroadMessHandler::ReceiveMessageL;resource=%hhd;messageId=%hhx", resource, messageId ); switch ( resource ) { case PN_SMS: { TFLOGSTRING("TSY: CMmBroadMessHandler::ReceiveMessageL - PN_SMS"); -OstTrace0( TRACE_NORMAL, DUP1_CMMBROADMESSHANDLER_RECEIVEMESSAGEL, "CMmBroadMessHandler::ReceiveMessageL - PN_SMS" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMBROADMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmBroadMessHandler::ReceiveMessageL - PN_SMS" ); switch( messageId ) { @@ -177,7 +177,7 @@ default: { TFLOGSTRING("TSY: CMmBroadMessHandler::ReceiveMessageL - PN_SMS - default"); -OstTrace0( TRACE_NORMAL, DUP3_CMMBROADMESSHANDLER_RECEIVEMESSAGEL, "CMmBroadMessHandler::ReceiveMessageL - PN_SMS - default" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMBROADMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmBroadMessHandler::ReceiveMessageL - PN_SMS - default" ); // No appropriate handler methods for ISI-message found. break; } @@ -187,7 +187,7 @@ default: { TFLOGSTRING("TSY: CMmBroadMessHandler::ReceiveMessageL. Switch resource case default"); -OstTrace0( TRACE_NORMAL, DUP2_CMMBROADMESSHANDLER_RECEIVEMESSAGEL, "CMmBroadMessHandler::ReceiveMessageL. Switch resource case default" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMBROADMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmBroadMessHandler::ReceiveMessageL. Switch resource case default" ); // No appropriate handler methods for ISI-message found. break; } @@ -208,7 +208,7 @@ ) { TFLOGSTRING("TSY: CMmBroadMessHandler::SmsCbRoutingRequest"); -OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_SMSCBROUTINGREQUEST, "CMmBroadMessHandler::SmsCbRoutingRequest" ); +OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_SMSCBROUTINGREQUEST_TD, "CMmBroadMessHandler::SmsCbRoutingRequest" ); // Variable for the routing command initialized TUint8 routingCommand( 0 ); @@ -221,14 +221,14 @@ { // Release routing TFLOGSTRING("TSY:CMmBroadMessHandler::SmsCbRoutingRequest:CB routing will be released."); -OstTrace0( TRACE_NORMAL, DUP1_CMMBROADMESSHANDLER_SMSCBROUTINGREQUEST, "CMmBroadMessHandler::SmsCbRoutingRequest:CB routing will be released." ); +OstTrace0( TRACE_NORMAL, DUP1_CMMBROADMESSHANDLER_SMSCBROUTINGREQUEST_TD, "CMmBroadMessHandler::SmsCbRoutingRequest:CB routing will be released." ); routingCommand = SMS_ROUTING_RELEASE; } else if ( RMobileBroadcastMessaging::EBroadcastAcceptAll == data.iSetting ) { // Activate routing TFLOGSTRING("TSY:CMmBroadMessHandler::SmsCbRoutingRequest:CB routing will be activated."); -OstTrace0( TRACE_NORMAL, DUP2_CMMBROADMESSHANDLER_SMSCBROUTINGREQUEST, "CMmBroadMessHandler::SmsCbRoutingRequest:CB routing will be activated." ); +OstTrace0( TRACE_NORMAL, DUP2_CMMBROADMESSHANDLER_SMSCBROUTINGREQUEST_TD, "CMmBroadMessHandler::SmsCbRoutingRequest:CB routing will be activated." ); routingCommand = SMS_ROUTING_SET; } else @@ -238,7 +238,7 @@ // compiler is not in use. #ifdef OST_TRACE_COMPILER_IN_USE TUint tempValue = data.iSetting; // Parameter just for tracing -OstTraceExt1( TRACE_NORMAL, DUP3_CMMBROADMESSHANDLER_SMSCBROUTINGREQUEST, "CMmBroadMessHandler::SmsCbRoutingRequest;data.iSetting=%hhx", tempValue ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMBROADMESSHANDLER_SMSCBROUTINGREQUEST_TD, "CMmBroadMessHandler::SmsCbRoutingRequest;data.iSetting=%hhx", tempValue ); #endif // OST_TRACE_COMPILER_IN_USE return KErrArgument; } @@ -282,47 +282,51 @@ const TIsiReceiveC& aSmsCbRoutingResp // Received isimsg ) { -TFLOGSTRING("TSY: CMmBroadMessHandler::SmsCbRoutingResp"); -OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_SMSGSMCBROUTINGRESP, "CMmBroadMessHandler::SmsCbRoutingResp" ); TInt ipc( 0 ); // Initialize to zero - iCbSubscriptionNumber = aSmsCbRoutingResp.Get8bit( - ISI_HEADER_SIZE + SMS_CB_ROUTING_RESP_OFFSET_SUBSCRIPTIONNUMBER ); - - TUint8 isiCause( aSmsCbRoutingResp.Get8bit( ISI_HEADER_SIZE - + SMS_CB_ROUTING_RESP_OFFSET_SMSCAUSE ) ); - - TInt cause( CMmStaticUtility::CSCauseToEpocError( - PN_SMS, - SMS_CAUSE_TYPE_COMMON, - isiCause ) ); - TUint8 traid( aSmsCbRoutingResp.Get8bit( ISI_HEADER_SIZE + SMS_CB_ROUTING_RESP_OFFSET_TRANSID ) ); - // Response for SmsGsmCbRoutingReq (receive message) - if ( EBroadcastMessagingReceiveMessage == traid ) - { - ipc = EMobileBroadcastMessagingReceiveMessage; - } - // Response for SmsGsmCbRoutingReq (receive message cancel) - else if ( EBroadcastMessagingReceiveMessageCancel == traid ) + if( EBroadcastMessagingReceiveMessage == traid || + EBroadcastMessagingReceiveMessageCancel == traid || + EBroadcastMessagingSetFilterSetting == traid ) { - ipc = EMobileBroadcastMessagingReceiveMessageCancel; - } - // Response for SmsGsmCbRoutingReq (set filter setting) - else if ( EBroadcastMessagingSetFilterSetting == traid ) - { - ipc = EMobileBroadcastMessagingSetFilterSetting; - } +TFLOGSTRING("TSY: CMmBroadMessHandler::SmsCbRoutingResp"); +OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_SMSGSMCBROUTINGRESP_TD, "CMmBroadMessHandler::SmsCbRoutingResp" ); + + iCbSubscriptionNumber = aSmsCbRoutingResp.Get8bit( + ISI_HEADER_SIZE + SMS_CB_ROUTING_RESP_OFFSET_SUBSCRIPTIONNUMBER ); + + TUint8 isiCause( aSmsCbRoutingResp.Get8bit( ISI_HEADER_SIZE + + SMS_CB_ROUTING_RESP_OFFSET_SMSCAUSE ) ); + + TInt cause( CMmStaticUtility::CSCauseToEpocError( + PN_SMS, + SMS_CAUSE_TYPE_COMMON, + isiCause ) ); - // Complete status change indication, if ipc is set - if ( 0 != ipc ) - { - iMessageRouter->Complete( ipc, cause ); - } + // Response for SmsGsmCbRoutingReq (receive message) + if ( EBroadcastMessagingReceiveMessage == traid ) + { + ipc = EMobileBroadcastMessagingReceiveMessage; + } + // Response for SmsGsmCbRoutingReq (receive message cancel) + else if ( EBroadcastMessagingReceiveMessageCancel == traid ) + { + ipc = EMobileBroadcastMessagingReceiveMessageCancel; + } + // Response for SmsGsmCbRoutingReq (set filter setting) + else if ( EBroadcastMessagingSetFilterSetting == traid ) + { + ipc = EMobileBroadcastMessagingSetFilterSetting; + } - return; + // Complete status change indication, if ipc is set + if ( 0 != ipc ) + { + iMessageRouter->Complete( ipc, cause ); + } + } } // ----------------------------------------------------------------------------- @@ -338,7 +342,7 @@ ) { TFLOGSTRING("TSY: CMmBroadMessHandler::SmsCbRoutingInd"); -OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_SMSGSMCBROUTINGNTFL, "CMmBroadMessHandler::SmsCbRoutingIndL" ); +OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_SMSGSMCBROUTINGNTFL_TD, "CMmBroadMessHandler::SmsCbRoutingIndL" ); CMmDataPackage data; TInt error ( KErrNone ); @@ -364,7 +368,7 @@ } TFLOGSTRING2("TSY: CMmBroadMessHandler::SmsCbRoutingIndL. infoLength:%d",infoLength); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMBROADMESSHANDLER_SMSGSMCBROUTINGNTFL, "CMmBroadMessHandler::SmsCbRoutingIndL;infoLength=%hhu", infoLength ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMBROADMESSHANDLER_SMSGSMCBROUTINGNTFL_TD, "CMmBroadMessHandler::SmsCbRoutingIndL;infoLength=%hhu", infoLength ); // Reset and destroy the array iCbsMsg->ResetAndDestroy(); @@ -419,9 +423,13 @@ else if ( ( SMS_CB_MESSAGE_CONTENT_SIZE >= infoLength ) && ( KWcdmaCbsNumberOfSbMax >= sbNumber ) ) { - TUint currSbOffset( firstSbOffset ); - // Loop through the SMS_SB_CB_MESSAGE sub blocks. - for ( TInt i( 0 ); i < sbNumber; i++) + TUint currSbOffset( ISI_HEADER_SIZE + SIZE_SMS_CB_ROUTING_IND ); + // Search all SMS_SB_CB_MESSAGE subblocks + while ( KErrNone == aSmsCbRoutingInd.FindSubBlockOffsetById( + currSbOffset, + SMS_SB_CB_MESSAGE, + EIsiSubBlockTypeId16Len16, + currSbOffset ) ) { TWcdmaCbsMsg* wcdmaCbsMsg = new ( ELeave ) TWcdmaCbsMsg; CleanupStack::PushL( wcdmaCbsMsg ); @@ -475,7 +483,6 @@ //the following command //lint -e429 } - // Pack data data.PackData( &iCbsMsg, &sbNumber ); @@ -488,7 +495,7 @@ else // Illegal value ( e.g network is not working correctly ) { TFLOGSTRING("TSY: CMmBroadMessHandler::SmsGsmCbRoutingNtfL illegal value (e.g network problem )"); -OstTrace0( TRACE_NORMAL, DUP2_CMMBROADMESSHANDLER_SMSGSMCBROUTINGNTFL, "CMmBroadMessHandler::SmsGsmCbRoutingNtfL-illegal value (e.g network problem" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMBROADMESSHANDLER_SMSGSMCBROUTINGNTFL_TD, "CMmBroadMessHandler::SmsGsmCbRoutingNtfL-illegal value (e.g network problem" ); error = KErrGeneral; // Complete. We could complete with either ipc @@ -515,7 +522,7 @@ ) { TFLOGSTRING("TSY: CMmBroadMessHandler::ExtFuncL"); -OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_EXTFUNCL, "CMmBroadMessHandler::ExtFuncL" ); +OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_EXTFUNCL_TD, "CMmBroadMessHandler::ExtFuncL" ); TInt ret( KErrNone ); TUint8 transId( 0 ); // Initialize to zero @@ -541,7 +548,7 @@ { // This method should only be called for Broadcast cases TFLOGSTRING2("TSY: CMmBroadMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP1_CMMBROADMESSHANDLER_EXTFUNCL, "CMmBroadMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP1_CMMBROADMESSHANDLER_EXTFUNCL_TD, "CMmBroadMessHandler::ExtFuncL;aIpc=%d", aIpc ); ret = KErrArgument; break; } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmcallmesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmcallmesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmcallmesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -86,7 +86,7 @@ // Second PEP const TUint8 KSecondPepDevice = PN_DEV_MODEM; // Device Id of second PEP const TUint8 KSecondPepObject = PN_OBJ_CSD_SRV; // Object Id of second PEP -const TUint8 KSecondPepType = PN_PEP_TYPE_GPRS; // Second PEP type +const TUint8 KSecondPepType = PN_PEP_TYPE_COMMON; // Second PEP type const TUint8 KPipeTransID = EIscNokiaDataport1; @@ -131,7 +131,7 @@ iCallMsgHandler( aCallMsgHandler ) { TFLOGSTRING("TSY: CEmergencyTimer::CEmergencyTimer"); -OstTrace0( TRACE_NORMAL, CEMERGENCYTIMER_CEMERGENCYTIMER, "CEmergencyTimer::CEmergencyTimer" ); +OstTrace0( TRACE_NORMAL, CEMERGENCYTIMER_CEMERGENCYTIMER_TD, "CEmergencyTimer::CEmergencyTimer" ); } // ----------------------------------------------------------------------------- @@ -142,7 +142,7 @@ CEmergencyTimer::~CEmergencyTimer() { TFLOGSTRING("TSY: CEmergencyTimer::~CEmergencyTimer"); -OstTrace0( TRACE_NORMAL, DUP1_CEMERGENCYTIMER_CEMERGENCYTIMER, "CEmergencyTimer::~CEmergencyTimer" ); +OstTrace0( TRACE_NORMAL, DUP1_CEMERGENCYTIMER_CEMERGENCYTIMER_TD, "CEmergencyTimer::~CEmergencyTimer" ); Cancel(); } @@ -154,7 +154,7 @@ void CEmergencyTimer::ConstructL() { TFLOGSTRING("TSY: CEmergencyTimer::ConstructL"); -OstTrace0( TRACE_NORMAL, CEMERGENCYTIMER_CONSTRUCTL, "CEmergencyTimer::ConstructL" ); +OstTrace0( TRACE_NORMAL, CEMERGENCYTIMER_CONSTRUCTL_TD, "CEmergencyTimer::ConstructL" ); CTimer::ConstructL(); // Must be called CActiveScheduler::Add( this ); } @@ -167,7 +167,7 @@ void CEmergencyTimer::RunL() { TFLOGSTRING("TSY: CEmergencyTimer::RunL - TIMER ELAPSED"); -OstTrace0( TRACE_NORMAL, CEMERGENCYTIMER_RUNL, "CEmergencyTimer::RunL" ); +OstTrace0( TRACE_NORMAL, CEMERGENCYTIMER_RUNL_TD, "CEmergencyTimer::RunL" ); iCallMsgHandler.GpdsContextsClearResp(); } @@ -179,7 +179,7 @@ void CEmergencyTimer::StartEmergencyTimer() { TFLOGSTRING("TSY: CEmergencyTimer::StartEmergencyTimer"); -OstTrace0( TRACE_NORMAL, CEMERGENCYTIMER_STARTEMERGENCYTIMER, "CEmergencyTimer::StartEmergencyTimer" ); +OstTrace0( TRACE_NORMAL, CEMERGENCYTIMER_STARTEMERGENCYTIMER_TD, "CEmergencyTimer::StartEmergencyTimer" ); Cancel(); After( KEmergencyTimerInterval ); // 5 seconds } @@ -192,7 +192,7 @@ void CEmergencyTimer::StopEmergencyTimer() { TFLOGSTRING("TSY: CEmergencyTimer::StopEmergencyTimer"); -OstTrace0( TRACE_NORMAL, CEMERGENCYTIMER_STOPEMERGENCYTIMER, "CEmergencyTimer::StopEmergencyTimer" ); +OstTrace0( TRACE_NORMAL, CEMERGENCYTIMER_STOPEMERGENCYTIMER_TD, "CEmergencyTimer::StopEmergencyTimer" ); Cancel(); } @@ -208,7 +208,7 @@ CMmCallMessHandler::CMmCallMessHandler() : iEmergencyTimer( *this ) { TFLOGSTRING("TSY: CEmergencyTimer::CMmCallMessHandler"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CMMCALLMESSHANDLER, "CMmCallMessHandler::CMmCallMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CMMCALLMESSHANDLER_TD, "CMmCallMessHandler::CMmCallMessHandler" ); } // ----------------------------------------------------------------------------- @@ -219,7 +219,7 @@ void CMmCallMessHandler::ConstructL() { TFLOGSTRING("TSY: CMmCallMessHandler::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CONSTRUCTL, "CMmCallMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CONSTRUCTL_TD, "CMmCallMessHandler::ConstructL" ); iSubAddress.Zero(); iBearer.Zero(); @@ -262,7 +262,7 @@ CMmMessageRouter* aMessageRouter ) { TFLOGSTRING("TSY: CMmCallMessHandler::NewL"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_NEWL, "CMmCallMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_NEWL_TD, "CMmCallMessHandler::NewL" ); CMmCallMessHandler* callMessHandler = new( ELeave ) CMmCallMessHandler(); @@ -287,6 +287,7 @@ aPhoNetReceiver->RegisterL( callMessHandler, PN_CSD ); aPhoNetReceiver->RegisterL( callMessHandler, PN_PIPE, PNS_PIPE_CREATE_RESP ); + aPhoNetReceiver->RegisterL( callMessHandler, PN_PIPE, PNS_PIPE_ENABLE_RESP ); callMessHandler->iDtmfMessHandler = aDtmfMessHandler; CleanupStack::Pop( callMessHandler ); @@ -302,7 +303,7 @@ CMmCallMessHandler::~CMmCallMessHandler() { TFLOGSTRING("TSY: CMmCallMessHandler::~CMmCallMessHandler"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CMMCALLMESSHANDLER, "CMmCallMessHandler::~CMmCallMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CMMCALLMESSHANDLER_TD, "CMmCallMessHandler::~CMmCallMessHandler" ); if ( KInvalidPipeHandle != iPipeHandle ) { @@ -332,7 +333,7 @@ TInt messageId(aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID )); TFLOGSTRING3("TSY: CMmCallMessHandler::ReceiveMessageL. Resource:%d. MsgId:%d", resource, messageId); -OstTraceExt2( TRACE_NORMAL, CMMCALLMESSHANDLER_RECEIVEMESSAGEL, "CMmCallMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); +OstTraceExt2( TRACE_NORMAL, CMMCALLMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCallMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); // Switch according to the resource switch ( resource ) @@ -372,7 +373,7 @@ ISI_HEADER_OFFSET_TRANSID ) ); TFLOGSTRING2("TSY: CMmCallMessHandler::ReceiveMessageL. CALL_MODEM_PROPERTY_SET_RESP. transactId:%d",transactId); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_RECEIVEMESSAGEL, "CMmCallMessHandler::ReceiveMessageL. CALL_MODEM_PROPERTY_SET_RESP. transactId=%hhu", transactId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCallMessHandler::ReceiveMessageL. CALL_MODEM_PROPERTY_SET_RESP. transactId=%hhu", transactId ); if ( KCallTransId == transactId ) { @@ -420,7 +421,7 @@ // Needed because call server messages are also handled // by DTMF and conference call message handlers TFLOGSTRING("TSY: CMmCallMessHandler::ReceiveMessageL, switch resource - case PN_MODEM_CALL, switch messageId - default.\n" ); -OstTrace0( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_RECEIVEMESSAGEL, "CMmCallMessHandler::ReceiveMessageL, switch resource - case PN_MODEM_CALL, switch messageId - default.\n" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCallMessHandler::ReceiveMessageL, switch resource - case PN_MODEM_CALL, switch messageId - default.\n" ); break; } } @@ -477,7 +478,7 @@ default: { TFLOGSTRING("TSY: CMmCallMessHandler::ReceiveMessageL, switch resource - case PN_CSD, switch messageId - default.\n" ); -OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_RECEIVEMESSAGEL, "CMmCallMessHandler::ReceiveMessageL, switch resource - case PN_CSD, switch messageId - default." ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCallMessHandler::ReceiveMessageL, switch resource - case PN_CSD, switch messageId - default." ); break; } } @@ -493,10 +494,15 @@ PnsPipeCreateResp( aIsiMessage ); break; } + case PNS_PIPE_ENABLE_RESP: + { + PnsPipeEnableResp( aIsiMessage ); + break; + } default: { TFLOGSTRING("TSY: CMmCallMessHandler::ReceiveMessageL, switch resource - case PN_PIPE, switch messageId - default.\n" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_RECEIVEMESSAGEL, "CMmCallMessHandler::ReceiveMessageL, switch resource - case PN_PIPE, switch messageId - default.\n" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCallMessHandler::ReceiveMessageL, switch resource - case PN_PIPE, switch messageId - default.\n" ); break; } } @@ -505,7 +511,7 @@ default: { TFLOGSTRING("TSY: CMmCallMessHandler::ReceiveMessageL, switch resource - default.\n" ); -OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_RECEIVEMESSAGEL, "CMmCallMessHandler::ReceiveMessageL, switch resource - default.\n" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCallMessHandler::ReceiveMessageL, switch resource - default.\n" ); break; } } @@ -522,7 +528,7 @@ const CMmDataPackage* aDataPackage ) { TFLOGSTRING2("TSY: CMmCallMessHandler::ExtFuncL - aIpc: %d", aIpc ); -OstTrace1( TRACE_NORMAL, CMMCALLMESSHANDLER_EXTFUNCL, "CMmCallMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMCALLMESSHANDLER_EXTFUNCL_TD, "CMmCallMessHandler::ExtFuncL;aIpc=%d", aIpc ); TInt ret( KErrNone ); TUint8 messageId( 0 ); @@ -550,7 +556,7 @@ { callData->GetCallIdAndMode( callId, callMode ); TFLOGSTRING2("TSY: CMmCallMessHandler::ExtFuncL. CallMode:%d", callMode ); -OstTrace1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_EXTFUNCL, "CMmCallMessHandler::ExtFuncL;callMode=%d", callMode ); +OstTrace1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_EXTFUNCL_TD, "CMmCallMessHandler::ExtFuncL;callMode=%d", callMode ); } if ( KSymbianCallIdNone == callId ) @@ -576,7 +582,7 @@ { aDataPackage->UnPackData( iTelEmergNumber ); TFLOGSTRING2("TSY: CMmCallMessHandler::ExtFuncL - emergency dial number is %S", &iTelEmergNumber); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_EXTFUNCL, "CMmCallMessHandler::ExtFuncL - emergency dial number is=%S", iTelEmergNumber ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_EXTFUNCL_TD, "CMmCallMessHandler::ExtFuncL - emergency dial number is=%S", iTelEmergNumber ); #ifdef NCP_COMMON_HSDPA_EMERGCALL_WORKAROUND if ( iHSDPADisabledInPp ) { @@ -598,7 +604,7 @@ // Destroy all data connections before attempting emergency // call. The call will be set up in GpdsContextsClearResp. TFLOGSTRING( "TSY: CMmCallMessHandler::ExtFuncL - HSDPA workaround. Emergency call delayed, data connections have to be closed first." ); -OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_EXTFUNCL, "CMmCallMessHandler::ExtFuncL - HSDPA workaround. Emergency call delayed, data connections have to be closed first." ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_EXTFUNCL_TD, "CMmCallMessHandler::ExtFuncL - HSDPA workaround. Emergency call delayed, data connections have to be closed first." ); iEmergCallDelayed = ETrue; GpdsContextsClearReq(); } @@ -661,7 +667,7 @@ recentCallParams.ExtensionId() ) { TFLOGSTRING("TSY: CMmCallMessHandler::ExtFuncL - Custom API call params in use "); -OstTrace0( TRACE_NORMAL, DUP7_CMMCALLMESSHANDLER_EXTFUNCL, "CMmCallMessHandler::ExtFuncL - Custom API call params in use" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMCALLMESSHANDLER_EXTFUNCL_TD, "CMmCallMessHandler::ExtFuncL - Custom API call params in use" ); // Unpack custom call parameters RMmCustomAPI::TCustomCallParamsPckg* customparamsPckgV1( @@ -677,7 +683,7 @@ else if ( RMobileCall::KETelMobileCallParamsV7 == recentCallParams.ExtensionId() ) { TFLOGSTRING("TSY: CMmCallMessHandler::ExtFuncL - V7 call params in use "); -OstTrace0( TRACE_NORMAL, DUP8_CMMCALLMESSHANDLER_EXTFUNCL, "CMmCallMessHandler::ExtFuncL - V7 call params in use" ); +OstTrace0( TRACE_NORMAL, DUP8_CMMCALLMESSHANDLER_EXTFUNCL_TD, "CMmCallMessHandler::ExtFuncL - V7 call params in use" ); RMobileCall::TMobileCallParamsV7Pckg* paramsPckgV7( reinterpret_cast @@ -694,13 +700,13 @@ if ( RMobileCall::EOriginatorSIM == recentCallParamsV7.iCallParamOrigin ) { TFLOGSTRING("TSY: CMmCallMessHandler::ExtFuncL - iNoFdnCheck = ETrue"); -OstTrace0( TRACE_NORMAL, DUP9_CMMCALLMESSHANDLER_EXTFUNCL, "CMmCallMessHandler::ExtFuncL - iNoFdnCheck = ETrue" ); +OstTrace0( TRACE_NORMAL, DUP9_CMMCALLMESSHANDLER_EXTFUNCL_TD, "CMmCallMessHandler::ExtFuncL - iNoFdnCheck = ETrue" ); iNoFdnCheck = ETrue; } else { TFLOGSTRING("TSY: CMmCallMessHandler::ExtFuncL - iNoFdnCheck = EFalse"); -OstTrace0( TRACE_NORMAL, DUP10_CMMCALLMESSHANDLER_EXTFUNCL, "CMmCallMessHandler::ExtFuncL - iNoFdnCheck = EFalse" ); +OstTrace0( TRACE_NORMAL, DUP10_CMMCALLMESSHANDLER_EXTFUNCL_TD, "CMmCallMessHandler::ExtFuncL - iNoFdnCheck = EFalse" ); iNoFdnCheck = EFalse; } } @@ -712,7 +718,7 @@ } TFLOGSTRING2("TSY: CMmCallMessHandler::ExtFuncL - Cug explicit invoked: %d", recentCallParams.iCug.iExplicitInvoke ); -OstTrace1( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_EXTFUNCL, "CMmCallMessHandler::ExtFuncL - Cug explicit invoked: %d", recentCallParams.iCug.iExplicitInvoke ); +OstTrace1( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_EXTFUNCL_TD, "CMmCallMessHandler::ExtFuncL - Cug explicit invoked: %d", recentCallParams.iCug.iExplicitInvoke ); // if CUG is explicitly invoked by // the other entries in this structure will be filled in // function CallPropertySetReq. @@ -727,12 +733,9 @@ } else { - // RMobileCall::TMobileCallParamsV1Pckg* callParams( NULL ); - // RMobileCall::TMobileCallInfoV1* callInfo( NULL ); - // aDataPackage->UnPackData( &callParams, &callInfo ); iTelNumber = callInfo->iDialledParty.iTelNumber; TFLOGSTRING2("TSY: CMmCallMessHandlerExtFuncL - iTelNumber: %S", &iTelNumber); -OstTraceExt1( TRACE_NORMAL, DUP6_CMMCALLMESSHANDLER_EXTFUNCL, "CMmCallMessHandler::ExtFuncL - iTelNumber=%s", iTelNumber ); +OstTraceExt1( TRACE_NORMAL, DUP6_CMMCALLMESSHANDLER_EXTFUNCL_TD, "CMmCallMessHandler::ExtFuncL - iTelNumber=%s", iTelNumber ); iIdRestrict = recentCallParams.iIdRestrict; CallCreateReq(); @@ -854,7 +857,7 @@ case ESatNotifySetUpCallPCmd: { TFLOGSTRING("TSY: CMmCallMessHandler::ExtFuncL - ESatNotifySetUpCallPCmd"); -OstTrace0( TRACE_NORMAL, DUP11_CMMCALLMESSHANDLER_EXTFUNCL, "CMmCallMessHandler::ExtFuncL - ESatNotifySetUpCallPCmd" ); +OstTrace0( TRACE_NORMAL, DUP11_CMMCALLMESSHANDLER_EXTFUNCL_TD, "CMmCallMessHandler::ExtFuncL - ESatNotifySetUpCallPCmd" ); iResourceControlSuppress = ETrue; ret = KErrNone; break; @@ -862,7 +865,7 @@ default: { TFLOGSTRING2("TSY: CMmCallMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_EXTFUNCL, "CMmCallMessHandler::ExtFuncL; - Unknown IPC=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_EXTFUNCL_TD, "CMmCallMessHandler::ExtFuncL; - Unknown IPC=%d", aIpc ); ret = KErrNotSupported; break; } @@ -909,7 +912,7 @@ const CCallDataPackage* aDataPackage ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallPropertySetReq"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLPROPERTYSETREQ, "CMmCallMessHandler::CallPropertySetReq" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLPROPERTYSETREQ_TD, "CMmCallMessHandler::CallPropertySetReq" ); RMobileCall::TMobileCallParamsV1Pckg* callParams( NULL ); RMobileCall::TMobileCallInfoV1* callInfo( NULL ); @@ -927,7 +930,7 @@ aCallReq->Set8bit( ISI_HEADER_SIZE + CALL_MODEM_PROPERTY_SET_REQ_OFFSET_SUBBLOCKS, 2 ); TFLOGSTRING("TSY: CMmCallMessHandler::CallPropertySetReq - Call Property Info sub block "); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLPROPERTYSETREQ, "CMmCallMessHandler::CallPropertySetReq - Call Property Info sub block" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLPROPERTYSETREQ_TD, "CMmCallMessHandler::CallPropertySetReq - Call Property Info sub block" ); // Initialize message offset TInt currentMsgOffset( @@ -950,7 +953,7 @@ currentMsgOffset = currentMsgOffset + SIZE_CALL_MODEM_SB_PROPERTY_INFO; TFLOGSTRING("TSY: CMmCallMessHandler::CallPropertySetReq - Call Modem Cug Info sub block "); -OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_CALLPROPERTYSETREQ, "CMmCallMessHandler::CallPropertySetReq - Call Modem Cug Info sub block" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_CALLPROPERTYSETREQ_TD, "CMmCallMessHandler::CallPropertySetReq - Call Modem Cug Info sub block" ); // Create call GSM CUG info subblock TBuf8< SIZE_CALL_MODEM_SB_CUG_INFO > callGsmCugInfoBuf; @@ -984,7 +987,7 @@ } TFLOGSTRING("TSY: CMmCallMessHandler::CallPropertySetReq - Cug Index copy 16 to 8 "); -OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_CALLPROPERTYSETREQ, "CMmCallMessHandler::CallPropertySetReq - Cug Index copy 16 to 8" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_CALLPROPERTYSETREQ_TD, "CMmCallMessHandler::CallPropertySetReq - Cug Index copy 16 to 8" ); callGsmCugInfoBuf.Append( static_cast( cugIndex >> KShiftByOneByte ) ); callGsmCugInfoBuf.Append( static_cast( cugIndex ) ); @@ -999,7 +1002,7 @@ iTelNumber = callInfo->iDialledParty.iTelNumber; TFLOGSTRING2("TSY: CMmCallMessHandler::CallPropertySetReq - iTelNumber: %S", &iTelNumber); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_CALLPROPERTYSETREQ, "CMmCallMessHandler::CallPropertySetReq - iTelNumber=%S", iTelNumber ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_CALLPROPERTYSETREQ_TD, "CMmCallMessHandler::CallPropertySetReq - iTelNumber=%S", iTelNumber ); iIdRestrict = recentCallParams.iIdRestrict; } @@ -1016,7 +1019,7 @@ const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallPropertySetResp"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLPROPERTYSETRESP, "CMmCallMessHandler::CallPropertySetResp" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLPROPERTYSETRESP_TD, "CMmCallMessHandler::CallPropertySetResp" ); // Create call property get response // if property set request fails, complete dial @@ -1101,7 +1104,7 @@ TInt CMmCallMessHandler::CallCreateReq() { TFLOGSTRING("TSY: CMmCallMessHandler::CallCreateReq"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLCREATEREQ, "CMmCallMessHandler::CallCreateReq" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLCREATEREQ_TD, "CMmCallMessHandler::CallCreateReq" ); TIsiSend isimsg( iPhoNetSender->SendBufferDes() ); isimsg.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_MODEM_CALL ); @@ -1164,7 +1167,7 @@ const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallCreateResp"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLCREATERESP, "CMmCallMessHandler::CallCreateResp" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLCREATERESP_TD, "CMmCallMessHandler::CallCreateResp" ); TUint sbStartOffSet( 0 ); @@ -1312,7 +1315,7 @@ TIsiSend* aCallReq ) { TFLOGSTRING("TSY: CMmCallMessHandler::EmergencyCallCreateReq"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_EMERGENCYCALLCREATEREQ, "CMmCallMessHandler::EmergencyCallCreateReq" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_EMERGENCYCALLCREATEREQ_TD, "CMmCallMessHandler::EmergencyCallCreateReq" ); // (TAN) Save the call mode of the latest CALL_MODEM_CREATE_REQ. This is // used when CALL_MODEM_CREATE_RESP is received and message handler should @@ -1352,7 +1355,7 @@ TUint8 aCallStatus ) { TFLOGSTRING("TSY: CMmCallMessHandler::MapCallStatus"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_MAPCALLSTATUS, "CMmCallMessHandler::MapCallStatus" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_MAPCALLSTATUS_TD, "CMmCallMessHandler::MapCallStatus" ); RMobileCall::TMobileCallStatus symbianStatus( RMobileCall::EStatusUnknown ); @@ -1442,7 +1445,7 @@ const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallAnswerResp"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLANSWERRESP, "CMmCallMessHandler::CallAnswerResp" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLANSWERRESP_TD, "CMmCallMessHandler::CallAnswerResp" ); TUint sbStartOffSet( 0 ); @@ -1507,7 +1510,7 @@ const CCallDataPackage* aDataPackage ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallReleaseReq"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLRELEASEREQ, "CMmCallMessHandler::CallReleaseReq" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLRELEASEREQ_TD, "CMmCallMessHandler::CallReleaseReq" ); TUint8 cause( KCallCauseNoCause ); TInt symbianCauseValue( KErrNone ); @@ -1602,7 +1605,7 @@ const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallReleaseResp"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLRELEASERESP, "CMmCallMessHandler::CallReleaseResp" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLRELEASERESP_TD, "CMmCallMessHandler::CallReleaseResp" ); TUint8 causeType( 0 ); TUint8 causeValue( KCallCauseNoCause ); @@ -1662,7 +1665,7 @@ const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallReleaseInd"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLRELEASEIND, "CMmCallMessHandler::CallReleaseInd" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLRELEASEIND_TD, "CMmCallMessHandler::CallReleaseInd" ); TUint sbStartOffSet( 0 ); @@ -1711,7 +1714,7 @@ const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallTerminatedInd"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLTERMINATEDIND, "CMmCallMessHandler::CallTerminatedInd" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLTERMINATEDIND_TD, "CMmCallMessHandler::CallTerminatedInd" ); TUint sbStartOffSet( 0 ); @@ -1745,7 +1748,7 @@ sbStartOffSet ) ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallTerminatedInd, DSAC: call was rejected because of barred CS"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLTERMINATEDIND, "CMmCallMessHandler::CallTerminatedInd, DSAC: call was rejected because of barred CS" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLTERMINATEDIND_TD, "CMmCallMessHandler::CallTerminatedInd, DSAC: call was rejected because of barred CS" ); // Save error code. It is completed when CALL_STATUS_IND is received. iGsmMmCauseError = CMmStaticUtility::EpocErrorCode( KErrGeneral, KErrGsmCSConnectionBarred ); @@ -1766,7 +1769,7 @@ { TFLOGSTRING2("TSY: CMmCallMessHandler::CallControlReq. Ipc:%d",aIpc); -OstTrace1( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLCONTROLREQ, "CMmCallMessHandler::CallControlReq;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLCONTROLREQ_TD, "CMmCallMessHandler::CallControlReq;aIpc=%d", aIpc ); TUint8 operation( 0 ); @@ -1800,7 +1803,7 @@ default: { TFLOGSTRING2("TSY: CMmCallMessHandler::CallControlReq - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLCONTROLREQ, "CMmCallMessHandler::CallControlReq - Unknown aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLCONTROLREQ_TD, "CMmCallMessHandler::CallControlReq - Unknown aIpc=%d", aIpc ); break; } } @@ -1843,7 +1846,7 @@ TInt& aCurrentMsgOffset ) { TFLOGSTRING("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock" ); iDestPostAddressIncluded = EFalse; @@ -1866,7 +1869,7 @@ aNumOfSbInMsg++; TFLOGSTRING("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_SB_MODE CREATED"); - OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_SB_MODE CREATED" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_SB_MODE CREATED" ); if ( CALL_MODEM_MODE_EMERGENCY == aMode && 0 < aTelNumber.Length() ) { @@ -1900,11 +1903,33 @@ aNumOfSbInMsg++; TFLOGSTRING2("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_SB_DESTINATION_ADDRESS - Subblock Count: %d", aNumOfSbInMsg ); -OstTraceExt1( TRACE_NORMAL, DUP17_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock- CALL_MODEM_SB_DESTINATION_ADDRESS - Subblock Count=%hhu", aNumOfSbInMsg ); +OstTraceExt1( TRACE_NORMAL, DUP17_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock- CALL_MODEM_SB_DESTINATION_ADDRESS - Subblock Count=%hhu", aNumOfSbInMsg ); TFLOGSTRING2("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock - emergDestAddress: %S", &aTelNumber); -OstTraceExt1( TRACE_NORMAL, DUP18_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock;emergDestAddress=%S", aTelNumber ); - +OstTraceExt1( TRACE_NORMAL, DUP18_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock;emergDestAddress=%S", aTelNumber ); + + // Emergency number checking by Call Server is always disabled when + // call mode is set straight as emergency by the client. + TBuf8 checkInfoBuf; + + TIsiSubBlock checkInfoSb( + checkInfoBuf, + CALL_MODEM_SB_CHECK_INFO, + EIsiSubBlockTypeId8Len8 ); + + checkInfoBuf.Append( CALL_MODEM_CHK_DISABLE_EMERG ); + checkInfoBuf.Append( KCallPadding ); + + aCallIsiMsg.CopyData( + aCurrentMsgOffset, checkInfoSb.CompleteSubBlock() ); + + // Set new offset and increase subblock count + aCurrentMsgOffset = + aCurrentMsgOffset + checkInfoBuf.Length(); + aNumOfSbInMsg++; + +TFLOGSTRING2("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_SB_CHECK_INFO - Subblock Count: %d", aNumOfSbInMsg ); +OstTraceExt1( TRACE_NORMAL, DUP22_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock;aNumOfSbInMsg=%hhu", aNumOfSbInMsg ); } else if ( CALL_MODEM_MODE_EMERGENCY != aMode && 0 < aTelNumber.Length() ) @@ -1914,7 +1939,7 @@ TUint8 presentationInd( CALL_MODEM_PRESENT_DEFAULT ); TFLOGSTRING2("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock - aIdRestrict: %d", aIdRestrict); -OstTrace1( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock;aIdRestrict=%d", aIdRestrict ); +OstTrace1( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock;aIdRestrict=%d", aIdRestrict ); if ( KTelephonyNumberMaxLength < telNumLength ) { @@ -1967,13 +1992,13 @@ { presentationInd = CALL_MODEM_PRESENT_ALLOWED; TFLOGSTRING("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by PREFIX = CALL_MODEM_PRESENT_ALLOWED"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by PREFIX = CALL_MODEM_PRESENT_ALLOWED" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by PREFIX = CALL_MODEM_PRESENT_ALLOWED" ); } else if ( '#' == ( aTelNumber )[0] ) { presentationInd = CALL_MODEM_PRESENT_RESTRICTED; TFLOGSTRING("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by PREFIX = CALL_MODEM_PRESENT_RESTRICTED"); -OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by PREFIX = CALL_MODEM_PRESENT_RESTRICTED" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by PREFIX = CALL_MODEM_PRESENT_RESTRICTED" ); } } else @@ -1985,14 +2010,14 @@ { presentationInd = CALL_MODEM_PRESENT_ALLOWED; //0x01 TFLOGSTRING("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by aIdRestrict = CALL_MODEM_PRESENT_ALLOWED"); -OstTrace0( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by aIdRestrict = CALL_MODEM_PRESENT_ALLOWED" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by aIdRestrict = CALL_MODEM_PRESENT_ALLOWED" ); break; } case RMobileCall::EDontSendMyId: { presentationInd = CALL_MODEM_PRESENT_RESTRICTED; //0x02 TFLOGSTRING("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by aIdRestrict = CALL_MODEM_PRESENT_RESTRICTED"); -OstTrace0( TRACE_NORMAL, DUP6_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by aIdRestrict = CALL_MODEM_PRESENT_RESTRICTED" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by aIdRestrict = CALL_MODEM_PRESENT_RESTRICTED" ); break; } case RMobileCall::EIdRestrictDefault: @@ -2000,7 +2025,7 @@ { presentationInd = CALL_MODEM_PRESENT_DEFAULT; //0x00 TFLOGSTRING("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by aIdRestrict = CALL_MODEM_PRESENT_DEFAULT"); -OstTrace0( TRACE_NORMAL, DUP7_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by aIdRestrict = CALL_MODEM_PRESENT_DEFAULT" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock -- presentationInd by aIdRestrict = CALL_MODEM_PRESENT_DEFAULT" ); break; } } @@ -2010,7 +2035,7 @@ { TFLOGSTRING("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock -- Create line id sub block"); -OstTrace0( TRACE_NORMAL, DUP8_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock -- Create line id sub block" ); +OstTrace0( TRACE_NORMAL, DUP8_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock -- Create line id sub block" ); // Create CALL_MODEM_SB_LINE_ID subblock. TBuf8 lineIdBuf( 0 ); @@ -2031,7 +2056,7 @@ aNumOfSbInMsg++; TFLOGSTRING2("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_SB_LINE_ID - Subblock Count: %d", aNumOfSbInMsg ); -OstTrace1( TRACE_NORMAL, DUP19_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_SB_LINE_ID - Subblock Count:%d", aNumOfSbInMsg ); +OstTrace1( TRACE_NORMAL, DUP19_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_SB_LINE_ID - Subblock Count:%d", aNumOfSbInMsg ); } // No else @@ -2098,10 +2123,10 @@ aNumOfSbInMsg++; TFLOGSTRING2("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_SB_DESTINATION_ADDRESS - Subblock Count: %d", aNumOfSbInMsg ); -OstTraceExt1( TRACE_NORMAL, DUP10_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock- CALL_MODEM_SB_DESTINATION_ADDRESS - Subblock Count=%hhu", aNumOfSbInMsg ); +OstTraceExt1( TRACE_NORMAL, DUP10_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock- CALL_MODEM_SB_DESTINATION_ADDRESS - Subblock Count=%hhu", aNumOfSbInMsg ); TFLOGSTRING2("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock - destAddress: %S", &destAddress); -OstTraceExt1( TRACE_NORMAL, DUP16_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock;destAddress=%S", destAddress ); +OstTraceExt1( TRACE_NORMAL, DUP16_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock;destAddress=%S", destAddress ); if ( preAddressSupported ) { @@ -2136,7 +2161,7 @@ aNumOfSbInMsg++; TFLOGSTRING2("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_DESTINATION_PRE_ADDRESS - Subblock Count: %d", aNumOfSbInMsg ); -OstTraceExt1( TRACE_NORMAL, DUP11_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock- CALL_MODEM_DESTINATION_PRE_ADDRESS - Subblock Count=%hhu", aNumOfSbInMsg ); +OstTraceExt1( TRACE_NORMAL, DUP11_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock- CALL_MODEM_DESTINATION_PRE_ADDRESS - Subblock Count=%hhu", aNumOfSbInMsg ); } // No else @@ -2179,7 +2204,7 @@ iDestPostAddressIncluded = ETrue; TFLOGSTRING2("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_DESTINATION_POST_ADDRESS - Subblock Count: %d", aNumOfSbInMsg ); -OstTraceExt1( TRACE_NORMAL, DUP14_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock- CALL_MODEM_DESTINATION_POST_ADDRESS - Subblock Count=%hhu", aNumOfSbInMsg ); +OstTraceExt1( TRACE_NORMAL, DUP14_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock- CALL_MODEM_DESTINATION_POST_ADDRESS - Subblock Count=%hhu", aNumOfSbInMsg ); } // No else @@ -2187,7 +2212,7 @@ if ( 0 < iUusData.iUUI.Length() && 0 != iUusData.iServiceReq ) { TFLOGSTRING("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock. Creating sb for UUS signaling"); -OstTrace0( TRACE_NORMAL, DUP12_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock. Creating sb for UUS signaling" ); +OstTrace0( TRACE_NORMAL, DUP12_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock. Creating sb for UUS signaling" ); TBuf8 userToUserBuf; TBool validServiceType( ETrue ); @@ -2211,7 +2236,7 @@ { validServiceType = EFalse; TFLOGSTRING("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock. switch UUS type case default. Illegal service req!"); -OstTrace0( TRACE_NORMAL, DUP13_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock. Switch UUS type case default. Illegal service req!" ); +OstTrace0( TRACE_NORMAL, DUP13_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock. Switch UUS type case default. Illegal service req!" ); break; } } @@ -2239,7 +2264,7 @@ aNumOfSbInMsg++; TFLOGSTRING2("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_SB_USER_TO_USER - Subblock Count: %d", aNumOfSbInMsg ); - OstTraceExt1( TRACE_NORMAL, DUP15_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock- CALL_MODEM_SB_USER_TO_USER - Subblock Count=%hhu", aNumOfSbInMsg ); + OstTraceExt1( TRACE_NORMAL, DUP15_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock- CALL_MODEM_SB_USER_TO_USER - Subblock Count=%hhu", aNumOfSbInMsg ); } // Reset data @@ -2250,7 +2275,7 @@ if ( iNoFdnDial || iNoFdnCheck ) { TFLOGSTRING("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock -- Create check info sub block"); -OstTrace0( TRACE_NORMAL, DUP9_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock -- Create check info sub block" ); +OstTrace0( TRACE_NORMAL, DUP9_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock -- Create check info sub block" ); // Create CALL_MODEM_SB_LINE_ID subblock. @@ -2273,14 +2298,14 @@ aNumOfSbInMsg++; TFLOGSTRING2("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_SB_CHECK_INFO - Subblock Count: %d", aNumOfSbInMsg ); -OstTraceExt1( TRACE_NORMAL, DUP21_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_SB_CHECK_INFO - Subblock Count=%hhu", aNumOfSbInMsg ); +OstTraceExt1( TRACE_NORMAL, DUP21_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock - CALL_MODEM_SB_CHECK_INFO - Subblock Count=%hhu", aNumOfSbInMsg ); } if ( iResourceControlSuppress ) { TFLOGSTRING("TSY: CMmCallMessHandler::GetCallCreateReqSubBlock - suppressing resource control for this call"); -OstTrace0( TRACE_NORMAL, DUP20_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK, "CMmCallMessHandler::GetCallCreateReqSubBlock - suppressing resource control for this call" ); +OstTrace0( TRACE_NORMAL, DUP20_CMMCALLMESSHANDLER_GETCALLCREATEREQSUBBLOCK_TD, "CMmCallMessHandler::GetCallCreateReqSubBlock - suppressing resource control for this call" ); TBuf8 buffer; TIsiSubBlock resourceCheckSb( buffer, @@ -2313,7 +2338,7 @@ const TIsiReceiveC &aIsiMessage ) const { TFLOGSTRING("TSY: CMmCallMessHandler::CallControlResp"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLCONTROLRESP, "CMmCallMessHandler::CallControlResp" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLCONTROLRESP_TD, "CMmCallMessHandler::CallControlResp" ); TUint sbStartOffSet( 0 ); @@ -2391,7 +2416,7 @@ default: { TFLOGSTRING2("TSY: CMmCallMessHandler::CallControlResp - Not supported operation: %d", operation); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLCONTROLRESP, "CMmCallMessHandler::CallControlResp - Not supported operation=%hhu", operation ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLCONTROLRESP_TD, "CMmCallMessHandler::CallControlResp - Not supported operation=%hhu", operation ); break; } } @@ -2436,7 +2461,7 @@ TInt& aCurrentMsgOffset ) const { TFLOGSTRING("TSY: CMmCallMessHandler::GetSatOriginatedSubBlocks"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_GETSATORIGINATEDSUBBLOCKS, "TSY: CMmCallMessHandler::GetSatOriginatedSubBlocks" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_GETSATORIGINATEDSUBBLOCKS_TD, "TSY: CMmCallMessHandler::GetSatOriginatedSubBlocks" ); //Creates sub address sub block if ( 0 != iSubAddress.Length() ) @@ -2500,7 +2525,7 @@ TInt& aCurrentMsgOffset ) const { TFLOGSTRING("TSY: CMmCallMessHandler::GetSatOriginatedSubBlocks"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_GETSATORIGINATEDSUBBLOCKS, "CMmCallMessHandler::GetSatOriginatedSubBlocks" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_GETSATORIGINATEDSUBBLOCKS_TD, "CMmCallMessHandler::GetSatOriginatedSubBlocks" ); // Creates sub address sub block if ( 0 != aSubAddress.Length() ) @@ -2578,7 +2603,7 @@ & KMaskBits1to3 ) ); TFLOGSTRING2("TSY: CMmCallMessHandler::CallControlInd, CallID: %d", callId); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLCONTROLIND, "CMmCallMessHandler::CallControlInd" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLCONTROLIND_TD, "CMmCallMessHandler::CallControlInd" ); TUint8 callOperation( 0 ); TUint sbStartOffSet( 0 ); @@ -2650,7 +2675,7 @@ default: { TFLOGSTRING2("TSY: CMmCallMessHandler::CallControlInd - Not supported operation: %d", operation); -OstTrace1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLCONTROLIND, "CMmCallMessHandler::CallControlInd - Not supported operation=%d", operation ); +OstTrace1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLCONTROLIND_TD, "CMmCallMessHandler::CallControlInd - Not supported operation=%d", operation ); break; } } @@ -2700,7 +2725,7 @@ & KMaskBits1to3 ) ); TFLOGSTRING2("TSY: CMmCallMessHandler::CallGsmNotificationInd. CallId:%d",callId); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLGSMNOTIFICATIONIND, "CMmCallMessHandler::CallGsmNotificationInd" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLGSMNOTIFICATIONIND_TD, "CMmCallMessHandler::CallGsmNotificationInd" ); CCallDataPackage callDataPackage; @@ -2903,7 +2928,7 @@ sbStartOffSet ) ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallGsmNotificationInd: CALL_MODEM_SB_ORIGIN_INFO subblock"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLGSMNOTIFICATIONIND, "CMmCallMessHandler::CallGsmNotificationInd - CALL_MODEM_SB_ORIGIN_INFO subblock" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLGSMNOTIFICATIONIND_TD, "CMmCallMessHandler::CallGsmNotificationInd - CALL_MODEM_SB_ORIGIN_INFO subblock" ); TBuf16 targetOrigName; CCallDataPackage callData; @@ -2958,7 +2983,7 @@ TUint8 aIsiCallMode ) const { TFLOGSTRING2("TSY: CMmCallMessHandler::FillModeData. callmode:%d",aIsiCallMode); -OstTraceExt1( TRACE_NORMAL, CMMCALLMESSHANDLER_FILLMODEDATA, "CMmCallMessHandler::FillModeData;aIsiCallMode=%hhu", aIsiCallMode ); +OstTraceExt1( TRACE_NORMAL, CMMCALLMESSHANDLER_FILLMODEDATA_TD, "CMmCallMessHandler::FillModeData;aIsiCallMode=%hhu", aIsiCallMode ); // Set service and alternating call mode in iMobileCallInfo mobileCallInfo.iAlternatingCall = @@ -2996,7 +3021,7 @@ default: { TFLOGSTRING2("TSY: CMmCallMessHandler::FillModeData - Not supported ISA call mode: %d", aIsiCallMode); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_FILLMODEDATA, "CMmCallMessHandler::FillModeData - Not supported ISA call mode=%hhu", aIsiCallMode ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_FILLMODEDATA_TD, "CMmCallMessHandler::FillModeData - Not supported ISA call mode=%hhu", aIsiCallMode ); break; } } @@ -3019,13 +3044,13 @@ TUint nbrplan( aOrigAddressType & KMaskBits1to4 ); TFLOGSTRING2("TSY: CMmCallMessHandler::FillNumberPlanAndType. nbrplan (mask KMaskBits1to4) : %d",nbrplan); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_FILLNUMBERPLANANDTYPE, "CMmCallMessHandler::FillNumberPlanAndType" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_FILLNUMBERPLANANDTYPE_TD, "CMmCallMessHandler::FillNumberPlanAndType" ); if ( RMobilePhone::EUnknownNumberingPlan == aMobileCallInfo.iRemoteParty.iRemoteNumber.iNumberPlan ) { TFLOGSTRING("TSY: CMmCallMessHandler::FillNumberPlanAndType. EUnknownNumberingPlan"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_FILLNUMBERPLANANDTYPE, "CMmCallMessHandler::FillNumberPlanAndType - EUnknownNumberingPlan" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_FILLNUMBERPLANANDTYPE_TD, "CMmCallMessHandler::FillNumberPlanAndType - EUnknownNumberingPlan" ); if ( CALL_MODEM_NBR_PLAN_UNKNOWN == nbrplan ) { @@ -3085,13 +3110,13 @@ TUint nbrtype( aOrigAddressType & KMaskBits5to7 ); TFLOGSTRING2("TSY: CMmCallMessHandler::FillNumberPlanAndType. nbrplan (mask KMaskBits5to7) : %d",nbrtype); -OstTrace1( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_FILLNUMBERPLANANDTYPE, "CMmCallMessHandler::FillNumberPlanAndType - nbrplan (mask KMaskBits5to7) nbrtype=%d", nbrtype ); +OstTrace1( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_FILLNUMBERPLANANDTYPE_TD, "CMmCallMessHandler::FillNumberPlanAndType - nbrplan (mask KMaskBits5to7) nbrtype=%d", nbrtype ); if ( RMobilePhone::EUnknownNumber == aMobileCallInfo.iRemoteParty.iRemoteNumber.iTypeOfNumber ) { TFLOGSTRING("TSY: CMmCallMessHandler::FillNumberPlanAndType. EUnknownNumber"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_FILLNUMBERPLANANDTYPE, "CMmCallMessHandler::FillNumberPlanAndType - EUnknownNumber" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_FILLNUMBERPLANANDTYPE_TD, "CMmCallMessHandler::FillNumberPlanAndType - EUnknownNumber" ); if ( CALL_MODEM_NBR_TYPE_UNKNOWN == nbrtype ) { @@ -3147,7 +3172,7 @@ RMobileCall::TMobileCallDirection aDirection ) const { TFLOGSTRING3("TSY: CMmCallMessHandler::FillRemoteStatusAndNumber. OrigAdr: %S. CallDirection:%d", &aOrigAddress, aDirection); -OstTraceExt2( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_FILLREMOTESTATUSANDNUMBER, "CMmCallMessHandler::FillRemoteStatusAndNumber;OrigAddr=%S;CallDirection=%d", aOrigAddress, aDirection ); +OstTraceExt2( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_FILLREMOTESTATUSANDNUMBER_TD, "CMmCallMessHandler::FillRemoteStatusAndNumber;OrigAddr=%S;CallDirection=%d", aOrigAddress, aDirection ); // Find out if telephone number is allowed to be presented. if ( RMobileCall::ERemoteIdentityUnknown == @@ -3158,7 +3183,7 @@ || CALL_MODEM_PRESENTATION_ALLOWED == aOrigPresentInd && RMobileCall::EMobileTerminated == aDirection) { TFLOGSTRING("TSY: CMmCallMessHandler::FillRemoteStatusAndNumber. CPN_ALLOWED"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_FILLREMOTESTATUSANDNUMBER, "CMmCallMessHandler::FillRemoteStatusAndNumber - CPN_ALLOWED" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_FILLREMOTESTATUSANDNUMBER_TD, "CMmCallMessHandler::FillRemoteStatusAndNumber - CPN_ALLOWED" ); // Available. iRemoteIdStatus is updated using the tel number // presentation status. Remote name does not affect to it, Symbian's @@ -3178,7 +3203,7 @@ aDirection == RMobileCall::EMobileTerminated ) { TFLOGSTRING("TSY: CMmCallMessHandler::FillRemoteStatusAndNumber. CPN_RESTRICTED & MT call"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_FILLREMOTESTATUSANDNUMBER, "CMmCallMessHandler::FillRemoteStatusAndNumber - CPN_RESTRICTED and MT call" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_FILLREMOTESTATUSANDNUMBER_TD, "CMmCallMessHandler::FillRemoteStatusAndNumber - CPN_RESTRICTED and MT call" ); // There are cases when remote party info should still be presented. // See TSW ActionDB, Notes ID: MB03081534698 @@ -3192,7 +3217,7 @@ else // CPN_NOT_AVAILABLE or CPN_RESTRICTED & MO { TFLOGSTRING("TSY: CMmCallMessHandler::FillRemoteStatusAndNumber. CPN_NOT_AVAILABLE or CPN_RESTRICTED & MO "); -OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_FILLREMOTESTATUSANDNUMBER, "CMmCallMessHandler::FillRemoteStatusAndNumber - CPN_NOT_AVAILABLE or CPN_RESTRICTED and MO" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_FILLREMOTESTATUSANDNUMBER_TD, "CMmCallMessHandler::FillRemoteStatusAndNumber - CPN_NOT_AVAILABLE or CPN_RESTRICTED and MO" ); if ( CALL_MODEM_PRESENT_RESTRICTED == aOrigPresentInd && RMobileCall::EMobileOriginated == aDirection ) @@ -3203,7 +3228,7 @@ else { TFLOGSTRING("TSY: CMmCallMessHandler::FillRemoteStatusAndNumber. OrigPresentInd is unknown"); -OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_FILLREMOTESTATUSANDNUMBER, "CMmCallMessHandler::FillRemoteStatusAndNumber - OrigPresentInd is unknown" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_FILLREMOTESTATUSANDNUMBER_TD, "CMmCallMessHandler::FillRemoteStatusAndNumber - OrigPresentInd is unknown" ); // Unknown aMobileCallInfo.iRemoteParty.iRemoteIdStatus = RMobileCall::ERemoteIdentityUnknown; @@ -3238,7 +3263,7 @@ const TDes16& aOrigInfoName ) const { TFLOGSTRING3("TSY: CMmCallMessHandler::FillCallingName. aOrigInfoPresentInd:%d, origInfoName:%s", aOrigInfoPresentInd,&aOrigInfoName); -OstTraceExt2( TRACE_NORMAL, CMMCALLMESSHANDLER_FILLCALLINGNAME, "CMmCallMessHandler::FillCallingName;aOrigInfoPresentInd=%hhu;aOrigInfoName=%S", aOrigInfoPresentInd, aOrigInfoName ); +OstTraceExt2( TRACE_NORMAL, CMMCALLMESSHANDLER_FILLCALLINGNAME_TD, "CMmCallMessHandler::FillCallingName;aOrigInfoPresentInd=%hhu;aOrigInfoName=%S", aOrigInfoPresentInd, aOrigInfoName ); // Find out if name is availble and can be presented. if ( CALL_MODEM_PRESENTATION_ALLOWED == aOrigInfoPresentInd && @@ -3266,7 +3291,7 @@ const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL" ); TUint8 callStatusISA( 0xFF ); TUint8 callModeISA( 0xFF ); @@ -3299,7 +3324,7 @@ sbStartOffSet + CALL_MODEM_SB_STATUS_OFFSET_STATUS ); TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_STATUS subblock"); - OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_STATUS subblock" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_STATUS subblock" ); } // No else @@ -3326,7 +3351,7 @@ sbStartOffSet + CALL_MODEM_SB_MODE_OFFSET_MODE ); TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_MODE subblock"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_MODE subblock" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_MODE subblock" ); FillModeData( mobileCallInfo, callModeISA ); mobileCallInfo.iValid |= RMobileCall::KCallEmergency; @@ -3340,7 +3365,7 @@ ResetIncomingCallInfo( iIncomingCallInfo ); } TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL:Normal completion of call status ind (no termination of calls which haven't been indicated to CTSY yet)"); -OstTrace0( TRACE_NORMAL, DUP20_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL:Normal completion of call status ind (no termination of calls which haven't been indicated to CTSY yet)" ); +OstTrace0( TRACE_NORMAL, DUP20_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL:Normal completion of call status ind (no termination of calls which haven't been indicated to CTSY yet)" ); // Create call package (used for all completions) CCallDataPackage callData; @@ -3361,7 +3386,7 @@ { TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL: Receive UUI."); -OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL: Receive UUI" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL: Receive UUI" ); // Get data length TUint8 userToUserDataLen( aIsiMessage.Get8bit( @@ -3406,7 +3431,7 @@ sbStartOffSet ) ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_REDIRECTING_ADDRESS subblock"); -OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_REDIRECTING_ADDRESS subblock" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_REDIRECTING_ADDRESS subblock" ); // Get address length TUint8 redirectingAddressLength( aIsiMessage.Get8bit( @@ -3433,7 +3458,7 @@ sbStartOffSet )) { TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_LINE_ID subblock"); -OstTrace0( TRACE_NORMAL, DUP21_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_LINE_ID subblock" ); +OstTrace0( TRACE_NORMAL, DUP21_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_LINE_ID subblock" ); origPresentInd = aIsiMessage.Get8bit( sbStartOffSet + CALL_MODEM_SB_LINE_ID_OFFSET_LINEID ); @@ -3446,7 +3471,7 @@ sbStartOffSet ) ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_DESTINATION_ADDRESS subblock"); -OstTrace0( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_DESTINATION_ADDRESS subblock" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_DESTINATION_ADDRESS subblock" ); ReadAllAddressDestination( mobileCallInfo, targetOrig, @@ -3461,7 +3486,7 @@ sbStartOffSet ) ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_CONNECTED_ADDRESS subblock"); -OstTrace0( TRACE_NORMAL, DUP19_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_CONNECTED_ADDRESS subblock" ); +OstTrace0( TRACE_NORMAL, DUP19_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_CONNECTED_ADDRESS subblock" ); ReadAllAddressConnected( mobileCallInfo, targetOrig, @@ -3488,7 +3513,7 @@ sbStartOffSet ) ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_ORIGIN_INFO subblock"); -OstTrace0( TRACE_NORMAL, DUP6_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_ORIGIN_INFO subblock" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_ORIGIN_INFO subblock" ); ReadCallInfo( mobileCallInfo, @@ -3506,7 +3531,7 @@ sbStartOffSet ) ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_CAUSE subblock"); -OstTrace0( TRACE_NORMAL, DUP7_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_CAUSE subblock" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_CAUSE subblock" ); // Get cause type and value causeType = aIsiMessage.Get8bit( @@ -3532,7 +3557,7 @@ sbStartOffSet ) ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL:CALL_MODEM_SB_DESTINATION_POST_ADDRESS"); -OstTrace0( TRACE_NORMAL, DUP8_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_DESTINATION_POST_ADDRESS" ); +OstTrace0( TRACE_NORMAL, DUP8_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL: CALL_MODEM_SB_DESTINATION_POST_ADDRESS" ); // Get address length TUint8 destinationPostAddressLength( aIsiMessage.Get8bit( @@ -3547,7 +3572,7 @@ if ( ( KDestPostAddressMaxLength * 2 ) >= postAddr.Length() ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL:lenght less than 15 char"); -OstTrace0( TRACE_NORMAL, DUP9_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL: Lenght less than 15 char" ); +OstTrace0( TRACE_NORMAL, DUP9_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL: Lenght less than 15 char" ); // Copy 8-bit name to the 16-bit target using correct endianess TIsiUtility::CopyFromBigEndian( postAddr, @@ -3565,7 +3590,7 @@ if ( 'w' == iDestPostAddress[ i ] ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL:w found"); -OstTrace0( TRACE_NORMAL, DUP10_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL: w found" ); +OstTrace0( TRACE_NORMAL, DUP10_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL: w found" ); iDestPostAddress.SetLength( 0 ); iDtmfPostAddressCallId = 0; break; @@ -3577,9 +3602,9 @@ TFLOGSTRING2("TSY: CMmCallMessHandler::CallStatusIndL:callStatusISA: %d", callStatusISA); TFLOGSTRING2("TSY: CMmCallMessHandler::CallStatusIndL:mobileCallInfo.iCallId: %d", mobileCallInfo.iCallId); TFLOGSTRING2("TSY: CMmCallMessHandler::CallStatusIndL:iDtmfPostAddressCallId: %d", iDtmfPostAddressCallId); -OstTraceExt1( TRACE_NORMAL, DUP11_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL;callStatusISA=%hhu", callStatusISA ); -OstTraceExt1( TRACE_NORMAL, DUP13_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL;mobileCallInfo.iCallId=%hhu", mobileCallInfo.iCallId ); -OstTraceExt1( TRACE_NORMAL, DUP12_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL;iDtmfPostAddressCallId=%hhu", iDtmfPostAddressCallId ); +OstTraceExt1( TRACE_NORMAL, DUP11_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL;callStatusISA=%hhu", callStatusISA ); +OstTraceExt1( TRACE_NORMAL, DUP13_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL;mobileCallInfo.iCallId=%hhu", mobileCallInfo.iCallId ); +OstTraceExt1( TRACE_NORMAL, DUP12_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL;iDtmfPostAddressCallId=%hhu", iDtmfPostAddressCallId ); // When call is active, send post address // DTMF sending in case this is SIMATK call @@ -3588,7 +3613,7 @@ 0 < iDtmfPostAddressCallId ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL:Dtmf post address sending (ACTIVE)"); -OstTrace0( TRACE_NORMAL, DUP17_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL, Dtmf post address sending (ACTIVE)" ); +OstTrace0( TRACE_NORMAL, DUP17_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL, Dtmf post address sending (ACTIVE)" ); iDtmfMessHandler->SendPostAddressL ( &iDestPostAddress ); // Reset iDestPostAddress and iDtmfPostAddressCallId to prevent multiple @@ -3604,13 +3629,13 @@ 0 < iDtmfPostAddressCallId ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallStatusIndL:If call fails for some reason (IDLE)"); -OstTrace0( TRACE_NORMAL, DUP14_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL: If call fails for some reason (IDLE)" ); +OstTrace0( TRACE_NORMAL, DUP14_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL: If call fails for some reason (IDLE)" ); iDestPostAddress.SetLength( 0 ); iDtmfPostAddressCallId = 0; } TFLOGSTRING2("TSY: CMmCallMessHandler::CallStatusIndL:iDtmfPostAddressCallId: %d After value",iDtmfPostAddressCallId); -OstTraceExt1( TRACE_NORMAL, DUP18_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL;iDtmfPostAddressCallId=%hhu After value", iDtmfPostAddressCallId ); +OstTraceExt1( TRACE_NORMAL, DUP18_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL;iDtmfPostAddressCallId=%hhu After value", iDtmfPostAddressCallId ); } // No else @@ -3672,12 +3697,12 @@ CALL_MODEM_STATUS_MO_RELEASE == callStatusISA ) { TFLOGSTRING2("TSY: CMmCallMessHandler::CallStatusIndL:callStatusISA: %d", callStatusISA); -OstTraceExt1( TRACE_NORMAL, DUP15_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL;callStatusISA=%hhu", callStatusISA ); +OstTraceExt1( TRACE_NORMAL, DUP15_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL;callStatusISA=%hhu", callStatusISA ); TBool playRemoteAlertToneLocally( EFalse ); TFLOGSTRING2("TSY: CMmCallMessHandler::CallStatusIndL:playRemoteAlert: %d", playRemoteAlertToneLocally); -OstTraceExt1( TRACE_NORMAL, DUP16_CMMCALLMESSHANDLER_CALLSTATUSINDL, "CMmCallMessHandler::CallStatusIndL;playRemoteAlertToneLocally=%hhu", playRemoteAlertToneLocally ); +OstTraceExt1( TRACE_NORMAL, DUP16_CMMCALLMESSHANDLER_CALLSTATUSINDL_TD, "CMmCallMessHandler::CallStatusIndL;playRemoteAlertToneLocally=%hhu", playRemoteAlertToneLocally ); CMmDataPackage dataPackage; dataPackage.PackData( &playRemoteAlertToneLocally ); @@ -3741,7 +3766,7 @@ const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallComingInd"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLCOMINGIND, "CMmCallMessHandler::CallComingInd" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLCOMINGIND_TD, "CMmCallMessHandler::CallComingInd" ); // Call coming ind message TUint8 callMode( 0xFF ); @@ -3760,7 +3785,7 @@ sbStartOffSet + CALL_MODEM_SB_MODE_OFFSET_MODE ); TFLOGSTRING("TSY: CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_MODE"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLCOMINGIND, "CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_MODE" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLCOMINGIND_TD, "CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_MODE" ); FillModeData( iIncomingCallInfo, callMode ); iIncomingCallInfo.iValid |= RMobileCall::KCallEmergency; @@ -3784,7 +3809,7 @@ redirectingAddressLength * 2 ) ); TFLOGSTRING("TSY: CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_REDIRECTING_ADDRESS"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_CALLCOMINGIND, "CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_REDIRECTING_ADDRESS" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_CALLCOMINGIND_TD, "CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_REDIRECTING_ADDRESS" ); // If there is a redirection address, the call has been forwarded // (but not vice versa; this information can come with another @@ -3828,7 +3853,7 @@ callOriginAddressLength * 2 ) ); TFLOGSTRING("TSY: CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_ORIGIN_ADDRESS"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_CALLCOMINGIND, "CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_ORIGIN_ADDRESS" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_CALLCOMINGIND_TD, "CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_ORIGIN_ADDRESS" ); // Check if number is international and addrDataLength is bigger // than zero. The length of the string does not have to be checked @@ -3893,7 +3918,7 @@ callOriginInfoNameLength * 2 ) ); TFLOGSTRING("TSY: CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_ORIGIN_INFO"); -OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_CALLCOMINGIND, "CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_ORIGIN_INFO" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_CALLCOMINGIND_TD, "CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_ORIGIN_INFO" ); // Copy 8-bit name to the 16-bit target using correct endianess TIsiUtility::CopyFromBigEndian( name, targetOrigName ); @@ -3917,7 +3942,7 @@ sbStartOffSet + CALL_MODEM_SB_CAUSE_OF_NO_CLI_OFFSET_CAUSE ) ); TFLOGSTRING("TSY: CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_CAUSE_OF_NO_CLI"); -OstTrace0( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_CALLCOMINGIND, "CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_CAUSE_OF_NO_CLI" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_CALLCOMINGIND_TD, "CMmCallMessHandler::CallComingInd -- CALL_MODEM_SB_CAUSE_OF_NO_CLI" ); // Fill cause of no CLI FillCauseOfNoCli(iIncomingCallInfo, mmCauseOfNoCli); @@ -3934,7 +3959,7 @@ RMobileCall::TMobileCallInfoV1& aIncomingCallInfo ) const { TFLOGSTRING("TSY: CMmCallMessHandler::ResetIncomingCallInfo"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_RESETINCOMINGCALLINFO, "CMmCallMessHandler::ResetIncomingCallInfo" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_RESETINCOMINGCALLINFO_TD, "CMmCallMessHandler::ResetIncomingCallInfo" ); // Reset all fields that are used in aIncomingCallInfo aIncomingCallInfo.iValid = 0; @@ -3965,7 +3990,7 @@ const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING("TSY: CMmCallMessHandler::CallServiceDeniedInd"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLSERVICEDENIEDIND, "CMmCallMessHandler::CallServiceDeniedInd" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CALLSERVICEDENIEDIND_TD, "CMmCallMessHandler::CallServiceDeniedInd" ); // Call service denied ind message @@ -4048,7 +4073,7 @@ default: { TFLOGSTRING("TSY: CMmCallMessHandler::CallServiceDeniedInd. Switch serviceId case default."); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLSERVICEDENIEDIND, "CMmCallMessHandler::CallServiceDeniedInd. Switch serviceId case default." ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CALLSERVICEDENIEDIND_TD, "CMmCallMessHandler::CallServiceDeniedInd. Switch serviceId case default." ); break; } } @@ -4066,7 +4091,7 @@ ) { TFLOGSTRING2("TSY: CMmCallMessHandler::CheckCallIsaStatus. callstatusisa:%d", aCallStatusISA); -OstTraceExt1( TRACE_NORMAL, CMMCALLMESSHANDLER_CHECKCALLISASTATUS, "CMmCallMessHandler::CheckCallIsaStatus;aCallStatusISA=%hhu", aCallStatusISA ); +OstTraceExt1( TRACE_NORMAL, CMMCALLMESSHANDLER_CHECKCALLISASTATUS_TD, "CMmCallMessHandler::CheckCallIsaStatus;aCallStatusISA=%hhu", aCallStatusISA ); // Check which status we got if ( CALL_MODEM_STATUS_MT_RELEASE == aCallStatusISA ) @@ -4120,7 +4145,7 @@ ) { TFLOGSTRING("TSY: CMmCallMessHandler::ReadAllAddressDestination"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_READALLADDRESSDESTINATION, "CMmCallMessHandler::ReadAllAddressDestination" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_READALLADDRESSDESTINATION_TD, "CMmCallMessHandler::ReadAllAddressDestination" ); TUint8 origAddressType( aIsiMessage.Get8bit( aSbStartOffSet + CALL_MODEM_SB_DESTINATION_ADDRESS_OFFSET_ADDRTYPE ) ); @@ -4145,7 +4170,7 @@ aSbStartOffSet ) ) { TFLOGSTRING("TSY: CMmCallMessHandler::ReadAllAddressDestination: CALL_MODEM_SB_DESTINATION_PRE_ADDRESS"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_READALLADDRESSDESTINATION, "CMmCallMessHandler::ReadAllAddressDestination: CALL_MODEM_SB_DESTINATION_PRE_ADDRESS" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_READALLADDRESSDESTINATION_TD, "CMmCallMessHandler::ReadAllAddressDestination: CALL_MODEM_SB_DESTINATION_PRE_ADDRESS" ); // Get destination address length TUint8 destinationPreAddressLength( aIsiMessage.Get8bit( @@ -4187,7 +4212,7 @@ aSbStartOffSet ) ) { TFLOGSTRING("TSY: CMmCallMessHandler::ReadAllAddressDestination: CALL_MODEM_SB_DESTINATION_POST_ADDRESS"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_READALLADDRESSDESTINATION, "CMmCallMessHandler::ReadAllAddressDestination: CALL_MODEM_SB_DESTINATION_POST_ADDRESS" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_READALLADDRESSDESTINATION_TD, "CMmCallMessHandler::ReadAllAddressDestination: CALL_MODEM_SB_DESTINATION_POST_ADDRESS" ); // Get destinationAddress Length TUint8 destinationPostAddressLength( aIsiMessage.Get8bit( @@ -4215,7 +4240,7 @@ TIsiUtility::CopyFromBigEndian( address2, aTargetOrig ); TFLOGSTRING2("TSY: CMmCallMessHandler::ReadAllAddressDestination: aTargetOrig = %S", &aTargetOrig); -OstTraceExt1( TRACE_NORMAL, DUP19_CMMCALLMESSHANDLER_CallStatusIndL, "CMmCallMessHandler::ReadAllDestinationAddress;aTargetOrig=%S", aTargetOrig ); +OstTraceExt1( TRACE_NORMAL, DUP19_CMMCALLMESSHANDLER_CallStatusIndL_TD, "CMmCallMessHandler::ReadAllDestinationAddress;aTargetOrig=%S", aTargetOrig ); FillRemoteStatusAndNumber( aMobileCallInfo, origPresentInd, @@ -4239,7 +4264,7 @@ TUint& aSbStartOffSet) { TFLOGSTRING("TSY: CMmCallMessHandler::ReadAllAddressConnected"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_READALLADDRESSCONNECTED, "CMmCallMessHandler::ReadAllAddressConnected" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_READALLADDRESSCONNECTED_TD, "CMmCallMessHandler::ReadAllAddressConnected" ); TUint8 origAddressType( aIsiMessage.Get8bit( aSbStartOffSet + CALL_MODEM_SB_CONNECTED_ADDRESS_OFFSET_ADDRTYPE ) ); @@ -4286,12 +4311,12 @@ TIsiUtility::CopyFromBigEndian( address2, aTargetOrig ); TFLOGSTRING2("TSY: CMmCallMessHandler::ReadAllAddressConnected;aTargetOrig=%S", &aTargetOrig); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_READALLADDRESSCONNECTED, "CMmCallMessHandler::ReadAllAddressConnected;aTargetOrig=%S", aTargetOrig ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_READALLADDRESSCONNECTED_TD, "CMmCallMessHandler::ReadAllAddressConnected;aTargetOrig=%S", aTargetOrig ); if ( CALL_MODEM_PRESENTATION_ALLOWED == origPresentInd ) { TFLOGSTRING("TSY: CMmCallMessHandler::ReadAllAddressConnected; CPN ALLOWED"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_READALLADDRESSCONNECTED, "TSY: CMmCallMessHandler::ReadAllAddressConnected; CPN ALLOWED" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_READALLADDRESSCONNECTED_TD, "TSY: CMmCallMessHandler::ReadAllAddressConnected; CPN ALLOWED" ); aMobileCallInfo.iRemoteParty.iRemoteIdStatus = RMobileCall::ERemoteIdentityAvailable; // Copy the actual number @@ -4301,7 +4326,7 @@ else if ( CALL_MODEM_PRESENTATION_RESTRICTED == origPresentInd ) { TFLOGSTRING("TSY: CMmCallMessHandler::ReadAllAddressConnected; CPN RESTRICTED"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_READALLADDRESSCONNECTED, "TSY: CMmCallMessHandler::ReadAllAddressConnected; CPN RESTRICTED" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_READALLADDRESSCONNECTED_TD, "TSY: CMmCallMessHandler::ReadAllAddressConnected; CPN RESTRICTED" ); aMobileCallInfo.iRemoteParty.iRemoteIdStatus = RMobileCall::ERemoteIdentitySuppressed; aMobileCallInfo.iRemoteParty.iRemoteNumber.iTelNumber.Zero(); @@ -4309,7 +4334,7 @@ else { TFLOGSTRING("TSY: CMmCallMessHandler::ReadAllAddressConnected; CPN UNKNOWN"); -OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_READALLADDRESSCONNECTED, "TSY: CMmCallMessHandler::ReadAllAddressConnected; CPN UNKNOWN" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_READALLADDRESSCONNECTED_TD, "TSY: CMmCallMessHandler::ReadAllAddressConnected; CPN UNKNOWN" ); aMobileCallInfo.iRemoteParty.iRemoteIdStatus = RMobileCall::ERemoteIdentityUnknown; aMobileCallInfo.iRemoteParty.iRemoteNumber.iTelNumber.Zero(); @@ -4342,7 +4367,7 @@ ) { TFLOGSTRING("TSY: CMmCallMessHandler::ReadCallInfo"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_READCALLINFO, "CMmCallMessHandler::ReadCallInfo" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_READCALLINFO_TD, "CMmCallMessHandler::ReadCallInfo" ); // Get presentation indicator (four bits (1-4)) TUint8 origInfoPresentInd( aIsiMessage.Get8bit( @@ -4380,7 +4405,7 @@ ) { TFLOGSTRING("TSY: CMmCallMessHandler::CompleteIncomingCallNotif"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_COMPLETEINCOMINGCALLNOTIF, "CMmCallMessHandler::CompleteIncomingCallNotif" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_COMPLETEINCOMINGCALLNOTIF_TD, "CMmCallMessHandler::CompleteIncomingCallNotif" ); if ( RMobileCall::EStatusRinging == aStatusETel ) { @@ -4399,7 +4424,7 @@ // Complete IncomingCall notification TFLOGSTRING("TSY: CMmCallMessHandler::CompleteIncomingCallNotif - iWaitingCall != aMobileCallInfo.iCallId"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_COMPLETEINCOMINGCALLNOTIF, "CMmCallMessHandler::CompleteIncomingCallNotif - iWaitingCall != aMobileCallInfo.iCallId" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_COMPLETEINCOMINGCALLNOTIF_TD, "CMmCallMessHandler::CompleteIncomingCallNotif - iWaitingCall != aMobileCallInfo.iCallId" ); iMessageRouter->Complete( EEtelLineNotifyIncomingCall, @@ -4411,7 +4436,7 @@ if ( 0 < iReceivedUusData.Length() ) { TFLOGSTRING("TSY: CMmCallMessHandler::CompleteIncomingCallNotif - Completing receive uui"); -OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_COMPLETEINCOMINGCALLNOTIF, "CMmCallMessHandler::CompleteIncomingCallNotif - Completing receive uui" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_COMPLETEINCOMINGCALLNOTIF_TD, "CMmCallMessHandler::CompleteIncomingCallNotif - Completing receive uui" ); callData.PackData( &iReceivedUusData ); iMessageRouter->Complete( @@ -4440,14 +4465,14 @@ TInt aResultETel ) { TFLOGSTRING("TSY: CMmCallMessHandler::CompleteMobileCallInfoChange"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_COMPLETEMOBILECALLINFOANDSTATUSCHANGE, "CMmCallMessHandler::CompleteMobileCallInfoAndStatusChange" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_COMPLETEMOBILECALLINFOANDSTATUSCHANGE_TD, "CMmCallMessHandler::CompleteMobileCallInfoAndStatusChange" ); TFLOGSTRING3("TSY: CMmCallMessHandler::CompleteMobileCallInfoAndStatusChange;aStatusETel=%d;aResultETel=%d", aStatusETel, aResultETel); TFLOGSTRING2("TSY: CMmCallMessHandler::CompleteMobileCallInfoAndStatusChange;aMobileCallInfo.iRemoteParty.iRemoteNumber.iTelNumber=%S", &aMobileCallInfo.iRemoteParty.iRemoteNumber.iTelNumber); TFLOGSTRING2("TSY: CMmCallMessHandler::CompleteMobileCallInfoAndStatusChange;aMobileCallInfo.iValid=%x", aMobileCallInfo.iValid); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_COMPLETEMOBILECALLINFOANDSTATUSCHANGE, "CMmCallMessHandler::CompleteMobileCallInfoAndStatusChange;aStatusETel=%d;aResultETel=%d", aStatusETel, aResultETel ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_COMPLETEMOBILECALLINFOANDSTATUSCHANGE, "CMmCallMessHandler::CompleteMobileCallInfoAndStatusChange;aMobileCallInfo.iRemoteParty.iRemoteNumber.iTelNumber=%S", aMobileCallInfo.iRemoteParty.iRemoteNumber.iTelNumber ); -OstTrace1( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_COMPLETEMOBILECALLINFOANDSTATUSCHANGE, "CMmCallMessHandler::CompleteMobileCallInfoAndStatusChange;aMobileCallInfo.iValid=%x", aMobileCallInfo.iValid ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_COMPLETEMOBILECALLINFOANDSTATUSCHANGE_TD, "CMmCallMessHandler::CompleteMobileCallInfoAndStatusChange;aStatusETel=%d;aResultETel=%d", aStatusETel, aResultETel ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_COMPLETEMOBILECALLINFOANDSTATUSCHANGE_TD, "CMmCallMessHandler::CompleteMobileCallInfoAndStatusChange;aMobileCallInfo.iRemoteParty.iRemoteNumber.iTelNumber=%S", aMobileCallInfo.iRemoteParty.iRemoteNumber.iTelNumber ); +OstTrace1( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_COMPLETEMOBILECALLINFOANDSTATUSCHANGE_TD, "CMmCallMessHandler::CompleteMobileCallInfoAndStatusChange;aMobileCallInfo.iValid=%x", aMobileCallInfo.iValid ); // Call data package CCallDataPackage callData; @@ -4484,7 +4509,7 @@ { // None TFLOGSTRING("TSY: CMmCallMessHandler::HandleError."); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_HANDLEERROR, "CMmCallMessHandler::HandleError" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_HANDLEERROR_TD, "CMmCallMessHandler::HandleError" ); } // ----------------------------------------------------------------------------- @@ -4499,7 +4524,7 @@ TUint8 aCauseOfNoCli ) { TFLOGSTRING2("TSY: CMmCallMessHandler::FillCauseOfNoCli. cause:%d", aCauseOfNoCli); -OstTraceExt1( TRACE_NORMAL, CMMCALLMESSHANDLER_FILLCAUSEOFNOCLI, "CMmCallMessHandler::FillCauseOfNoCli;aCauseOfNoCli=%hhu", aCauseOfNoCli ); +OstTraceExt1( TRACE_NORMAL, CMMCALLMESSHANDLER_FILLCAUSEOFNOCLI_TD, "CMmCallMessHandler::FillCauseOfNoCli;aCauseOfNoCli=%hhu", aCauseOfNoCli ); switch( aCauseOfNoCli ) { @@ -4554,7 +4579,7 @@ default: { TFLOGSTRING("TSY: CMmCallMessHandler::FillCauseOfNoCli. Switch cause case default"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_FILLCAUSEOFNOCLI, "CMmCallMessHandler::FillCauseOfNoCli. Switch cause case default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_FILLCAUSEOFNOCLI_TD, "CMmCallMessHandler::FillCauseOfNoCli. Switch cause case default" ); // Keep aMobileCallInfo.iRemoteParty.iRemoteIdStatus unchanged break; } @@ -4569,15 +4594,18 @@ void CMmCallMessHandler::InitializeDataportL() { TFLOGSTRING("NTSY: CMmCallMessHandler::InitializeDataportL()"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_INITIALIZEDATAPORTL, "CMmCallMessHandler::InitializeDataportL" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_INITIALIZEDATAPORTL_TD, "CMmCallMessHandler::InitializeDataportL" ); // SIM is ready, start dataport handling if ( !iDataPortHandler ) { TFLOGSTRING("NTSY: CMmCallMessHandler::InitializeDataportL - Create pipe for videotelephony"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_INITIALIZEDATAPORTL, "CMmCallMessHandler::InitializeDataportL - Create pipe for videotelephony" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_INITIALIZEDATAPORTL_TD, "CMmCallMessHandler::InitializeDataportL - Create pipe for videotelephony" ); + // For testtool +#ifndef __WINSCW__ iDataPortHandler = CMmDataPortHandler::NewL( iMessageRouter ); - User::LeaveIfError( PnsPipeCreateReq( PN_PIPE_ENABLE ) ); +#endif /* __WINSCW__ */ + User::LeaveIfError( PnsPipeCreateReq() ); } } @@ -4590,7 +4618,7 @@ const CMmDataPackage* aDataPackage ) { TFLOGSTRING( "TSY: CMmCallMessHandler::ActivateUUS. Unpacking UUS data." ); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_ACTIVATEUUS, "CMmCallMessHandler::ActivateUUS" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_ACTIVATEUUS_TD, "CMmCallMessHandler::ActivateUUS" ); TInt ret( KErrNone ); @@ -4604,7 +4632,7 @@ if ( RMobileCall::KUUS1Implicit != iUusData.iServiceReq ) { TFLOGSTRING2( "TSY: CMmCallMessHandler::ActivateUUS. Service type is not supported (%d)!", iUusData.iServiceReq ); -OstTrace1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_ACTIVATEUUS, "CMmCallMessHandler::ActivateUUS;Service type is not supported (%d)", iUusData.iServiceReq ); +OstTrace1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_ACTIVATEUUS_TD, "CMmCallMessHandler::ActivateUUS;Service type is not supported (%d)", iUusData.iServiceReq ); ret = KErrNotSupported; } @@ -4620,10 +4648,10 @@ void CMmCallMessHandler::InfoPpDataReadReq() { TFLOGSTRING( "TSY: CMmCallMessHandler::InfoPpDataReadReq" ); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_INFOPPDATAREADREQ, "CMmCallMessHandler::InfoPpDataReadReq" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_INFOPPDATAREADREQ_TD, "CMmCallMessHandler::InfoPpDataReadReq" ); // Create INFO_SB_PP_DATA subblock with only one PP feature (12 bytes) - TBuf8<12> infoSbPpBuf; + TBuf8 infoSbPpBuf; TIsiSubBlock infoSbPp( infoSbPpBuf, INFO_SB_PP_DATA, @@ -4649,7 +4677,7 @@ // Create INFO_PP_READ_REQ message: // batch mode (1) + number of SB (1) + INFO_SB_PP_DATA sub block with // only one PP feature (12) - TBuf8<14> infoPpReadReq; + TBuf8 infoPpReadReq; #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING infoPpReadReq.Append( INFO_PP_PROD_PROFILE_FEATURE ); // No batch reading #else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ @@ -4681,7 +4709,7 @@ TUint8 status = aIsiMessage.Get8bit( ISI_HEADER_SIZE + INFO_PP_DATA_READ_RESP_OFFSET_STATUS ); TFLOGSTRING2( "TSY: CMmCallMessHandler::InfoPpDataReadResp, status=%d.", status ); -OstTraceExt1( TRACE_NORMAL, CMMCALLMESSHANDLER_INFOPPDATAREADRESP, "CMmCallMessHandler::InfoPpDataReadResp;status=%hhu", status ); +OstTraceExt1( TRACE_NORMAL, CMMCALLMESSHANDLER_INFOPPDATAREADRESP_TD, "CMmCallMessHandler::InfoPpDataReadResp;status=%hhu", status ); // iHSDPADisabledInPp is EFalse by default, change only if PP bit // is set to "HSDPA_HSUPA_DISABLED". @@ -4702,7 +4730,7 @@ { iHSDPADisabledInPp = ETrue; TFLOGSTRING( "TSY: CMmCallMessHandler::InfoPpDataReadResp: HSDPA is disabled in PP." ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_INFOPPDATAREADRESP, "CMmCallMessHandler::InfoPpDataReadResp: HSDPA is disabled in PP" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_INFOPPDATAREADRESP_TD, "CMmCallMessHandler::InfoPpDataReadResp: HSDPA is disabled in PP" ); } // No else, ignore other values } // No else, ignore missing sub block } // No else, ignore failed reading @@ -4716,7 +4744,7 @@ void CMmCallMessHandler::GpdsContextsClearReq() { TFLOGSTRING( "TSY: CMmCallMessHandler::GpdsContextsClearReq" ); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_GPDSCONTEXTSCLEARREQ, "CMmCallMessHandler::GpdsContextsClearReq" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_GPDSCONTEXTSCLEARREQ_TD, "CMmCallMessHandler::GpdsContextsClearReq" ); // Start emergency timer iEmergencyTimer.StartEmergencyTimer(); @@ -4738,7 +4766,7 @@ void CMmCallMessHandler::GpdsContextsClearResp() { TFLOGSTRING( "TSY: CMmCallMessHandler::GpdsContextsClearResp" ); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_GPDSCONTEXTSCLEARRESP, "CMmCallMessHandler::GpdsContextsClearResp" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_GPDSCONTEXTSCLEARRESP_TD, "CMmCallMessHandler::GpdsContextsClearResp" ); // Stop emergency timer iEmergencyTimer.StopEmergencyTimer(); @@ -4748,7 +4776,7 @@ if ( iEmergCallDelayed ) { TFLOGSTRING( "TSY: CMmCallMessHandler::GpdsContextsClearResp - HSDPA workaround. Emergency call is created now." ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_GPDSCONTEXTSCLEARRESP, "CMmCallMessHandler::GpdsContextsClearResp - HSDPA workaround. Emergency call is created now" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_GPDSCONTEXTSCLEARRESP_TD, "CMmCallMessHandler::GpdsContextsClearResp - HSDPA workaround. Emergency call is created now" ); TIsiSend callReq( iPhoNetSender->SendBufferDes() ); TUint8 dosCallId( CALL_MODEM_ID_NONE ); @@ -4792,7 +4820,7 @@ { TFLOGSTRING("TSY: CMmCallMessHandler::GetCSDCallControlReqSubBlock"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK, "CMmCallMessHandler::GetCSDCallControlReqSubBlock" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK_TD, "CMmCallMessHandler::GetCSDCallControlReqSubBlock" ); iDestPostAddressIncluded = EFalse; @@ -4801,7 +4829,7 @@ TUint8 presentationInd( CSD_GSM_PRESENTATION_DEFAULT ); TFLOGSTRING2("TSY: CMmCallMessHandler::GetCSDCallControlReqSubBlock - aIdRestrict: %d", aIdRestrict); -OstTrace1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK, "CMmCallMessHandler::GetCSDCallControlReqSubBlock;aIdRestrict=%d", aIdRestrict ); +OstTrace1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK_TD, "CMmCallMessHandler::GetCSDCallControlReqSubBlock;aIdRestrict=%d", aIdRestrict ); if ( KTelephonyNumberMaxLength < telNumLength ) { @@ -4854,13 +4882,13 @@ { presentationInd = CSD_PRESENTATION_ALLOWED; TFLOGSTRING("TSY: CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by PREFIX = CSD_PRESENTATION_ALLOWED"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK, "CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by PREFIX = CSD_PRESENTATION_ALLOWED" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK_TD, "CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by PREFIX = CSD_PRESENTATION_ALLOWED" ); } else if ( '#' == ( aTelNumber )[0] ) { presentationInd = CSD_PRESENTATION_RESTRICTED; TFLOGSTRING("TSY: CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by PREFIX = CSD_PRESENTATION_RESTRICTED"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK, "CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by PREFIX = CSD_PRESENTATION_RESTRICTED" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK_TD, "CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by PREFIX = CSD_PRESENTATION_RESTRICTED" ); } } else @@ -4872,14 +4900,14 @@ { presentationInd = CSD_PRESENTATION_ALLOWED; //0x00 TFLOGSTRING("TSY: CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by aIdRestrict = CSD_PRESENTATION_ALLOWED"); -OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK, "CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by aIdRestrict = CSD_PRESENTATION_ALLOWED" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK_TD, "CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by aIdRestrict = CSD_PRESENTATION_ALLOWED" ); break; } case RMobileCall::EDontSendMyId: { presentationInd = CSD_PRESENTATION_RESTRICTED; //0x01 TFLOGSTRING("TSY: CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by aIdRestrict = CSD_PRESENTATION_RESTRICTED"); -OstTrace0( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK, "CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by aIdRestrict = CSD_PRESENTATION_RESTRICTED" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK_TD, "CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by aIdRestrict = CSD_PRESENTATION_RESTRICTED" ); break; } case RMobileCall::EIdRestrictDefault: @@ -4887,7 +4915,7 @@ { presentationInd = CSD_GSM_PRESENTATION_DEFAULT; //0x07 TFLOGSTRING("TSY: CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by aIdRestrict = CSD_GSM_PRESENTATION_DEFAULT"); -OstTrace0( TRACE_NORMAL, DUP6_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK, "CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by aIdRestrict = CSD_GSM_PRESENTATION_DEFAULT" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK_TD, "CMmCallMessHandler::GetCSDCallControlReqSubBlock -- presentationInd by aIdRestrict = CSD_GSM_PRESENTATION_DEFAULT" ); break; } } @@ -4956,10 +4984,10 @@ aNumOfSbInMsg++; TFLOGSTRING2("TSY: CMmCallMessHandler::GetCSDCallControlReqSubBlock - CSD_DESTINATION_ADDRESS - Subblock Count: %d", aNumOfSbInMsg ); -OstTrace1( TRACE_NORMAL, DUP10_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK, "CMmCallMessHandler::GetCSDCallControlReqSubBlock - CSD_DESTINATION_ADDRESS - Subblock Count: %d", aNumOfSbInMsg ); +OstTrace1( TRACE_NORMAL, DUP10_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK_TD, "CMmCallMessHandler::GetCSDCallControlReqSubBlock - CSD_DESTINATION_ADDRESS - Subblock Count: %d", aNumOfSbInMsg ); TFLOGSTRING2("TSY: CMmCallMessHandler::GetCSDCallControlReqSubBlock - destAddress: %S", &destAddress); -OstTraceExt2( TRACE_NORMAL, DUP11_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK, "CMmCallMessHandler::GetCSDCallControlReqSubBlock;destAddress=%d;iDataRateCode=%S", destAddress, iDataRateCode ); +OstTraceExt2( TRACE_NORMAL, DUP11_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK_TD, "CMmCallMessHandler::GetCSDCallControlReqSubBlock;destAddress=%d;iDataRateCode=%S", destAddress, iDataRateCode ); if ( preAddressSupported ) { @@ -4994,7 +5022,7 @@ aNumOfSbInMsg++; TFLOGSTRING2("TSY: CMmCallMessHandler::GetCSDCallControlReqSubBlock - CSD_DESTINATION_PRE_ADDRESS - Subblock Count: %d", aNumOfSbInMsg ); -OstTrace1( TRACE_NORMAL, DUP12_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK, "CMmCallMessHandler::GetCSDCallControlReqSubBlock - CSD_DESTINATION_PRE_ADDRESS - Subblock Count: %d", aNumOfSbInMsg ); +OstTrace1( TRACE_NORMAL, DUP12_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK_TD, "CMmCallMessHandler::GetCSDCallControlReqSubBlock - CSD_DESTINATION_PRE_ADDRESS - Subblock Count: %d", aNumOfSbInMsg ); } // No else @@ -5037,7 +5065,7 @@ iDestPostAddressIncluded = ETrue; TFLOGSTRING2("TSY: CMmCallMessHandler::GetCSDCallControlReqSubBlock - CSD_DESTINATION_POST_ADDRESS - Subblock Count: %d", aNumOfSbInMsg ); -OstTrace1( TRACE_NORMAL, DUP13_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK, "CMmCallMessHandler::GetCSDCallControlReqSubBlock - CSD_DESTINATION_POST_ADDRESS - Subblock Count: %d", aNumOfSbInMsg ); +OstTrace1( TRACE_NORMAL, DUP13_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK_TD, "CMmCallMessHandler::GetCSDCallControlReqSubBlock - CSD_DESTINATION_POST_ADDRESS - Subblock Count: %d", aNumOfSbInMsg ); } // No else @@ -5068,7 +5096,7 @@ aNumOfSbInMsg++; TFLOGSTRING2("TSY: CMmCallMessHandler::GetCSDCallControlReqSubBlock - CSD_CBST_PARAMS - Subblock Count: %d", aNumOfSbInMsg ); -OstTrace1( TRACE_NORMAL, DUP14_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK, "CMmCallMessHandler::GetCSDCallControlReqSubBlock - CSD_CBST_PARAMS - Subblock Count: %d", aNumOfSbInMsg ); +OstTrace1( TRACE_NORMAL, DUP14_CMMCALLMESSHANDLER_GETCSDCALLCONTROLREQSUBBLOCK_TD, "CMmCallMessHandler::GetCSDCallControlReqSubBlock - CSD_CBST_PARAMS - Subblock Count: %d", aNumOfSbInMsg ); } @@ -5081,7 +5109,7 @@ TInt CMmCallMessHandler::CsdCallControlReq( TUint8 aCallOperId ) { TFLOGSTRING( "TSY: CMmCallMessHandler::CsdCallControlReq" ); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CSDCALLCONTROLREQ, "CMmCallMessHandler::CsdCallControlReq" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CSDCALLCONTROLREQ_TD, "CMmCallMessHandler::CsdCallControlReq" ); TBuf8 data( 0 ); @@ -5135,20 +5163,20 @@ void CMmCallMessHandler::CsdCallControlResp( const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING( "TSY: CMmCallMessHandler::CsdCallControlResp" ); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CSDCALLCONTROLRESP, "CMmCallMessHandler::CsdCallControlResp" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CSDCALLCONTROLRESP_TD, "CMmCallMessHandler::CsdCallControlResp" ); // Get cause TUint8 causeValue( aIsiMessage.Get8bit( ISI_HEADER_SIZE + CSD_CALL_CONTROL_RESP_OFFSET_CAUSE ) ); TFLOGSTRING2( "TSY: CMmCallMessHandler::CsdCallControlResp. Cause value: %d", causeValue ); -OstTrace1( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_CSDCALLCONTROLRESP, "CMmCallMessHandler::CsdCallControlResp;causeValue=%d", causeValue ); +OstTrace1( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_CSDCALLCONTROLRESP_TD, "CMmCallMessHandler::CsdCallControlResp;causeValue=%d", causeValue ); TUint8 oper_Id( aIsiMessage.Get8bit( ISI_HEADER_SIZE + CSD_CALL_CONTROL_RESP_OFFSET_OPERID ) ); TFLOGSTRING2( "TSY: CMmCallMessHandler::CsdCallControlResp. Call operation id: %d", oper_Id ); -OstTrace1( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_CSDCALLCONTROLRESP, "CMmCallMessHandler::CsdCallControlResp;oper_Id=%d", oper_Id ); +OstTrace1( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_CSDCALLCONTROLRESP_TD, "CMmCallMessHandler::CsdCallControlResp;oper_Id=%d", oper_Id ); TInt result( KErrNone ); @@ -5210,7 +5238,7 @@ default: { TFLOGSTRING("TSY: CMmCallMessHandler::CsdCallControlResp. Switch oper_Id case default."); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CSDCALLCONTROLRESP, "CMmCallMessHandler::CsdCallControlResp, Switch oper_Id case default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CSDCALLCONTROLRESP_TD, "CMmCallMessHandler::CsdCallControlResp, Switch oper_Id case default" ); break; } } @@ -5225,7 +5253,7 @@ void CMmCallMessHandler::CsdVideoCallStatusInd( const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING( "TSY: CMmCallMessHandler::CsdVideoCallStatusInd" ); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CSDVIDEOCALLSTATUSIND, "CMmCallMessHandler::CsdVideoCallStatusInd" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CSDVIDEOCALLSTATUSIND_TD, "CMmCallMessHandler::CsdVideoCallStatusInd" ); iVideoCallStatus = aIsiMessage.Get8bit( ISI_HEADER_SIZE + CSD_VIDEO_CALL_STATUS_IND_OFFSET_STATUS ); @@ -5241,14 +5269,14 @@ if ( RMobileCall::EMobileOriginated == iCallDirection ) { TFLOGSTRING("TSY: CMmCallMessHandler::CsdVideoCallStatusInd: MO call connected"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_CSDVIDEOCALLSTATUSIND, "CMmCallMessHandler::CsdVideoCallStatusInd: MO call connected" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_CSDVIDEOCALLSTATUSIND_TD, "CMmCallMessHandler::CsdVideoCallStatusInd: MO call connected" ); iMessageRouter->Complete( EEtelCallDial, &callData, KErrNone ); } else if ( RMobileCall::EMobileTerminated == iCallDirection ) { TFLOGSTRING("TSY: CMmCallMessHandler::CsdVideoCallStatusInd: MT call connected"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_CSDVIDEOCALLSTATUSIND, "CMmCallMessHandler::CsdVideoCallStatusInd: MT call connected" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCALLMESSHANDLER_CSDVIDEOCALLSTATUSIND_TD, "CMmCallMessHandler::CsdVideoCallStatusInd: MT call connected" ); iMessageRouter->Complete( EEtelCallAnswer, &callData, KErrNone ); } @@ -5261,17 +5289,17 @@ if ( iIsWaitingCall ) { TFLOGSTRING("TSY: CMmCallMessHandler::CsdVideoCallStatusInd. call direction reset to MT"); -OstTrace0( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_CSDVIDEOCALLSTATUSIND, "CMmCallMessHandler::CsdVideoCallStatusInd. call direction reset to MT" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMCALLMESSHANDLER_CSDVIDEOCALLSTATUSIND_TD, "CMmCallMessHandler::CsdVideoCallStatusInd. call direction reset to MT" ); iCallDirection = RMobileCall::EMobileTerminated; } else { TFLOGSTRING("TSY: CMmCallMessHandler::CsdVideoCallStatusInd. call direction reset to unknown"); -OstTrace0( TRACE_NORMAL, DUP6_CMMCALLMESSHANDLER_CSDVIDEOCALLSTATUSIND, "CMmCallMessHandler::CsdVideoCallStatusInd. call direction reset to unknown" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMCALLMESSHANDLER_CSDVIDEOCALLSTATUSIND_TD, "CMmCallMessHandler::CsdVideoCallStatusInd. call direction reset to unknown" ); iCallDirection = RMobileCall::EDirectionUnknown; } TFLOGSTRING2( "TSY: CMmCallMessHandler::CsdVideoCallStatusInd. VideoCallStatus: %d", iVideoCallStatus ); -OstTrace1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CSDVIDEOCALLSTATUSIND, "CMmCallMessHandler::CsdVideoCallStatusInd. VideoCallStatus: %d", iVideoCallStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_CSDVIDEOCALLSTATUSIND_TD, "CMmCallMessHandler::CsdVideoCallStatusInd. VideoCallStatus: %d", iVideoCallStatus ); } // ----------------------------------------------------------------------------- @@ -5282,7 +5310,7 @@ void CMmCallMessHandler::CsdMultimediaDataRateInd( const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING( "TSY: CMmCallMessHandler::CsdMultimediaDataRateInd" ); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CSDMULTIMEDIADATARATEIND, "CMmCallMessHandler::CsdMultimediaDataRateInd" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_CSDMULTIMEDIADATARATEIND_TD, "CMmCallMessHandler::CsdMultimediaDataRateInd" ); // Current maximum bearer rate for multimedia call in bits/s TUint dataRate( aIsiMessage.Get8bit( @@ -5340,10 +5368,10 @@ { TFLOGSTRING3("TSY: CMmCallMessHandler::SetMobileCallInfo. Multimedia:%d, CallWaiting:%d", aIsMultimedia, aIsWaitingCall ); -OstTraceExt2( TRACE_NORMAL, CMMCALLMESSHANDLER_SETMOBILECALLINFO, "CMmCallMessHandler::SetMobileCallInfo;aIsMultimedia=%d;aIsWaitingCall=%d", aIsMultimedia, aIsWaitingCall ); +OstTraceExt2( TRACE_NORMAL, CMMCALLMESSHANDLER_SETMOBILECALLINFO_TD, "CMmCallMessHandler::SetMobileCallInfo;aIsMultimedia=%d;aIsWaitingCall=%d", aIsMultimedia, aIsWaitingCall ); TFLOGSTRING("TSY: CMmCallMessHandler::SetMobileCallInfo. iStatus != RMobileCall::EStatusIdle"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_SETMOBILECALLINFO, "CMmCallMessHandler::SetMobileCallInfo, iStatus != RMobileCall::EStatusIdle" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_SETMOBILECALLINFO_TD, "CMmCallMessHandler::SetMobileCallInfo, iStatus != RMobileCall::EStatusIdle" ); // Is call multimedia/video iIsMultimedia = aIsMultimedia; @@ -5456,7 +5484,7 @@ { TFLOGSTRING("TSY: CMmCallMessHandler::DialDataCall"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_DIALDATACALL, "CMmCallMessHandler::DialDataCall" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_DIALDATACALL_TD, "CMmCallMessHandler::DialDataCall" ); TInt ret( KErrNone ); RMobileCall::TMobileCallParamsV1Pckg* callParams( NULL ); @@ -5471,14 +5499,14 @@ if ( callParams && callInfo ) { TFLOGSTRING("TSY: CMmCallMessHandler::DialDataCall. callParams and callInfo ok." ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_DIALDATACALL, "CMmCallMessHandler::DialDataCall;callParams and callInfo ok." ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_DIALDATACALL_TD, "CMmCallMessHandler::DialDataCall;callParams and callInfo ok." ); // if CTSY does not set call id as valid we need to copy it from // data package if ( 0 == ( callInfo->iValid & RMobileCall::KCallId ) ) { TFLOGSTRING("TSY: CMmCallMessHandler::DialDataCall. Copy call mode into call info"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_DIALDATACALL, "CMmCallMessHandler::DialDataCall. Copy call mode into call info" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_DIALDATACALL_TD, "CMmCallMessHandler::DialDataCall. Copy call mode into call info" ); aDataPackage->GetCallIdAndMode( callInfo->iCallId, callInfo->iService ); // service is always valid @@ -5514,8 +5542,7 @@ { TFLOGSTRING("TSY: CMmCallMessHandler::AnswerIncomingDataCall"); -//OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_ANSWERINCOMINGDATACALL, "CMmCallMessHandler::AnswerIncomingDataCall" ); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_ANSWERINCOMINGDATACALL, "CMmCallMessHandler::AnswerIncomingDataCall" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_ANSWERINCOMINGDATACALL_TD, "CMmCallMessHandler::AnswerIncomingDataCall" ); TInt ret( KErrNone ); TInt callId( KCallIdNone ); @@ -5524,13 +5551,13 @@ aCallDataPackage->GetCallIdAndMode( callId, callMode ); TFLOGSTRING3("TSY: CMmCallMessHandler::AnswerIncomingDataCall. CallId:%d, CallMode:%d", callId, callMode); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_ANSWERINCOMINGDATACALL, "CMmCallMessHandler::AnswerIncomingDataCall;callId=%d;callMode=%d", callId, callMode ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_ANSWERINCOMINGDATACALL_TD, "CMmCallMessHandler::AnswerIncomingDataCall;callId=%d;callMode=%d", callId, callMode ); // If we are answering an incoming call, the call status is not idle if ( RMobileCall::EStatusIdle < iMobileCallInfo.iStatus ) { TFLOGSTRING("TSY: CMmCallMessHandler::AnswerIncomingDataCall. Send ATA"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_ANSWERINCOMINGDATACALL, "CMmCallMessHandler::AnswerIncomingDataCall, Send ATA" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCALLMESSHANDLER_ANSWERINCOMINGDATACALL_TD, "CMmCallMessHandler::AnswerIncomingDataCall, Send ATA" ); // Answer the call CsdCallControlReq( CSD_CALL_ANSWER ); @@ -5557,7 +5584,7 @@ const TInt aCallId ) { TFLOGSTRING2("TSY: CMmCallMessHandler::HangUp - Call Id: %d", aCallId); -OstTrace1( TRACE_NORMAL, CMMCALLMESSHANDLER_HANGUP, "CMmCallMessHandler::HangUp;aCallId=%d", aCallId ); +OstTrace1( TRACE_NORMAL, CMMCALLMESSHANDLER_HANGUP_TD, "CMmCallMessHandler::HangUp;aCallId=%d", aCallId ); TInt ret( KErrNone ); @@ -5588,19 +5615,16 @@ // Construct a PNS_PIPE_CREATE_REQ ISI-message // ---------------------------------------------------------------------------- // -TInt CMmCallMessHandler::PnsPipeCreateReq( const TUint8 aPipeStateAfter ) const +TInt CMmCallMessHandler::PnsPipeCreateReq() const { TFLOGSTRING("TSY: CMmCallMessHandler::PnsPipeCreateReq" ); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_PNSPIPECREATEREQ, "CMmCallMessHandler::PnsPipeCreateReq" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_PNSPIPECREATEREQ_TD, "CMmCallMessHandler::PnsPipeCreateReq" ); // create buffer for isi msg data -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING TBuf8 data; -#else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - TBuf8 data; -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ + // set message data - data.Append( aPipeStateAfter ); + data.Append( PN_PIPE_DISABLE ); data.Append( PN_MSG_PRIORITY_HIGH ); data.Append( KFirstPepDevice ); data.Append( EIscNokiaDataport1 ); @@ -5625,7 +5649,9 @@ const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmCallMessHandler::PnsPipeCreateResp"); -OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_PNSPIPECREATERESP, "CMmCallMessHandler::PnsPipeCreateResp" ); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_PNSPIPECREATERESP_TD, "CMmCallMessHandler::PnsPipeCreateResp" ); + + TInt err( KErrGeneral ); // Get transaction Id TUint8 transId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID ) ); @@ -5633,23 +5659,21 @@ if ( KPipeTransID == transId ) { iPipeHandle = aIsiMessage.Get8bit( -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING ISI_HEADER_SIZE + PNS_PIPE_CREATE_RESP_OFFSET_PIPEHANDLE ); -#else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - ISI_HEADER_SIZE + CM_PIPE_CREATE_RESP_OFFSET_PIPEHANDLE ); -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ TUint8 errorCode( aIsiMessage.Get8bit( -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING ISI_HEADER_SIZE + PNS_PIPE_CREATE_RESP_OFFSET_ERRORCODE ) ); -#else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - ISI_HEADER_SIZE + CM_PIPE_CREATE_RESP_OFFSET_ERRORCODE ) ); -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ TFLOGSTRING4("TSY: CMmCallMessHandler::PnsPipeCreateResp. TransactionId: %d, PipeHandle: %d, error code: %d", transId, iPipeHandle, errorCode ); -OstTraceExt3( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_PNSPIPECREATERESP, "CMmCallMessHandler::PnsPipeCreateResp;transId=%hhu;pipeHandle=%hhu;errorCode=%hhu", transId, iPipeHandle, errorCode ); - - if ( PN_PIPE_NO_ERROR != errorCode ) +OstTraceExt3( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_PNSPIPECREATERESP_TD, "CMmCallMessHandler::PnsPipeCreateResp;transId=%hhu;pipeHandle=%hhu;errorCode=%hhu", transId, iPipeHandle, errorCode ); + + if ( PN_PIPE_NO_ERROR == errorCode ) + { + err = PnsPipeEnableReq(); + } + // no else + + if ( KErrNone != err ) { delete iDataPortHandler; iDataPortHandler = NULL; @@ -5667,20 +5691,16 @@ TInt CMmCallMessHandler::PnsPipeRemoveReq() { TFLOGSTRING2("TSY: CMmCallMessHandler::PnsPipeRemoveReq. PipeHandle: %d", iPipeHandle ); -OstTraceExt1( TRACE_NORMAL, CMMCALLMESSHANDLER_PNSPIPEREMOVEREQ, "CMmCallMessHandler::PnsPipeRemoveReq;aPipeHandle=%hhu", iPipeHandle ); - - iPipeHandle = KInvalidPipeHandle; +OstTraceExt1( TRACE_NORMAL, CMMCALLMESSHANDLER_PNSPIPEREMOVEREQ_TD, "CMmCallMessHandler::PnsPipeRemoveReq;aPipeHandle=%hhu", iPipeHandle ); // Create buffer for isi msg data -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING TBuf8 data; -#else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - TBuf8 data; -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ data.Append( iPipeHandle ); data.Append( KCallPadding ); + iPipeHandle = KInvalidPipeHandle; + // Send Isi message via phonet return iPhoNetSender->Send( PN_PIPE, @@ -5689,6 +5709,57 @@ data ); } +// ---------------------------------------------------------------------------- +// CMmCallMessHandler::PnsPipeEnableReq +// Builds PNS_PIPE_ENABLE_REQ ISI message and sends it to Phonet. +// ---------------------------------------------------------------------------- +// +TInt CMmCallMessHandler::PnsPipeEnableReq() const + { +TFLOGSTRING("TSY: CMmCallMessHandler::PnsPipeEnableReq"); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_PNSPIPEENABLEREQ_TD, "CMmCallMessHandler::PnsPipeEnableReq" ); + // create buffer for isi msg data + TBuf8 data; + + // set message data + data.Append( iPipeHandle ); + data.Append( KCallPadding ); + + // Sending message to phonet + return iPhoNetSender->Send( + PN_PIPE, KPipeTransID, PNS_PIPE_ENABLE_REQ, data ); + } + +// ---------------------------------------------------------------------------- +// CMmCallMessHandler::PnsPipeEnableResp +// Handles PNS_PIPE_ENABLE_RESP. +// ---------------------------------------------------------------------------- +// +void CMmCallMessHandler::PnsPipeEnableResp( const TIsiReceiveC &aIsiMessage ) + { +TFLOGSTRING("TSY: CMmCallMessHandler::PnsPipeEnableResp"); +OstTrace0( TRACE_NORMAL, CMMCALLMESSHANDLER_PNSPIPEENABLERESP_TD, "CMmCallMessHandler::PnsPipeEnableResp" ); + + // Get transaction Id + TUint8 transId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID ) ); + + if ( KPipeTransID == transId ) + { + TUint8 errorCode( aIsiMessage.Get8bit( + ISI_HEADER_SIZE + PNS_PIPE_ENABLE_RESP_OFFSET_ERRORCODE ) ); + +TFLOGSTRING2("TSY: CMmCallMessHandler::PnsPipeEnableResp;errorCode=%d", errorCode); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMCALLMESSHANDLER_PNSPIPEENABLERESP_TD, "CMmCallMessHandler::PnsPipeEnableResp;errorCode=%hhu", errorCode ); + + if ( PN_PIPE_NO_ERROR != errorCode ) + { + PnsPipeRemoveReq(); + delete iDataPortHandler; + iDataPortHandler = NULL; + } + // no else + } + } // ========================== OTHER EXPORTED FUNCTIONS ========================= // None diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmconferencecallmesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmconferencecallmesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmconferencecallmesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -70,7 +70,7 @@ { // None TFLOGSTRING("TSY: CMmConferenceCallMessHandler::CMmConferenceCallMessHandler"); -OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_CMMCONFERENCECALLMESSHANDLER, "CMmConferenceCallMessHandler::CMmConferenceCallMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_CMMCONFERENCECALLMESSHANDLER_TD, "CMmConferenceCallMessHandler::CMmConferenceCallMessHandler" ); } // ----------------------------------------------------------------------------- @@ -85,7 +85,7 @@ ) { TFLOGSTRING("TSY: CMmConferenceCallMessHandler::NewL"); -OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_NEWL, "CMmConferenceCallMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_NEWL_TD, "CMmConferenceCallMessHandler::NewL" ); CMmConferenceCallMessHandler* conferenceCallMessHandler = new ( ELeave ) CMmConferenceCallMessHandler(); @@ -121,7 +121,7 @@ void CMmConferenceCallMessHandler::ConstructL() { TFLOGSTRING("TSY: CMmConferenceCallMessHandler::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_CONSTRUCTL, "CMmConferenceCallMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_CONSTRUCTL_TD, "CMmConferenceCallMessHandler::ConstructL" ); iIsCreateConference = EFalse; iLastOperation = 0; @@ -135,7 +135,7 @@ CMmConferenceCallMessHandler::~CMmConferenceCallMessHandler() { TFLOGSTRING("TSY: CMmConferenceCallMessHandler::~CMmConferenceCallMessHandler"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCONFERENCECALLMESSHANDLER_CMMCONFERENCECALLMESSHANDLER, "CMmConferenceCallMessHandler::~CMmConferenceCallMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCONFERENCECALLMESSHANDLER_CMMCONFERENCECALLMESSHANDLER_TD, "CMmConferenceCallMessHandler::~CMmConferenceCallMessHandler" ); } // ----------------------------------------------------------------------------- @@ -149,7 +149,7 @@ const CMmDataPackage* aDataPackage ) { TFLOGSTRING2("TSY: CMmConferenceCallMessHandler::ExtFuncL. Ipc:%d", aIpc); -OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_EXTFUNCL, "CMmConferenceCallMessHandler::ExtFuncL" ); +OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_EXTFUNCL_TD, "CMmConferenceCallMessHandler::ExtFuncL" ); TInt ret( KErrNone ); TUint8 transId( KConferenceCallTransId ); @@ -234,7 +234,7 @@ default: { TFLOGSTRING2("TSY: CMmConferenceCallMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP1_CMMCONFERENCECALLMESSHANDLER_EXTFUNCL, "CMmConferenceCallMessHandler::ExtFuncL - Unknown IPC=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP1_CMMCONFERENCECALLMESSHANDLER_EXTFUNCL_TD, "CMmConferenceCallMessHandler::ExtFuncL - Unknown IPC=%d", aIpc ); ret = KErrNotSupported; break; } @@ -252,7 +252,7 @@ const TInt aETelCallId ) { TFLOGSTRING("TSY: CMmConferenceCallMessHandler::MapETelCallIdToISACallId"); -OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_MAPETELCALLIDTOISACALLID, "CMmConferenceCallMessHandler::MapETelCallIdToISACallId" ); +OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_MAPETELCALLIDTOISACALLID_TD, "CMmConferenceCallMessHandler::MapETelCallIdToISACallId" ); TUint8 callId( CALL_MODEM_ID_NONE ); @@ -277,7 +277,7 @@ const TIsiReceiveC& aIsiMsg ) { TFLOGSTRING("TSY: CMmConferenceCallMessHandler::ReceiveMessageL."); -OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_RECEIVEMESSAGEL, "CMmConferenceCallMessHandler::ReceiveMessageL" ); +OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmConferenceCallMessHandler::ReceiveMessageL" ); TInt resource( aIsiMsg.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) ); TInt messageId( aIsiMsg.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); @@ -306,7 +306,7 @@ default: { TFLOGSTRING("TSY: CMmConferenceCallMessHandler::ReceiveMessageL. PN_CALL Switch messageID case default."); -OstTrace0( TRACE_NORMAL, DUP1_CMMCONFERENCECALLMESSHANDLER_RECEIVEMESSAGEL, "CMmConferenceCallMessHandler::ReceiveMessageL. PN_CALL Switch messageID case default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCONFERENCECALLMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmConferenceCallMessHandler::ReceiveMessageL. PN_CALL Switch messageID case default" ); break; } } @@ -315,7 +315,7 @@ default: { TFLOGSTRING("TSY: CMmConferenceCallMessHandler::ReceiveMessageL. Switch resource case default."); -OstTrace0( TRACE_NORMAL, DUP2_CMMCONFERENCECALLMESSHANDLER_RECEIVEMESSAGEL, "CMmConferenceCallMessHandler::ReceiveMessageL. Switch resource case default" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCONFERENCECALLMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmConferenceCallMessHandler::ReceiveMessageL. Switch resource case default" ); break; } } @@ -333,7 +333,7 @@ TBool aIsCreateConference ) { TFLOGSTRING("TSY: CMmConferenceCallMessHandler::CallControlReq"); -OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_CALLCONTROLREQ, "CMmConferenceCallMessHandler::CallControlReq" ); +OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_CALLCONTROLREQ_TD, "CMmConferenceCallMessHandler::CallControlReq" ); // Data for ISI message TBuf8<2 + SIZE_CALL_MODEM_SB_OPERATION> messageBuf; @@ -375,7 +375,7 @@ const TIsiReceiveC& aIsiMsg ) { TFLOGSTRING("TSY: CMmConferenceCallMessHandler::CallControlResp"); -OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_CALLCONTROLRESP, "CMmConferenceCallMessHandler::CallControlResp" ); +OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_CALLCONTROLRESP_TD, "CMmConferenceCallMessHandler::CallControlResp" ); TUint sbStartOffSet( 0 ); @@ -448,7 +448,7 @@ const TIsiReceiveC& aIsiMsg ) { TFLOGSTRING("TSY: CMmConferenceCallMessHandler::CallControlInd"); -OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_CALLCONTROLIND, "CMmConferenceCallMessHandler::CallControlInd" ); +OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_CALLCONTROLIND_TD, "CMmConferenceCallMessHandler::CallControlInd" ); TUint sbStartOffSet( 0 ); @@ -529,7 +529,7 @@ sbStartOffSet + CALL_MODEM_SB_OPERATION_OFFSET_OPERATION ); TFLOGSTRING2("TSY: CMmConferenceCallMessHandler::CallControlInd - Call operation: %d", callOperation); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMCONFERENCECALLMESSHANDLER_CALLCONTROLIND, "CMmConferenceCallMessHandler::CallControlInd;callOperation=%hhu", callOperation ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMCONFERENCECALLMESSHANDLER_CALLCONTROLIND_TD, "CMmConferenceCallMessHandler::CallControlInd;callOperation=%hhu", callOperation ); // Purpose of this case is to prepare handling of externally // controlled conference call switch ( callOperation ) @@ -600,7 +600,7 @@ TUint8 aCause ) { TFLOGSTRING("TSY: CMmConferenceCallMessHandler::CallReleaseReq"); -OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_CALLRELEASEREQ, "CMmConferenceCallMessHandler::CallReleaseReq" ); +OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_CALLRELEASEREQ_TD, "CMmConferenceCallMessHandler::CallReleaseReq" ); // Create isi message TIsiSend callreleaseReq( iPhoNetSender->SendBufferDes() ); @@ -682,7 +682,7 @@ const TIsiReceiveC& aIsiMsg ) { TFLOGSTRING("TSY: CMmConferenceCallMessHandler::CallReleaseResp"); -OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_CALLRELEASERESP, "CMmConferenceCallMessHandler::CallReleaseResp" ); +OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_CALLRELEASERESP_TD, "CMmConferenceCallMessHandler::CallReleaseResp" ); TUint sbStartOffSet( 0 ); @@ -732,7 +732,7 @@ TInt /*aError*/ ) { TFLOGSTRING("TSY: CMmConferenceCallMessHandler::HandleError"); -OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_HANDLEERROR, "CMmConferenceCallMessHandler::HandleError" ); +OstTrace0( TRACE_NORMAL, CMMCONFERENCECALLMESSHANDLER_HANDLEERROR_TD, "CMmConferenceCallMessHandler::HandleError" ); // None } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmcustommesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmcustommesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmcustommesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 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" @@ -36,7 +36,7 @@ #include #include #include -// #include To be done in CPS +// #include #include #include @@ -167,7 +167,7 @@ CMmCustomMessHandler::CMmCustomMessHandler() { TFLOGSTRING("TSY: CMmCustomMessHandler::CMmCustomMessHandler.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CMMCUSTOMMESSHANDLER, "CMmCustomMessHandler::CMmCustomMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CMMCUSTOMMESSHANDLER_TD, "CMmCustomMessHandler::CMmCustomMessHandler" ); iSimCBTopicToBeDeleted = KUnusedCbMsgId; // Set to true because it doesn't delete topic at start up iTopicInSimMemoryDelete = ETrue; @@ -181,7 +181,7 @@ CMmCustomMessHandler::~CMmCustomMessHandler() { TFLOGSTRING("TSY: CMmCustomMessHandler::~CMmCustomMessHandler.\n" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_CMMCUSTOMMESSHANDLER, "CMmCustomMessHandler::~CMmCustomMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_CMMCUSTOMMESSHANDLER_TD, "CMmCustomMessHandler::~CMmCustomMessHandler" ); if( iListOfCiphValues ) { @@ -208,7 +208,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::NewL.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NEWL, "CMmCustomMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NEWL_TD, "CMmCustomMessHandler::NewL" ); CMmCustomMessHandler* customMessHandler = new( ELeave ) CMmCustomMessHandler(); @@ -234,7 +234,7 @@ #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING -// TO BE DONE WITH INFO_PP_DATA_READ_RESP + aPhoNetReceiver->RegisterL( customMessHandler, PN_INFO, @@ -277,7 +277,7 @@ GSS_HSXPA_USER_SETTING_IND ); // PMM - /* To be done in CPS + /* aPhoNetReceiver->RegisterL( customMessHandler, PN_PERMANENT_DATA, PERM_PM_RECORD_READ_RESP ); @@ -309,7 +309,7 @@ void CMmCustomMessHandler::ConstructL() { TFLOGSTRING("TSY: CMmCustomMessHandler::ConstructL.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CONSTRUCTL, "CMmCustomMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CONSTRUCTL_TD, "CMmCustomMessHandler::ConstructL" ); // Initialize iListOfCiphValues iListOfCiphValues = new ( ELeave ) RArray( 1 ); @@ -349,7 +349,7 @@ TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); TFLOGSTRING3("TSY: CMmCustomMessHandler::ReceiveMessageL, Resource: %d, Message: %d", resource, messageId); -OstTraceExt2( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL, "CMmCustomMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); +OstTraceExt2( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCustomMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); switch( resource ) { @@ -397,7 +397,7 @@ default: { TFLOGSTRING("TSY: CMmCustomMessHandler::ReceiveMessageL - switch resource - case PN_MODEM_CALL, switch messageId - default"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL, "CMmCustomMessHandler::ReceiveMessageL- switch resource - case PN_CALL, switch messageId - default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCustomMessHandler::ReceiveMessageL- switch resource - case PN_CALL, switch messageId - default" ); break; } } @@ -437,7 +437,7 @@ default: { TFLOGSTRING("TSY: CMmCustomMessHandler::ReceiveMessageL - switch resource - case PN_GSS, switch messageId - default"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL, "CMmCustomMessHandler::ReceiveMessageL- switch resource - case PN_GSS, switch messageId - default" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCustomMessHandler::ReceiveMessageL- switch resource - case PN_GSS, switch messageId - default" ); break; } } @@ -487,7 +487,7 @@ default: { TFLOGSTRING("TSY: CMmCustomMessHandler::ReceiveMessageL - switch resource - case PN_MODEM_NETWORK, switch messageId - default"); -OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL, "CMmCustomMessHandler::ReceiveMessageL- switch resource - case PN_MODEM_NETWORK, switch messageId - default" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCustomMessHandler::ReceiveMessageL- switch resource - case PN_MODEM_NETWORK, switch messageId - default" ); break; } } @@ -504,7 +504,6 @@ switch( messageId ) { #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING - // TO BE DONE WITH INFO_PP_DATA_READ_RESP case INFO_PP_READ_RESP: { InfoPpReadResp( aIsiMessage ); @@ -514,7 +513,7 @@ default: { TFLOGSTRING("TSY: CMmCustomMessHandler::ReceiveMessageL - switch resource - case PN_INFO, switch messageId - default"); -OstTrace0( TRACE_NORMAL, DUP6_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL, "CMmCustomMessHandler::ReceiveMessageL- switch resource - case PN_INFO, switch messageId - default" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCustomMessHandler::ReceiveMessageL- switch resource - case PN_INFO, switch messageId - default" ); break; } } @@ -542,13 +541,13 @@ default: { TFLOGSTRING("TSY: CMmCustomMessHandler::ReceiveMessageL - switch resource - case PN_SS, switch messageId - default"); -OstTrace0( TRACE_NORMAL, DUP12_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL, "CMmCustomMessHandler::ReceiveMessageL- switch resource - case PN_SS, switch messageId - default" ); +OstTrace0( TRACE_NORMAL, DUP12_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCustomMessHandler::ReceiveMessageL- switch resource - case PN_SS, switch messageId - default" ); break; } } break; } - /* To be done in CPS + /* case PN_PERMANENT_DATA: { if ( KCustomTransId == aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID ) ) @@ -571,13 +570,13 @@ { TFLOGSTRING("TSY: CMmCustomMessHandler::ReceiveMessageL\ - switch resource - case PN_PERMANENT_DATA, switch messageId - default.\n"); -OstTrace0( TRACE_NORMAL, DUP16_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL, "CMmCustomMessHandler::ReceiveMessageL - switch resource - case PN_PERMANENT_DATA, switch messageId - default." ); +OstTrace0( TRACE_NORMAL, DUP16_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCustomMessHandler::ReceiveMessageL - switch resource - case PN_PERMANENT_DATA, switch messageId - default." ); break; } } TFLOGSTRING("TSY: CMmCustomMessHandler::ReceiveMessageL\ - switch resource - case PN_PERMANENT_DATA, transaction id is not KCustomTransId\n"); -OstTrace0( TRACE_NORMAL, DUP14_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL, "CMmCustomMessHandler::ReceiveMessageL - switch resource - case PN_PERMANENT_DATA, transaction id is not KCustomTransId" ); +OstTrace0( TRACE_NORMAL, DUP14_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCustomMessHandler::ReceiveMessageL - switch resource - case PN_PERMANENT_DATA, transaction id is not KCustomTransId" ); } break; }*/ @@ -593,7 +592,7 @@ default: { TFLOGSTRING("TSY: CMmCustomMessHandler::ReceiveMessageL - switch resource - default" ); -OstTrace0( TRACE_NORMAL, DUP13_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL, "CMmCustomMessHandler::ReceiveMessageL- switch resource - default" ); +OstTrace0( TRACE_NORMAL, DUP13_CMMCUSTOMMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmCustomMessHandler::ReceiveMessageL- switch resource - default" ); break; // server not known } } // end of switch @@ -614,7 +613,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CallReleaseReq.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLRELEASEREQ, "CMmCustomMessHandler::CallReleaseReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLRELEASEREQ_TD, "CMmCustomMessHandler::CallReleaseReq" ); iReleaseCauseValueSent = aCause; @@ -648,7 +647,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CallReleaseResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLRELEASERESP, "CMmCustomMessHandler::CallReleaseResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLRELEASERESP_TD, "CMmCustomMessHandler::CallReleaseResp" ); //initialize the causeType and causeValue TUint8 causeType = 0; @@ -696,7 +695,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CallMoAlertInd."); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLMOALERTIND, "CMmCustomMessHandler::CallMoAlertInd" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLMOALERTIND_TD, "CMmCustomMessHandler::CallMoAlertInd" ); TBool playRemoteAlertToneLocally( EFalse ); TUint sbStartOffSet( 0 ); @@ -711,7 +710,7 @@ { TFLOGSTRING("TSY: CMmCustomMessHandler::CallMoAlertInd,\ - CALL_MODEM_SB_ALERTING_INFO sub block found."); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_CALLMOALERTIND, "CMmCustomMessHandler::CallMoAlertInd, CALL_MODEM_SB_ALERTING_INFO sub block found" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_CALLMOALERTIND_TD, "CMmCustomMessHandler::CallMoAlertInd, CALL_MODEM_SB_ALERTING_INFO sub block found" ); // Get alerting info TUint8 callAlertingInfo( aIsiMsg.Get8bit( @@ -742,7 +741,7 @@ TInt CMmCustomMessHandler::UiccReadCiReq( TInt aTrId ) { TFLOGSTRING2("TSY: CMmCustomMessHandler::UiccReadCiReq, transaction ID: %d", aTrId ); -OstTrace1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADCIREQ, "CMmCustomMessHandler::UiccReadCiReq;aTrId=%d", aTrId ); +OstTrace1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADCIREQ_TD, "CMmCustomMessHandler::UiccReadCiReq;aTrId=%d", aTrId ); // Set parameters for UICC_APPL_CMD_REQ message TUiccReadTransparent params; @@ -776,7 +775,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccReadCiResp" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADCIRESP, "CMmCustomMessHandler::UiccReadCiResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADCIRESP_TD, "CMmCustomMessHandler::UiccReadCiResp" ); TInt ret( KErrNone ); TBool cipherIndicatorStatus( EFalse ); @@ -851,7 +850,7 @@ TInt CMmCustomMessHandler::NetCsWakeupReq( TUint8 aTransId ) { TFLOGSTRING("TSY: CMmCustomMessHandler::NetCsWakeupReq.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETCSWAKEUPREQ, "CMmCustomMessHandler::NetCsWakeupReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETCSWAKEUPREQ_TD, "CMmCustomMessHandler::NetCsWakeupReq" ); //Data buffer length is 2 TBuf8<2> data; @@ -875,7 +874,7 @@ void CMmCustomMessHandler::NetCsWakeupResp() { TFLOGSTRING("TSY: CMmCustomMessHandler::NetCsWakeupResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETCSWAKEUPRESP, "CMmCustomMessHandler::NetCsWakeupResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETCSWAKEUPRESP_TD, "CMmCustomMessHandler::NetCsWakeupResp" ); //getting this message indicates that the wakeup was successful //complete NetWakeup method (no packed parameters) @@ -895,7 +894,7 @@ const TIsiReceiveC &aIsiMsg ) { TFLOGSTRING("TSY: CMmCustomMessHandler::NetCipheringInd.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETCIPHERINGIND, "CMmCustomMessHandler::NetCipheringInd" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETCIPHERINGIND_TD, "CMmCustomMessHandler::NetCipheringInd" ); //set chipering to False TBool cipher( EFalse ); @@ -938,7 +937,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::NetModemRegStatusInd"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETMODEMREGSTATUSIND, "CMmCustomMessHandler::NetModemRegStatusInd" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETMODEMREGSTATUSIND_TD, "CMmCustomMessHandler::NetModemRegStatusInd" ); if ( 0 != aIsiMsg.Get8bit( ISI_HEADER_SIZE + @@ -974,7 +973,7 @@ case NET_REG_STATUS_NOSERV_SIM_REJECTED_BY_NW: { TFLOGSTRING("TSY: CMmCustomMessHandler::NetModemRegStatusInd, No SIM"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_NETMODEMREGSTATUSIND, "CMmCustomMessHandler::NetModemRegStatusInd, No SIM" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_NETMODEMREGSTATUSIND_TD, "CMmCustomMessHandler::NetModemRegStatusInd, No SIM" ); // Complete NetworkConnectionFailure notification // (no packed parameters). // If puk code is required notification shouldn't @@ -983,7 +982,7 @@ if( !pukCodeRequired ) { TFLOGSTRING("TSY: CMmCustomMessHandler::NetModemRegStatusInd - Complete network connection failure"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_NETMODEMREGSTATUSIND, "CMmCustomMessHandler::NetModemRegStatusInd - Complete network connection failure" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_NETMODEMREGSTATUSIND_TD, "CMmCustomMessHandler::NetModemRegStatusInd - Complete network connection failure" ); iMessageRouter->Complete( ECustomNotifyNetworkConnectionFailureIPC, @@ -994,7 +993,7 @@ default: { TFLOGSTRING("TSY: CMmCustomMessHandler::NetModemRegStatusInd, switch registrationStatus - default"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_NETMODEMREGSTATUSIND, "CMmCustomMessHandler::NetModemRegStatusInd, switch registrationStatus - default" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_NETMODEMREGSTATUSIND_TD, "CMmCustomMessHandler::NetModemRegStatusInd, switch registrationStatus - default" ); break; } } @@ -1025,7 +1024,7 @@ TInt CMmCustomMessHandler::UiccReadDynamic2FlagsReq() { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccReadDynamic2FlagsReq"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADDYNAMIC2FLAGSREQ, "CMmCustomMessHandler::UiccReadDynamic2FlagsReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADDYNAMIC2FLAGSREQ_TD, "CMmCustomMessHandler::UiccReadDynamic2FlagsReq" ); // Set parameters for UICC_APPL_CMD_REQ message TUiccWriteTransparent params; params.messHandlerPtr = static_cast( this ); @@ -1053,7 +1052,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccReadDynamic2FlagsResp"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADDYNAMIC2FLAGSRESP, "CMmCustomMessHandler::UiccReadDynamic2FlagsResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADDYNAMIC2FLAGSRESP_TD, "CMmCustomMessHandler::UiccReadDynamic2FlagsResp" ); TInt ret( KErrNone ); RMmCustomAPI::TGetAlsBlockStatus blockStatus @@ -1094,7 +1093,7 @@ TInt CMmCustomMessHandler::UiccWriteDynamic2FlagsReq( TUint8 aInfo ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccWriteDynamic2FlagsReq"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCWRITEDYNAMIC2FLAGSREQ, "CMmCustomMessHandler::UiccWriteDynamic2FlagsReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCWRITEDYNAMIC2FLAGSREQ_TD, "CMmCustomMessHandler::UiccWriteDynamic2FlagsReq" ); // Set parameters for UICC_APPL_CMD_REQ message TUiccWriteTransparent params; @@ -1123,7 +1122,7 @@ void CMmCustomMessHandler::UiccWriteDynamic2FlagsResp( TInt aStatus ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccWriteDynamic2FlagsReq"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCWRITEDYNAMIC2FLAGSRESP, "CMmCustomMessHandler::UiccWriteDynamic2FlagsResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCWRITEDYNAMIC2FLAGSRESP_TD, "CMmCustomMessHandler::UiccWriteDynamic2FlagsResp" ); TInt ret( KErrNone ); @@ -1149,7 +1148,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CallTerminateInd.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLTERMINATEIND, "CMmCustomMessHandler::CallTerminateInd" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLTERMINATEIND_TD, "CMmCustomMessHandler::CallTerminateInd" ); //unique call id (without possible generic id) TInt callId = static_cast( aIsiMsg.Get8bit( ISI_HEADER_SIZE + @@ -1179,7 +1178,7 @@ ssDiagnostics |= 0x80; // binary 10000000 TFLOGSTRING3("TSY:CMmCustomMessHandler::CallTerminatedInd: Diagnostic octet=%d received for call id=%d", ssDiagnostics, callId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_CALLTERMINATEIND, "CMmCustomMessHandler::CallTerminateInd;Diagnostic octet==%hhu received for call id=%d", ssDiagnostics, callId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_CALLTERMINATEIND_TD, "CMmCustomMessHandler::CallTerminateInd;Diagnostic octet==%hhu received for call id=%d", ssDiagnostics, callId ); } } @@ -1207,7 +1206,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CallReleaseInd.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLRELEASEIND, "CMmCustomMessHandler::CallReleaseInd" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLRELEASEIND_TD, "CMmCustomMessHandler::CallReleaseInd" ); //unique call id (without possible generic id) TInt callId = static_cast( aIsiMsg.Get8bit( ISI_HEADER_SIZE + @@ -1237,7 +1236,7 @@ ssDiagnostics |= 0x80; // binary 10000000 TFLOGSTRING3("TSY:CMmCustomMessHandler::CallReleaseInd: Diagnostic octet=%d received for call id=%d", ssDiagnostics, callId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_CALLRELEASEIND, "CMmCustomMessHandler::CallReleaseInd;Diagnostic octet==%hhu received for call id=%d", ssDiagnostics, callId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_CALLRELEASEIND_TD, "CMmCustomMessHandler::CallReleaseInd;Diagnostic octet==%hhu received for call id=%d", ssDiagnostics, callId ); } } @@ -1266,7 +1265,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::InfoPpReadReq.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_INFOPPREADREQ, "CMmCustomMessHandler::InfoPpReadReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_INFOPPREADREQ_TD, "CMmCustomMessHandler::InfoPpReadReq" ); #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING //create the buffer for SB_PP subblock @@ -1289,18 +1288,18 @@ { sbPPSubBlockBuf.Append( KinfoPpTwoDigitDial ); } - else - { - // not supported - return KErrArgument; - } + else + { + // not supported + return KErrArgument; + } //value of the product profile is 0x00, not need cause we are reading sbPPSubBlockBuf.Append( 0x00 ); - // Construct INFO_PP_READ_REQ message (1 data byte + - // sub block count + INFO_SB_PP sub block) - TBuf8< 2 + SIZE_INFO_SB_PP > infoPpReadReq; + // Construct INFO_PP_READ_REQ message (1 data byte + + // sub block count + INFO_SB_PP sub block) + TBuf8< 2 + SIZE_INFO_SB_PP > infoPpReadReq; //set pp batch reading to read specific product profile, thus 0. infoPpReadReq.Append( INFO_PP_PROD_PROFILE_FEATURE ); @@ -1310,8 +1309,8 @@ infoPpReadReq.Append( sbPPSubBlock.CompleteSubBlock() ); //create the isi message - //transaction id = request type - TUint8 transId = static_cast( aReqType ); + //transaction id = request type + TUint8 transId = static_cast( aReqType ); return iPhoNetSender->Send( PN_INFO, transId, INFO_PP_READ_REQ, infoPpReadReq ); @@ -1334,7 +1333,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::InfoPpReadResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_INFOPPREADRESP, "CMmCustomMessHandler::InfoPpReadResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_INFOPPREADRESP_TD, "CMmCustomMessHandler::InfoPpReadResp" ); #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING TInt errorValue( KErrGeneral ); @@ -1348,18 +1347,14 @@ RMmCustomAPI::TTwoDigitDialSupport twoDigitDialSupport( RMmCustomAPI::ETwoDigitDialSupportOff ); - TFLOGSTRING2("TSY: CMmCustomMessHandler::InfoPpReadResp - Status: %d", - status ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_INFOPPREADRESP, "CMmCustomMessHandler::InfoPpReadResp;status=%hhu", status ); +TFLOGSTRING2("TSY: CMmCustomMessHandler::InfoPpReadResp - Status: %d", status ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_INFOPPREADRESP_TD, "CMmCustomMessHandler::InfoPpReadResp;status=%hhu", status ); switch ( status ) { case INFO_OK: { - - TUint sbInfoPpReadStartOffset( 0 ); - - + TUint sbInfoPpReadStartOffset(0); if ( KErrNone == aIsiMessage.FindSubBlockOffsetById( ISI_HEADER_SIZE + SIZE_INFO_PP_READ_RESP, INFO_SB_PP, EIsiSubBlockTypeId8Len8, sbInfoPpReadStartOffset ) ) @@ -1369,8 +1364,7 @@ TFLOGSTRING2("TSY: CMmCustomMessHandler::InfoPpReadResp - Info length: %d", length ); -OstTrace1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_INFOPPREADRESP, "CMmCustomMessHandler::InfoPpReadResp - Info length=%d", length ); - +OstTrace1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_INFOPPREADRESP_TD, "CMmCustomMessHandler::InfoPpReadResp - Info length=%d", length ); if ( 1 == length ) { //introduce the pPFeatures buffer to hold the feature value, @@ -1383,7 +1377,7 @@ TFLOGSTRING2("TSY: CMmCustomMessHandler::InfoPpReadResp - Info data: %S", &pPFeatures ); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_INFOPPREADRESP, "CMmCustomMessHandler::InfoPpReadResp;pPfeatures=%s", pPFeatures ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_INFOPPREADRESP_TD, "CMmCustomMessHandler::InfoPpReadResp;pPfeatures=%s", pPFeatures ); //check that product profile is requested one if ( INFO_PP_ALS == pPFeatures [0] ) @@ -1392,7 +1386,7 @@ if ( 0 != pPFeatures [1] ) { TFLOGSTRING("TSY: CMmCustomMessHandler::InfoPpReadResp - EAlsSupportOn"); -OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_INFOPPREADRESP, "CMmCustomMessHandler::InfoPpReadResp - EAlsSupportOn" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_INFOPPREADRESP_TD, "CMmCustomMessHandler::InfoPpReadResp - EAlsSupportOn" ); alsSupport = RMmCustomAPI::EAlsSupportOn; } //set the error value to KErrNone @@ -1404,16 +1398,14 @@ if ( 0 != pPFeatures [1] ) { TFLOGSTRING("TSY: CMmCustomMessHandler::InfoPpReadResp - EAlsSupportOff"); -OstTrace0( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_INFOPPREADRESP, "CMmCustomMessHandler::InfoPpReadResp - EAlsSupportOff" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_INFOPPREADRESP_TD, "CMmCustomMessHandler::InfoPpReadResp - EAlsSupportOff" ); twoDigitDialSupport = RMmCustomAPI::ETwoDigitDialSupportOn; } //set the error value to KErrNone errorValue = KErrNone; } - //No else - } } break; @@ -1432,8 +1424,8 @@ } default: { - TFLOGSTRING("TSY: CMmCustomMessHandler::InfoPpReadResp, switch status - default.\n" ); -OstTrace0( TRACE_NORMAL, DUP6_CMMCUSTOMMESSHANDLER_INFOPPREADRESP, "CMmCustomMessHandler::InfoPpReadResp, switch status - default" ); +TFLOGSTRING("TSY: CMmCustomMessHandler::InfoPpReadResp, switch status - default.\n" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMCUSTOMMESSHANDLER_INFOPPREADRESP_TD, "CMmCustomMessHandler::InfoPpReadResp, switch status - default" ); errorValue = KErrNotSupported; break; } @@ -1456,7 +1448,6 @@ iMessageRouter->Complete( ECustomCheckTwoDigitDialSupportIPC, &dataPackage, errorValue ); } - //No else #endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ } @@ -1474,7 +1465,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CallGsmBlackListClearReq.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLGSMBLACKLISTCLEARREQ, "CMmCustomMessHandler::CallGsmBlackListClearReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLGSMBLACKLISTCLEARREQ_TD, "CMmCustomMessHandler::CallGsmBlackListClearReq" ); // Construct CALL_MODEM_BLACKLIST_CLEAR_REQ message (1 data byte + // sub block count) @@ -1502,7 +1493,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CallGsmBlackListClearResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLGSMBLACKLISTCLEARRESP, "CMmCustomMessHandler::CallGsmBlackListClearResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLGSMBLACKLISTCLEARRESP_TD, "CMmCustomMessHandler::CallGsmBlackListClearResp" ); // call server response //getting this message indicates that the clear blacklist was successful @@ -1524,7 +1515,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::SsServiceCompletedInd"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_SSSERVICECOMPLETEDIND, "CMmCustomMessHandler::SsServiceCompletedInd" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_SSSERVICECOMPLETEDIND_TD, "CMmCustomMessHandler::SsServiceCompletedInd" ); if ( 0 < aIsiMessage.Get8bit( ISI_HEADER_SIZE + SS_SERVICE_COMPLETED_IND_OFFSET_SUBBLOCKCOUNT ) ) @@ -1642,7 +1633,7 @@ } TFLOGSTRING2("TSY: CMmCustomMessHandler::SsServiceCompletedInd: Complete SsRequestCompleteNotification ssStatus:%d", ssStatus ); -OstTrace1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_SSSERVICECOMPLETEDIND, "CMmCustomMessHandler::SsServiceCompletedInd;Complete SsRequestCompleteNotification ssStatus=%u", ssStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_SSSERVICECOMPLETEDIND_TD, "CMmCustomMessHandler::SsServiceCompletedInd;Complete SsRequestCompleteNotification ssStatus=%u", ssStatus ); CMmDataPackage dataPackage; // pack parameter: a TInt with SS status @@ -1673,7 +1664,7 @@ length ) ); TFLOGSTRING("TSY: CMmCustomMessHandler::SsServiceCompletedInd: Complete SsAdditionalInfoNotification"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_SSSERVICECOMPLETEDIND, "CMmCustomMessHandler::SsServiceCompletedInd - Complete SsAdditionalInfoNotification" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_SSSERVICECOMPLETEDIND_TD, "CMmCustomMessHandler::SsServiceCompletedInd - Complete SsAdditionalInfoNotification" ); // complete notification CMmDataPackage dataPackage; @@ -1713,7 +1704,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::SsServiceFailedResp"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_SSSERVICEFAILEDRESP, "CMmCustomMessHandler::SsServiceFailedResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_SSSERVICEFAILEDRESP_TD, "CMmCustomMessHandler::SsServiceFailedResp" ); TInt ssStatus( RMmCustomAPI::KSsStatusReturnError ); @@ -1808,7 +1799,7 @@ } } TFLOGSTRING2("TSY: CMmCustomMessHandler::SsServiceFailedResp: Ss Status: %d", ssStatus ); -OstTrace1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_SSSERVICEFAILEDRESP, "CMmCustomMessHandler::SsServiceFailedResp;Ss Status=%d", ssStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_SSSERVICEFAILEDRESP_TD, "CMmCustomMessHandler::SsServiceFailedResp;Ss Status=%d", ssStatus ); // pack parameter: a TInt with SS status dataPackage.PackData( &ssStatus ); @@ -1819,7 +1810,7 @@ KErrNone ); TFLOGSTRING2("TSY: CMmCustomMessHandler::SsServiceFailedResp: SB ID: 0x%x",subBlockId ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_SSSERVICEFAILEDRESP, "CMmCustomMessHandler::SsServiceFailedResp;subBlockId=%hhx", subBlockId ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_SSSERVICEFAILEDRESP_TD, "CMmCustomMessHandler::SsServiceFailedResp;subBlockId=%hhx", subBlockId ); // pack parameter: pointer to RMmCustomAPI::TSsAdditionalInfo RMmCustomAPI::TSsAdditionalInfo* additionalInfoPtr = &additionalInfo; dataPackage.PackData( &additionalInfoPtr ); @@ -1833,7 +1824,7 @@ else { TFLOGSTRING("TSY: CMmCustomMessHandler::SsServiceFailedResp: No subblock's"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_SSSERVICEFAILEDRESP, "CMmCustomMessHandler::SsServiceFailedResp - No subblock's" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_SSSERVICEFAILEDRESP_TD, "CMmCustomMessHandler::SsServiceFailedResp - No subblock's" ); dataPackage.PackData( &ssStatus ); @@ -1862,7 +1853,7 @@ ) { TFLOGSTRING( "TSY: CMmCustomMessHandler::CallEmergencyNbrCheckReq" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLEMERGENCYNBRCHECKREQ, "CMmCustomMessHandler::CallEmergencyNbrCheckReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLEMERGENCYNBRCHECKREQ_TD, "CMmCustomMessHandler::CallEmergencyNbrCheckReq" ); //save the information to match it when the response is got iUsedEmergencyNbrCheckMode = aCheckMode; @@ -1923,7 +1914,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CallEmergencyNbrCheckResp" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLEMERGENCYNBRCHECKRESP, "CMmCustomMessHandler::CallEmergencyNbrCheckResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLEMERGENCYNBRCHECKRESP_TD, "CMmCustomMessHandler::CallEmergencyNbrCheckResp" ); // Get Status TUint8 status( aIsiMsg.Get8bit( ISI_HEADER_SIZE + @@ -1998,7 +1989,7 @@ TInt CMmCustomMessHandler::UiccOperatorReq() { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccOperatorReq" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCOPERATORREQ, "CMmCustomMessHandler::UiccOperatorReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCOPERATORREQ_TD, "CMmCustomMessHandler::UiccOperatorReq" ); // Set parameters for UICC_APPL_CMD_REQ message TUiccReadTransparent params; @@ -2024,18 +2015,18 @@ // ----------------------------------------------------------------------------- // void CMmCustomMessHandler::UiccOperatorResp( - TInt aStatus, + TUint8 aStatus, const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccOperatorResp" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCOPERATORRESP, "CMmCustomMessHandler::UiccOperatorResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCOPERATORRESP_TD, "CMmCustomMessHandler::UiccOperatorResp" ); TInt errorValue( KErrGeneral ); // Network provider name TBuf name; - if ( KErrNone == aStatus ) + if ( UICC_STATUS_OK == aStatus ) { errorValue = KErrNone; name.Copy( aFileData ); @@ -2066,7 +2057,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::SsGsmUssdSendReq" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_SSGSMUSSDSENDREQ, "CMmCustomMessHandler::SsGsmUssdSendReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_SSGSMUSSDSENDREQ_TD, "CMmCustomMessHandler::SsGsmUssdSendReq" ); // create buffer for isi msg data TBuf8<2> data; @@ -2094,7 +2085,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::SsGsmUssdSendResp" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_SSGSMUSSDSENDRESP, "CMmCustomMessHandler::SsGsmUssdSendResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_SSGSMUSSDSENDRESP_TD, "CMmCustomMessHandler::SsGsmUssdSendResp" ); TUint ussdType( aIsiMessage.Get8bit( @@ -2122,7 +2113,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::Match.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_MATCH, "CMmCustomMessHandler::Match" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_MATCH_TD, "CMmCustomMessHandler::Match" ); TBool ret ( EFalse ); @@ -2148,7 +2139,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::NetModemRegStatusGetReq." ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETMODEMREGSTATUSGETREQ, "CMmCustomMessHandler::NetModemRegStatusGetReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETMODEMREGSTATUSGETREQ_TD, "CMmCustomMessHandler::NetModemRegStatusGetReq" ); // Data length buffer is 2. TBuf8<2> data; @@ -2174,7 +2165,7 @@ const TIsiReceiveC& aIsiMsg ) { TFLOGSTRING("TSY: CMmCustomMessHandler::NetModemRegStatusGetResp" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETMODEMREGSTATUSGETRESP, "CMmCustomMessHandler::NetModemRegStatusGetResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETMODEMREGSTATUSGETRESP_TD, "CMmCustomMessHandler::NetModemRegStatusGetResp" ); // Get the success code. TUint8 successCode( aIsiMsg.Get8bit( @@ -2203,7 +2194,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CallGsmNotificationInd"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND, "CMmCustomMessHandler::CallGsmNotificationInd" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND_TD, "CMmCustomMessHandler::CallGsmNotificationInd" ); TInt ret( KErrNone ); @@ -2237,7 +2228,7 @@ { TFLOGSTRING("TSY: CMmCustomMessHandler::CallGsmNotificationInd,\ - CALL_MODEM_SB_SS_CODE sub block founded"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_SS_CODE sub block found" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND_TD, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_SS_CODE sub block found" ); TUint16 ssCode( aIsiMsg.Get16bit( sbStartOffSet + CALL_MODEM_SB_SS_CODE_OFFSET_MMISSCODE ) ); @@ -2289,7 +2280,7 @@ { TFLOGSTRING("TSY: CMmCustomMessHandler::CallGsmNotificationInd,\ switch ssCode - default."); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND, "CMmCustomMessHandler::CallGsmNotificationInd, switch ssCode - default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND_TD, "CMmCustomMessHandler::CallGsmNotificationInd, switch ssCode - default" ); break; } } @@ -2304,7 +2295,7 @@ { TFLOGSTRING("TSY: CMmCustomMessHandler::CallGsmNotificationInd,\ - CALL_MODEM_SB_SS_NOTIFY sub block founded"); -OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_SS_NOTIFY sub block found" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND_TD, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_SS_NOTIFY sub block found" ); // Get the SsNotifyIndictor TUint8 ssNotify( aIsiMsg.Get8bit( @@ -2338,7 +2329,7 @@ { TFLOGSTRING("TSY: CMmCustomMessHandler::CallGsmNotificationInd,\ - CALL_MODEM_SB_SS_NOTIFY_INDICATOR sub block founded"); -OstTrace0( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_SS_NOTIFY_INDICATOR sub block found" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND_TD, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_SS_NOTIFY_INDICATOR sub block found" ); // Get the SsNotifyIndictor TUint8 ssNotifyIndicator( aIsiMsg.Get8bit( sbStartOffSet + @@ -2370,7 +2361,7 @@ { TFLOGSTRING("TSY: CMmCustomMessHandler::CallGsmNotificationInd,\ - CALL_MODEM_SB_SS_HOLD_INDICATOR sub block founded"); -OstTrace0( TRACE_NORMAL, DUP6_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_SS_HOLD_INDICATOR sub block found" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND_TD, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_SS_HOLD_INDICATOR sub block found" ); // Get the ectIndictor TUint8 holdIndicator( aIsiMsg.Get8bit( sbStartOffSet + @@ -2396,7 +2387,7 @@ { TFLOGSTRING("TSY: CMmCustomMessHandler::CallGsmNotificationInd,\ - CALL_MODEM_SB_CUG_INFO sub block founded"); -OstTrace0( TRACE_NORMAL, DUP7_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_CUG_INFO sub block found" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND_TD, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_CUG_INFO sub block found" ); // Get the CUG index ssInfo.iCugIndex = aIsiMsg.Get16bit( @@ -2412,7 +2403,7 @@ { TFLOGSTRING("TSY: CMmCustomMessHandler::CallGsmNotificationInd,\ - CALL_MODEM_SB_SS_ECT_INDICATOR sub block founded"); -OstTrace0( TRACE_NORMAL, DUP8_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_SS_ECT_INDICATOR sub block found" ); +OstTrace0( TRACE_NORMAL, DUP8_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND_TD, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_SS_ECT_INDICATOR sub block found" ); // Get the ectIndictor TUint8 ectIndicator( aIsiMsg.Get8bit( @@ -2438,7 +2429,7 @@ { TFLOGSTRING("TSY: CMmCustomMessHandler::CallGsmNotificationInd,\ - CALL_MODEM_SB_REMOTE_ADDRESS sub block founded"); -OstTrace0( TRACE_NORMAL, DUP9_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_REMOTE_ADDRESS sub block found" ); +OstTrace0( TRACE_NORMAL, DUP9_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND_TD, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_REMOTE_ADDRESS sub block found" ); // Get the presentation @@ -2469,7 +2460,7 @@ TFLOGSTRING("TSY: CMmCustomMessHandler::CallGsmNotificationInd,\ - CALL_MODEM_SB_REMOTE_ADDRESS sub block\ - switch presentationIndicator - default."); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND, "CMmCustomMessHandler::CallGsmNotificationInd, switch presentationIndicator - default" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND_TD, "CMmCustomMessHandler::CallGsmNotificationInd, switch presentationIndicator - default" ); // The variable already has a default value break; } @@ -2495,7 +2486,7 @@ { TFLOGSTRING("TSY: CMmCustomMessHandler::CallGsmNotificationInd,\ - CALL_MODEM_SB_ALERTING_INFO sub block founded"); -OstTrace0( TRACE_NORMAL, DUP10_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_ALERTING_INFO sub block found" ); +OstTrace0( TRACE_NORMAL, DUP10_CMMCUSTOMMESSHANDLER_CALLGSMNOTIFICATIONIND_TD, "CMmCustomMessHandler::CallGsmNotificationInd, CALL_MODEM_SB_ALERTING_INFO sub block found" ); TBool playRemoteAlertToneLocally( EFalse ); @@ -2544,7 +2535,7 @@ ) const { TFLOGSTRING("TSY: CMmCustomMessHandler::HandleForwarding.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_HANDLEFORWARDING, "CMmCustomMessHandler::HandleForwarding" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_HANDLEFORWARDING_TD, "CMmCustomMessHandler::HandleForwarding" ); //identify the kind of forwarding switch ( aSsCode ) @@ -2569,7 +2560,7 @@ break; default: TFLOGSTRING("TSY: CMmCustomMessHandler::HandleForwarding, switch aSsCode - default.\n" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_HANDLEFORWARDING, "CMmCustomMessHandler::HandleForwarding, switch aSsCode - default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_HANDLEFORWARDING_TD, "CMmCustomMessHandler::HandleForwarding, switch aSsCode - default" ); //this case is imposible, added due code convention break; } @@ -2630,7 +2621,7 @@ ) const { TFLOGSTRING("TSY: CMmCustomMessHandler::HandleBarring.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_HANDLEBARRING, "CMmCustomMessHandler::HandleBarring" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_HANDLEBARRING_TD, "CMmCustomMessHandler::HandleBarring" ); //identify the kind of barring switch ( aSsCode ) @@ -2643,7 +2634,7 @@ break; default: TFLOGSTRING("TSY: CMmCustomMessHandler::HandleBarring, switch aSsCode - default.\n" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_HANDLEBARRING, "CMmCustomMessHandler::HandleBarring, switch aSsCode - default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_HANDLEBARRING_TD, "CMmCustomMessHandler::HandleBarring, switch aSsCode - default" ); //this case is imposible, added due code convention break; } @@ -2693,7 +2684,7 @@ TInt CMmCustomMessHandler::NetSetReq( TUint8 aTransId ) { TFLOGSTRING("TSY: CMmCustomMessHandler::NetSetReq"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETSETREQ, "CMmCustomMessHandler::NetSetReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETSETREQ_TD, "CMmCustomMessHandler::NetSetReq" ); // Data for ISI message, buffer size is one TBuf8<2 + SIZE_NET_OPERATOR_INFO_COMMON> netSetReq; @@ -2733,7 +2724,7 @@ void CMmCustomMessHandler::NetSetResp( const TIsiReceiveC& aIsiMsg ) { TFLOGSTRING("TSY: CMmCustomMessHandler::NetSetResp"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETSETRESP, "CMmCustomMessHandler::NetSetResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETSETRESP_TD, "CMmCustomMessHandler::NetSetResp" ); // Get the cause TUint8 cause( aIsiMsg.Get8bit( @@ -2761,7 +2752,7 @@ void CMmCustomMessHandler::NetRatResp( const TIsiReceiveC& aIsiMsg ) { TFLOGSTRING( "TSY: CMmCustomMessHandler::NetRatResp"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETRATRESP, "CMmCustomMessHandler::NetRatResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETRATRESP_TD, "CMmCustomMessHandler::NetRatResp" ); // Get the success code TUint8 successCode( aIsiMsg.Get8bit( @@ -2772,7 +2763,7 @@ TUint32 supportedNetworkModes( 0 ); TFLOGSTRING2( "TSY: CMmCustomMessHandler::NetRatResp successCode : %d", successCode); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_NETRATRESP, "CMmCustomMessHandler::NetRatResp;successCode=%hhu", successCode ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_NETRATRESP_TD, "CMmCustomMessHandler::NetRatResp;successCode=%hhu", successCode ); // Check if we have sub blocks in the message if ( aIsiMsg.Get8bit( ISI_HEADER_SIZE + NET_RAT_RESP_OFFSET_SUBBLOCKCOUNT ) @@ -2821,7 +2812,7 @@ dataPackage.PackData( &supportedNetworkModes ); TFLOGSTRING2( "TSY: CMmCustomMessHandler::NetRatResp - ret: %d", ret); -OstTrace1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_NETRATRESP, "CMmCustomMessHandler::NetRatResp;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_NETRATRESP_TD, "CMmCustomMessHandler::NetRatResp;ret=%d", ret ); // Completion ResetNetServer method (packed parameters) iMessageRouter->Complete( @@ -2843,7 +2834,7 @@ const TIsiReceiveC& aIsiMessage ) // Received isi message { TFLOGSTRING( "TSY: CMmCustomMessHandler::GssCsServiceResp" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_GSSCSSERVICERESP, "CMmCustomMessHandler::GssCsServiceResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_GSSCSSERVICERESP_TD, "CMmCustomMessHandler::GssCsServiceResp" ); TUint8 transactId ( aIsiMessage.Get8bit( ISI_HEADER_SIZE + GSS_CS_SERVICE_RESP_OFFSET_TRANSID ) ); @@ -2857,7 +2848,7 @@ if ( GSS_SELECTED_RAT_WRITE == operation ) { TFLOGSTRING("TSY: CMmCustomMessHandler::GssCsServiceResp - Complete ECustomSetSystemNetworkModeIPC"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_GSSCSSERVICERESP, "CMmCustomMessHandler::GssCsServiceResp - Complete ECustomSetSystemNetworkModeIPC" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_GSSCSSERVICERESP_TD, "CMmCustomMessHandler::GssCsServiceResp - Complete ECustomSetSystemNetworkModeIPC" ); //completion ResetGssServer method (no packed parameters) iMessageRouter->Complete( ECustomSetSystemNetworkModeIPC, KErrNone ); } @@ -2865,7 +2856,7 @@ else if ( GSS_SELECTED_RAT_READ == operation ) { TFLOGSTRING("TSY: CMmCustomMessHandler::GssCsServiceResp - Complete ECustomGetCurrentSystemNetworkModesIPC"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_GSSCSSERVICERESP, "CMmCustomMessHandler::GssCsServiceResp - Complete ECustomGetCurrentSystemNetworkModesIPC" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_GSSCSSERVICERESP_TD, "CMmCustomMessHandler::GssCsServiceResp - Complete ECustomGetCurrentSystemNetworkModesIPC" ); TInt err( KErrNone ); TUint32 ratMode ( RMmCustomAPI::KCapsNetworkModeDual ); TUint subblockOffset( 0 ); @@ -2897,7 +2888,7 @@ default: { TFLOGSTRING("TSY: CMmCustomMessHandler::GssCsServiceResp - Unrecognized RAT"); -OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_GSSCSSERVICERESP, "CMmCustomMessHandler::GssCsServiceResp - Unrecognized RAT" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_GSSCSSERVICERESP_TD, "CMmCustomMessHandler::GssCsServiceResp - Unrecognized RAT" ); err = KErrGeneral; break; } @@ -2919,7 +2910,7 @@ else if ( GSS_SELECTED_BANDS_WRITE == operation ) { TFLOGSTRING("TSY: CMmCustomMessHandler::GssCsServiceResp - Complete ECustomSetBandSelectionIPC"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_GSSCSSERVICERESP, "CMmCustomMessHandler::GssCsServiceResp - Complete ECustomSetBandSelectionIPC" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_GSSCSSERVICERESP_TD, "CMmCustomMessHandler::GssCsServiceResp - Complete ECustomSetBandSelectionIPC" ); iMessageRouter->Complete( ECustomSetBandSelectionIPC, KErrNone ); } // GSS_SELECTED_BANDS_READ (0x9E) @@ -2943,7 +2934,7 @@ const TIsiReceiveC& aIsiMessage ) // Received isi message { TFLOGSTRING( "TSY: CMmCustomMessHandler::GssCsServiceFailResp" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_GSSCSSERVICEFAILRESP, "CMmCustomMessHandler::GssCsServiceFailResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_GSSCSSERVICEFAILRESP_TD, "CMmCustomMessHandler::GssCsServiceFailResp" ); TUint8 transactId ( aIsiMessage.Get8bit( ISI_HEADER_SIZE + GSS_CS_SERVICE_FAIL_RESP_OFFSET_TRANSID ) ); @@ -2955,7 +2946,7 @@ { //completion ResetGssServer method (no packed parameters) TFLOGSTRING("TSY: CMmCustomMessHandler::GssCsServiceFailResp - ECustomSetSystemNetworkModeIPC"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_GSSCSSERVICEFAILRESP, "CMmCustomMessHandler::GssCsServiceFailResp - ECustomSetSystemNetworkModeIPC" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_GSSCSSERVICEFAILRESP_TD, "CMmCustomMessHandler::GssCsServiceFailResp - ECustomSetSystemNetworkModeIPC" ); iMessageRouter->Complete( ECustomSetSystemNetworkModeIPC, KErrGeneral ); } // not suppoted for S60 ver 3.2 @@ -2964,13 +2955,13 @@ else if ( GSS_SELECTED_BANDS_WRITE == operation ) { TFLOGSTRING("TSY: CMmCustomMessHandler::GssCsServiceFailResp - ECustomSetBandSelectionIPC"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_GSSCSSERVICEFAILRESP, "CMmCustomMessHandler::GssCsServiceFailResp - ECustomSetBandSelectionIPC" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_GSSCSSERVICEFAILRESP_TD, "CMmCustomMessHandler::GssCsServiceFailResp - ECustomSetBandSelectionIPC" ); iMessageRouter->Complete( ECustomSetBandSelectionIPC, KErrGeneral ); } else if ( GSS_SELECTED_BANDS_READ == operation ) { TFLOGSTRING("TSY: CMmCustomMessHandler::GssCsServiceFailResp - ECustomGetBandSelectionIPC"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_GSSCSSERVICEFAILRESP, "CMmCustomMessHandler::GssCsServiceFailResp - ECustomGetBandSelectionIPC" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_GSSCSSERVICEFAILRESP_TD, "CMmCustomMessHandler::GssCsServiceFailResp - ECustomGetBandSelectionIPC" ); iMessageRouter->Complete( ECustomGetBandSelectionIPC, KErrGeneral ); } #endif // NCP_COMMON_S60_VERSION_SUPPORT @@ -2985,7 +2976,7 @@ RMmCustomAPI::TSimFileInfo& aSimFileInfo ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccReadFieldReq" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADFIELDREQ, "CMmCustomMessHandler::UiccReadFieldReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADFIELDREQ_TD, "CMmCustomMessHandler::UiccReadFieldReq" ); // We have received only file path, file ID is two last bytes of path TInt length( aSimFileInfo.iPath.Length() ); @@ -3015,14 +3006,14 @@ // ----------------------------------------------------------------------------- // void CMmCustomMessHandler::UiccReadFieldResp( - TInt aStatus, + TUint8 aStatus, const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccReadFieldResp" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADFIELDRESP, "CMmCustomMessHandler::UiccReadFieldResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADFIELDRESP_TD, "CMmCustomMessHandler::UiccReadFieldResp" ); TInt error( KErrNone ); - if ( aStatus != KErrNone ) + if ( aStatus != UICC_STATUS_OK ) { error = KErrNotFound; } @@ -3048,10 +3039,10 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::NetRatReq"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETRATREQ, "CMmCustomMessHandler::NetRatReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETRATREQ_TD, "CMmCustomMessHandler::NetRatReq" ); TFLOGSTRING3( "TSY: CCMmCustomMessHandler::NetRatReq - aTransId: %d, aUseCurrentRats: %d", aTransId, aUseCurrentRats ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_NETRATREQ, "CMmCustomMessHandler::NetRatReq;aTransId=%hhu;aUseCurrentRats=%hhu", aTransId, aUseCurrentRats ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_NETRATREQ_TD, "CMmCustomMessHandler::NetRatReq;aTransId=%hhu;aUseCurrentRats=%hhu", aTransId, aUseCurrentRats ); // Create message data buffer for service type, buffer size is 1 TBuf8<1> messageData; @@ -3089,7 +3080,7 @@ TFLOGSTRING2( "TSY: CMmCustomMessHandler::GssCsServiceReq - aTransId: %d", aTransId ); -OstTraceExt1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_GSSCSSERVICEREQ, "CMmCustomMessHandler::GssCsServiceReq;aTransId=%hhu", aTransId ); +OstTraceExt1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_GSSCSSERVICEREQ_TD, "CMmCustomMessHandler::GssCsServiceReq;aTransId=%hhu", aTransId ); // create message data buffer for service type, buffer size is 6 TBuf8< KGssCsBufferSize > messageData; @@ -3144,7 +3135,7 @@ ) { TFLOGSTRING( "TSY: CMmCustomMessHandler::GssCsServiceReq" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_GSSCSSERVICEREQ, "CMmCustomMessHandler::GssCsServiceReq" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_GSSCSSERVICEREQ_TD, "CMmCustomMessHandler::GssCsServiceReq" ); TBuf8 messageData; @@ -3180,7 +3171,7 @@ TUint8 transId = KCustomTransId; TFLOGSTRING2("TSY: CMmCustomMessHandler::ExtFuncL -- aIpc -- (%d)", aIpc ); -OstTrace1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_EXTFUNCL, "CMmCustomMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_EXTFUNCL_TD, "CMmCustomMessHandler::ExtFuncL;aIpc=%d", aIpc ); switch ( aIpc ) { @@ -3228,14 +3219,14 @@ if ( 0 >= callId ) { TFLOGSTRING("TSY: CMmCustomMessHandler::ExtFuncL -- ECustomTerminateCallIPC -- (hold+active+alerting)"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_EXTFUNCL, "CMmCustomMessHandler::ExtFuncL - ECustomTerminateCallIPC - (hold+active+alerting)" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_EXTFUNCL_TD, "CMmCustomMessHandler::ExtFuncL - ECustomTerminateCallIPC - (hold+active+alerting)" ); // alerting call (if any) is included as negated value.. callIdISA = TUint8( CALL_MODEM_ID_HOLD | CALL_MODEM_ID_ACTIVE | ( -callId )); } else if ( 1 <= callId && 7 >= callId ) { TFLOGSTRING2("TSY: CMmCustomMessHandler::ExtFuncL -- ECustomTerminateCallIPC -- (%d)", TInt(callId) ); -OstTrace1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_EXTFUNCL, "CMmCustomMessHandler::ExtFuncL;callId=%d", callId ); +OstTrace1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_EXTFUNCL_TD, "CMmCustomMessHandler::ExtFuncL;callId=%d", callId ); callIdISA = static_cast( callId ); } else @@ -3522,7 +3513,7 @@ { // this method should only be called for Custom Tsy cases TFLOGSTRING2("TSY: CMmCustomMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_EXTFUNCL, "CMmCustomMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_EXTFUNCL_TD, "CMmCustomMessHandler::ExtFuncL;aIpc=%d", aIpc ); ret = KErrArgument; break; } @@ -3544,7 +3535,7 @@ const TDesC8& aFileData ) { TFLOGSTRING3("TSY: CMmCustomMessHandler::ProcessUiccMsg, transaction ID: %d, status: %d", aTraId, aStatus ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_PROCESSUICCMSG, "CMmCustomMessHandler::ProcessUiccMsg" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_PROCESSUICCMSG_TD, "CMmCustomMessHandler::ProcessUiccMsg" ); TInt ret( KErrNone ); @@ -3705,7 +3696,7 @@ default: { TFLOGSTRING("TSY: CMmNetMessHandler::ProcessUiccMsg - unknown transaction ID" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_PROCESSUICCMSG, "CMmCustomMessHandler::ProcessUiccMsg - unknown transaction ID" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_PROCESSUICCMSG_TD, "CMmCustomMessHandler::ProcessUiccMsg - unknown transaction ID" ); break; } @@ -3721,7 +3712,7 @@ TInt CMmCustomMessHandler::UiccReadViagHomeZoneParametersReq() { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccReadViagHomeZoneParametersReq" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADVIAGHOMEZONEPARAMETERSREQ, "CMmCustomMessHandler::UiccReadViagHomeZoneParametersReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADVIAGHOMEZONEPARAMETERSREQ_TD, "CMmCustomMessHandler::UiccReadViagHomeZoneParametersReq" ); // Set parameters for UICC_APPL_CMD_REQ message TUiccReadTransparent params; @@ -3747,14 +3738,14 @@ // ----------------------------------------------------------------------------- // void CMmCustomMessHandler::UiccReadViagHomeZoneParametersResp( - TInt aStatus, + TUint8 aStatus, const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccReadViagHomeZoneParametersResp" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADVIAGHOMEZONEPARAMETERSRESP, "CMmCustomMessHandler::UiccReadViagHomeZoneParametersResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADVIAGHOMEZONEPARAMETERSRESP_TD, "CMmCustomMessHandler::UiccReadViagHomeZoneParametersResp" ); TInt error( KErrNone ); - if ( KErrNone == aStatus ) + if ( UICC_STATUS_OK == aStatus ) { TUint8 length( 0 ); TUint8 i( 0 ); @@ -3902,7 +3893,7 @@ const RMmCustomAPI::TViagCacheRecordId& aRecordId ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccReadViagHomeZoneCacheReq" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADVIAGHOMEZONECACHEREQ, "CMmCustomMessHandler::UiccReadViagHomeZoneCacheReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADVIAGHOMEZONECACHEREQ_TD, "CMmCustomMessHandler::UiccReadViagHomeZoneCacheReq" ); TUint8 cacheId( aRecordId.iCacheId ); TUint8 recordId( aRecordId.iRecordId ); @@ -3968,17 +3959,17 @@ // ----------------------------------------------------------------------------- // void CMmCustomMessHandler::UiccReadViagHomeZoneCacheResp( - TInt aStatus, + TUint8 aStatus, const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccReadViagHomeZoneCacheResp" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADVIAGHOMEZONECACHERESP, "CMmCustomMessHandler::UiccReadViagHomeZoneCacheResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADVIAGHOMEZONECACHERESP_TD, "CMmCustomMessHandler::UiccReadViagHomeZoneCacheResp" ); TInt ret( KErrAccessDenied ); RMmCustomAPI::TViagCacheRecordContent viagRecord; - if ( KErrNone == aStatus ) + if ( UICC_STATUS_OK == aStatus ) { viagRecord.iLac = ( aFileData[0] << 8 ) | aFileData[1]; viagRecord.iCellId = ( aFileData[2] << 8 ) | aFileData[3]; @@ -4009,7 +4000,7 @@ const RMmCustomAPI::TViagCacheRecordContent& aViagRecordContent ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccWriteViagHomeZoneCacheReq" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCWRITEVIAGHOMEZONECACHEREQ, "CMmCustomMessHandler::UiccWriteViagHomeZoneCacheReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCWRITEVIAGHOMEZONECACHEREQ_TD, "CMmCustomMessHandler::UiccWriteViagHomeZoneCacheReq" ); TUint8 cacheId( (TUint8)aRecordId.iCacheId ); TUint8 recordId( (TUint8)aRecordId.iRecordId ); @@ -4085,12 +4076,12 @@ // Complete home zone cache // ----------------------------------------------------------------------------- // -void CMmCustomMessHandler::UiccWriteViagHomeZoneCacheResp( TInt aStatus ) +void CMmCustomMessHandler::UiccWriteViagHomeZoneCacheResp( TUint8 aStatus ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccWriteViagHomeZoneCacheResp" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCWRITEVIAGHOMEZONECACHERESP, "CMmCustomMessHandler::UiccWriteViagHomeZoneCacheResp" ); - - if ( KErrNone == aStatus ) +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCWRITEVIAGHOMEZONECACHERESP_TD, "CMmCustomMessHandler::UiccWriteViagHomeZoneCacheResp" ); + + if ( UICC_STATUS_OK == aStatus ) { iMessageRouter->Complete( EWriteViagHomeZoneCacheIPC, KErrNone ); } @@ -4109,7 +4100,7 @@ const RMmCustomAPI::TViagUHZIUESettings& aUhziuiSettings ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccWriteViagHomeZoneUhziueSettingsReq" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCWRITEVIAGHOMEZONEUHZIUESETTINGSREQ, "CMmCustomMessHandler::UiccWriteViagHomeZoneUhziueSettingsReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCWRITEVIAGHOMEZONEUHZIUESETTINGSREQ_TD, "CMmCustomMessHandler::UiccWriteViagHomeZoneUhziueSettingsReq" ); TUint8 settingsField( aUhziuiSettings.iSettings ); TUint8 versionField( aUhziuiSettings.iVersion ); @@ -4145,14 +4136,14 @@ // ----------------------------------------------------------------------------- // void CMmCustomMessHandler::UiccWriteViagHomeZoneUhziueSettingsResp( - TInt aStatus ) + TUint8 aStatus ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccWriteViagHomeZoneUhziueSettingsResp" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCWRITEVIAGHOMEZONEUHZIUESETTINGSRESP, "CMmCustomMessHandler::UiccWriteViagHomeZoneUhziueSettingsResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCWRITEVIAGHOMEZONEUHZIUESETTINGSRESP_TD, "CMmCustomMessHandler::UiccWriteViagHomeZoneUhziueSettingsResp" ); TInt status( KErrAccessDenied ); - if ( KErrNone == aStatus ) + if ( UICC_STATUS_OK == aStatus ) { status = KErrNone; } @@ -4167,7 +4158,7 @@ TInt CMmCustomMessHandler::UiccReadCbMsgIdsReq( TUiccTrId aTrId ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccReadCbMsgIdsReq" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADCBMSGIDSREQ, "CMmCustomMessHandler::UiccReadCbMsgIdsReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADCBMSGIDSREQ_TD, "CMmCustomMessHandler::UiccReadCbMsgIdsReq" ); // Set parameters for UICC_APPL_CMD_REQ message TUiccReadTransparent params; @@ -4193,62 +4184,37 @@ // ----------------------------------------------------------------------------- // void CMmCustomMessHandler::UiccReadCbMsgIdsResp( - TInt aStatus, + TUint8 aStatus, TInt aTraId, const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccReadCbMsgIdsResp" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADCBMSGIDSRESP, "CMmCustomMessHandler::UiccReadCbMsgIdsResp" ); - - TInt numOfCbIds( 0 ); - // File data in bytes - TInt length( aFileData.Length() ); - // Divide by two to get number of 16-bit CB ids - numOfCbIds = length >> 1; - // Buffer for 16 bits CB identifiers - TBuf16 cbIds; - TInt i( 0 ); - TInt j( 0 ); - // Loop all the bytes and append 16 bit id to buffer - for ( ; i < length && j < numOfCbIds; i += 2, j++ ) - { - TUint16 cbId ( ( aFileData[i] << 8 ) | ( aFileData[i+1] ) ); - cbIds.Append( cbId ); - } +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCREADCBMSGIDSRESP_TD, "CMmCustomMessHandler::UiccReadCbMsgIdsResp" ); + + TInt err( KErrNone ); + + TPtrC16 cbIdsBigEndian( reinterpret_cast( aFileData.Ptr() ), + aFileData.Length() / 2); // Read request, complete CB topic list to CTSY - if ( KErrNone == aStatus && ETrIdReadCbMsgIds == aTraId && numOfCbIds > 0 ) - { - CArrayFixFlat* simCbTopics = new ( ELeave ) - CArrayFixFlat ( numOfCbIds ); - - for ( i = 0; i < numOfCbIds; i++ ) - { - if ( KUnusedCbMsgId != cbIds[i] ) - { - RMmCustomAPI::TSimCbTopic simCbTopic; - // CB ID - simCbTopic.iNumber = cbIds[i]; - // Topic names are not stored on the SIM - simCbTopic.iName.Zero(); - // Add CB topic to array - simCbTopics->AppendL( simCbTopic ); - } - } - simCbTopics->Compress(); - - // Complete to SOS layer with packed parameter: - // pointer to array with CB topics - CMmDataPackage dataPackage; - dataPackage.PackData( &simCbTopics ); - - iMessageRouter->Complete( - ECustomStartSimCbTopicBrowsingIPC, - &dataPackage, - KErrNone ); + if ( UICC_STATUS_OK == aStatus && ETrIdReadCbMsgIds == aTraId && + cbIdsBigEndian.Length() > 0 ) + { + CArrayFixFlat* simCbTopics( NULL ); + TRAP(err, simCbTopics = CollectCbTopicIdsL( cbIdsBigEndian ) ); + if ( KErrNone == err ) + { + CMmDataPackage dataPackage; + dataPackage.PackData( &simCbTopics ); + iMessageRouter->Complete( + ECustomStartSimCbTopicBrowsingIPC, + &dataPackage, + KErrNone ); + delete simCbTopics; + } } // Delete request, update EF CBMI with new topic list - else if ( KErrNone == aStatus && ETrIdUpdateCbMsgIdsPhase1 == aTraId && - numOfCbIds > 0 && iTopicInSimMemoryDelete ) + else if ( UICC_STATUS_OK == aStatus && ETrIdUpdateCbMsgIdsPhase1 == aTraId + && cbIdsBigEndian.Length() > 0 && iTopicInSimMemoryDelete ) { // Set parameters for UICC_APPL_CMD_REQ message TUiccWriteTransparent params; @@ -4264,41 +4230,41 @@ params.filePath.Append( KMasterFileId ); params.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); - // File data to be updated. - TBuf8 fileDataBuf; - for ( i = 0; i < numOfCbIds; i++ ) - { - if ( cbIds[ i ] != iSimCBTopicToBeDeleted ) - { - fileDataBuf.Append( cbIds[ i ] >> 8 ); // MSB - fileDataBuf.Append( cbIds[ i ] & 0x00FF ); // LSB - } - else // This CB id is deleted-> set unused - { - fileDataBuf.Append( 0xFF ); - fileDataBuf.Append( 0xFF ); - } + TUint16 topicToDeleteBigEndian = + ( iSimCBTopicToBeDeleted >> 8 ) | ( iSimCBTopicToBeDeleted << 8 ); + for ( TInt i = 0 ; i < cbIdsBigEndian.Length(); i++ ) + { + TUint16 appendData = cbIdsBigEndian[i] == topicToDeleteBigEndian ? + KUnusedCbMsgId : cbIdsBigEndian[i]; + // already big-endian + params.fileData.Append( appendData ); + params.fileData.Append( appendData >> 8 ); } iSimCBTopicToBeDeleted = KUnusedCbMsgId; - params.fileData.Append( fileDataBuf ); iMmUiccMessHandler->CreateUiccApplCmdReq( params ); } - else // Complete error values + else + { + err = KErrNotFound; + } + + if ( KErrNone != err ) { if ( ETrIdReadCbMsgIds == aTraId ) { iMessageRouter->Complete( ECustomStartSimCbTopicBrowsingIPC, - KErrNotFound ); + err ); } else // Delete request { iMessageRouter->Complete( ECustomDeleteSimCbTopicIPC, - KErrNotFound ); - } - iTopicInSimMemoryDelete = ETrue; - } + err ); + } + } + + iTopicInSimMemoryDelete = ETrue; } // ----------------------------------------------------------------------------- @@ -4306,13 +4272,13 @@ // Delete CB message ID // ----------------------------------------------------------------------------- // -void CMmCustomMessHandler::UiccDeleteCbMsgIdResp( TInt aStatus ) +void CMmCustomMessHandler::UiccDeleteCbMsgIdResp( TUint8 aStatus ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccDeleteCbMsgIdResp" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCDELETECBMSGIDRESP, "CMmCustomMessHandler::UiccDeleteCbMsgIdResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCDELETECBMSGIDRESP_TD, "CMmCustomMessHandler::UiccDeleteCbMsgIdResp" ); TInt err( KErrNone ); - if ( KErrNone != aStatus ) + if ( UICC_STATUS_OK != aStatus ) { err = KErrAccessDenied; } @@ -4333,7 +4299,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::WriteHSxPAStatusReq"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_WRITEHSXPASTATUSREQ, "CMmCustomMessHandler::WriteHSxPAStatusReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_WRITEHSXPASTATUSREQ_TD, "CMmCustomMessHandler::WriteHSxPAStatusReq" ); TBuf8 data; TUint8 value(0); @@ -4368,7 +4334,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::WriteHSxPAStatusResp"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_WRITEHSXPASTATUSRESP, "CMmCustomMessHandler::WriteHSxPAStatusResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_WRITEHSXPASTATUSRESP_TD, "CMmCustomMessHandler::WriteHSxPAStatusResp" ); TInt epocError( KErrWrite ); @@ -4386,7 +4352,7 @@ else if ( GSS_HSXPA_DISABLED_VIA_PP == reason ) { TFLOGSTRING("TSY: CMmCustomMessHandler::WriteHSxPAStatusResp. KErrNotSupported"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_WRITEHSXPASTATUSRESP, "CMmCustomMessHandler::WriteHSxPAStatusResp, KErrNotSupported" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_WRITEHSXPASTATUSRESP_TD, "CMmCustomMessHandler::WriteHSxPAStatusResp, KErrNotSupported" ); epocError = KErrNotSupported; } @@ -4405,7 +4371,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::ReadHSxPAStatusReq"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_READHSXPASTATUSREQ, "CMmCustomMessHandler::ReadHSxPAStatusReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_READHSXPASTATUSREQ_TD, "CMmCustomMessHandler::ReadHSxPAStatusReq" ); TBuf8 data; data.Append( KCustomPadding ); //Filler @@ -4429,7 +4395,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::ReadHSxPAStatusResp"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_READHSXPASTATUSRESP, "CMmCustomMessHandler::ReadHSxPAStatusResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_READHSXPASTATUSRESP_TD, "CMmCustomMessHandler::ReadHSxPAStatusResp" ); CMmDataPackage dataPackage; @@ -4480,7 +4446,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::HSxPASettingInd"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_HSXPASETTINGIND, "CMmCustomMessHandler::HSxPASettingInd" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_HSXPASETTINGIND_TD, "CMmCustomMessHandler::HSxPASettingInd" ); CMmDataPackage dataPackage; RMmCustomAPI::THSxPAStatus hsxpaStatus; @@ -4510,7 +4476,7 @@ TInt CMmCustomMessHandler::NetNeighbourCellsReq( const TUint8 aTraId ) { TFLOGSTRING("TSY: CMmCustomMessHandler::NetNeighbourCellsReq"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETNEIGHBOURCELLSREQ, "CMmCustomMessHandler::NetNeighbourCellsReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETNEIGHBOURCELLSREQ_TD, "CMmCustomMessHandler::NetNeighbourCellsReq" ); // Add NET_NEIGHBOUR_CELL_INFO_TYPE // (data size is allways 1) @@ -4534,9 +4500,9 @@ const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmCustomMessHandler::NetNeighbourCellsResp"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETNEIGHBOURCELLSRESP, "CMmCustomMessHandler::NetNeighbourCellsResp" ); - - TECIDInfo tempECIDInfo; +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_NETNEIGHBOURCELLSRESP_TD, "CMmCustomMessHandler::NetNeighbourCellsResp" ); + + TBool triggerNotify( EFalse ); TInt ret( KErrNone ); // Get the success code. @@ -4547,7 +4513,7 @@ if ( NET_CAUSE_OK == successCode ) { TFLOGSTRING("TSY: CMmCustomMessHandler::NetNeighbourCellsResp - NET_CAUSE_OK"); -OstTrace0( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_NETNEIGHBOURCELLSRESP, "CMmCustomMessHandler::NetNeighbourCellsResp, NET_CAUSE_OK" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_NETNEIGHBOURCELLSRESP_TD, "CMmCustomMessHandler::NetNeighbourCellsResp, NET_CAUSE_OK" ); TUint sbOffset( 0 ); @@ -4559,25 +4525,49 @@ { // GSM cell info. TFLOGSTRING("TSY: CMmCustomMessHandler::NetNeighbourCellsResp - NET_ECID_GERAN_INFO found"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_NETNEIGHBOURCELLSRESP, "CMmCustomMessHandler::NetNeighbourCellsResp - NET_ECID_GERAN_INFO found" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_NETNEIGHBOURCELLSRESP_TD, "CMmCustomMessHandler::NetNeighbourCellsResp - NET_ECID_GERAN_INFO found" ); // Set mode - tempECIDInfo.iCellInfo.iMode = RMmCustomAPI::TMmCellInfo::EGSM; + if ( RMmCustomAPI::TMmCellInfo::EGSM != iECIDInfo.iCellInfo.iMode ) + { + triggerNotify = ETrue; + iECIDInfo.iCellInfo.iMode = RMmCustomAPI::TMmCellInfo::EGSM; + } // Set Current MCC. - tempECIDInfo.iMCC = aIsiMessage.Get16bit( - sbOffset + NET_ECID_GERAN_INFO_OFFSET_CURRENTMCC ); + TUint16 mcc( aIsiMessage.Get16bit( + sbOffset + NET_ECID_GERAN_INFO_OFFSET_CURRENTMCC ) ); + if ( mcc != iECIDInfo.iMCC ) + { + triggerNotify = ETrue; + iECIDInfo.iMCC = mcc; + } // Set Current MNC. - tempECIDInfo.iMNC = aIsiMessage.Get16bit( - sbOffset + NET_ECID_GERAN_INFO_OFFSET_CURRENTMNC ); + TUint16 mnc( aIsiMessage.Get16bit( + sbOffset + NET_ECID_GERAN_INFO_OFFSET_CURRENTMNC ) ); + if ( mnc != iECIDInfo.iMNC ) + { + triggerNotify = ETrue; + iECIDInfo.iMNC = mnc; + } // Set Current LAC. - tempECIDInfo.iLAC = aIsiMessage.Get16bit( - sbOffset + NET_ECID_GERAN_INFO_OFFSET_CURRENTLAC ); + TUint16 lac( aIsiMessage.Get16bit( + sbOffset + NET_ECID_GERAN_INFO_OFFSET_CURRENTLAC ) ); + if ( lac != iECIDInfo.iLAC ) + { + triggerNotify = ETrue; + iECIDInfo.iLAC = lac; + } // Set Current Cell ID. - tempECIDInfo.iCID = aIsiMessage.Get16bit( - sbOffset + NET_ECID_GERAN_INFO_OFFSET_CURRENTCELLID ); + TUint16 cid( aIsiMessage.Get16bit( + sbOffset + NET_ECID_GERAN_INFO_OFFSET_CURRENTCELLID ) ); + if ( cid != iECIDInfo.iCID ) + { + triggerNotify = ETrue; + iECIDInfo.iCID = cid; + } // Set Current TA. TUint8 temp8bitUVal( aIsiMessage.Get8bit( @@ -4585,7 +4575,7 @@ if ( NET_ECID_TA_UNDEFINED != temp8bitUVal ) { - tempECIDInfo.iCellInfo.iGsmCellInfo.iTA = temp8bitUVal; + iECIDInfo.iCellInfo.iGsmCellInfo.iTA = temp8bitUVal; } // No else. @@ -4597,19 +4587,19 @@ for ( TUint8 i = 0; i < nmrCount; i++ ) { // Set Carrier number. - tempECIDInfo.iCellInfo.iGsmCellInfo.iNmr[ i ].iARFCN = + iECIDInfo.iCellInfo.iGsmCellInfo.iNmr[i].iARFCN = aIsiMessage.Get16bit( sbOffset + NET_ECID_GERAN_INFO_OFFSET_GSMNMRLIST + ( i * SIZE_NET_GSM_NMR_LIST_SEQ ) + NET_GSM_NMR_LIST_SEQ_OFFSET_ARFCN ); // Set BSIC. - tempECIDInfo.iCellInfo.iGsmCellInfo.iNmr[ i ].iBSIC = + iECIDInfo.iCellInfo.iGsmCellInfo.iNmr[i].iBSIC = aIsiMessage.Get8bit( sbOffset + NET_ECID_GERAN_INFO_OFFSET_GSMNMRLIST + ( i * SIZE_NET_GSM_NMR_LIST_SEQ ) + NET_GSM_NMR_LIST_SEQ_OFFSET_BSIC ); // Set RX level. - tempECIDInfo.iCellInfo.iGsmCellInfo.iNmr[ i ].iRxLEV = + iECIDInfo.iCellInfo.iGsmCellInfo.iNmr[i].iRxLEV = aIsiMessage.Get8bit( sbOffset + NET_ECID_GERAN_INFO_OFFSET_GSMNMRLIST + ( i * SIZE_NET_GSM_NMR_LIST_SEQ ) + @@ -4624,34 +4614,52 @@ { // WCDMA cell info. TFLOGSTRING("TSY: CMmCustomMessHandler::NetNeighbourCellsResp - NET_ECID_UTRAN_FDD_INFO found"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_NETNEIGHBOURCELLSRESP, "CMmCustomMessHandler::NetNeighbourCellsResp - NET_ECID_UTRAN_FDD_INFO found" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_NETNEIGHBOURCELLSRESP_TD, "CMmCustomMessHandler::NetNeighbourCellsResp - NET_ECID_UTRAN_FDD_INFO found" ); // Set mode. - tempECIDInfo.iCellInfo.iMode = RMmCustomAPI::TMmCellInfo::EWCDMA; + if ( RMmCustomAPI::TMmCellInfo::EWCDMA != iECIDInfo.iCellInfo.iMode ) + { + triggerNotify = ETrue; + iECIDInfo.iCellInfo.iMode = RMmCustomAPI::TMmCellInfo::EWCDMA; + } // Set UCID. - tempECIDInfo.iCID = aIsiMessage.Get32bit( - sbOffset + NET_ECID_UTRAN_FDD_INFO_OFFSET_UCID ); + TUint32 cid( aIsiMessage.Get32bit( + sbOffset + NET_ECID_UTRAN_FDD_INFO_OFFSET_UCID ) ); + if ( cid != iECIDInfo.iCID ) + { + triggerNotify = ETrue; + iECIDInfo.iCID = cid; + } // Set current MCC. - tempECIDInfo.iMCC = aIsiMessage.Get16bit( - sbOffset + NET_ECID_UTRAN_FDD_INFO_OFFSET_CURRENTMCC ); + TUint16 mcc( aIsiMessage.Get16bit( + sbOffset + NET_ECID_UTRAN_FDD_INFO_OFFSET_CURRENTMCC ) ); + if ( mcc != iECIDInfo.iMCC ) + { + triggerNotify = ETrue; + iECIDInfo.iMCC = mcc; + } // Set current MNC. - tempECIDInfo.iMNC = aIsiMessage.Get16bit( - sbOffset + NET_ECID_UTRAN_FDD_INFO_OFFSET_CURRENTMNC ); - - // Set current LAC (new value not received here). - tempECIDInfo.iLAC = iECIDInfo.iLAC; + TUint16 mnc( aIsiMessage.Get16bit( + sbOffset + NET_ECID_UTRAN_FDD_INFO_OFFSET_CURRENTMNC ) ); + if ( mnc != iECIDInfo.iMNC ) + { + triggerNotify = ETrue; + iECIDInfo.iMNC = mnc; + } + + // New LAC not received here // Set primary scrambling code. - tempECIDInfo.iCellInfo.iWcdmaCellInfo.iPrimaryScrambilingCode = + iECIDInfo.iCellInfo.iWcdmaCellInfo.iPrimaryScrambilingCode = aIsiMessage.Get16bit( sbOffset + NET_ECID_UTRAN_FDD_INFO_OFFSET_PRISCRAMBLING ); // Set Frequency Info. // Set frequency Info (Uplink UARFCN and UARFCN-Nt not available) // Downlink UARFCN. - tempECIDInfo.iCellInfo.iWcdmaCellInfo.iFrequencyInfo.iFddDL = + iECIDInfo.iCellInfo.iWcdmaCellInfo.iFrequencyInfo.iFddDL = aIsiMessage.Get16bit( sbOffset + NET_ECID_UTRAN_FDD_INFO_OFFSET_UARFCNDL ); @@ -4667,18 +4675,18 @@ for ( TUint8 i( 0 ); i < nmrCount; i++ ) { // Set Frequency Info: Downlink UARFCN. - tempECIDInfo.iCellInfo.iWcdmaCellInfo. + iECIDInfo.iCellInfo.iWcdmaCellInfo. iNwkMeasureReport[i].iFrequencyInfo.iFddDL = aIsiMessage.Get16bit( nmrListOffset ); // Uplink UARFCN and UARFCN-Nt not available, set to -1. - tempECIDInfo.iCellInfo.iWcdmaCellInfo. + iECIDInfo.iCellInfo.iWcdmaCellInfo. iNwkMeasureReport[i].iFrequencyInfo.iFddUL = -1; - tempECIDInfo.iCellInfo.iWcdmaCellInfo. + iECIDInfo.iCellInfo.iWcdmaCellInfo. iNwkMeasureReport[i].iFrequencyInfo.iTddNt = -1; // Set UTRA Carrier RSSI. - tempECIDInfo.iCellInfo.iWcdmaCellInfo. + iECIDInfo.iCellInfo.iWcdmaCellInfo. iNwkMeasureReport[i].iCarrierRSSI = aIsiMessage.Get8bit( nmrListOffset + @@ -4701,14 +4709,14 @@ if ( NET_ECID_UCID_UNDEFINED != temp32bitUVal ) { - tempECIDInfo.iCellInfo.iWcdmaCellInfo. + iECIDInfo.iCellInfo.iWcdmaCellInfo. iNwkMeasureReport[i].iCellMeasuredResult[f].iCID = temp32bitUVal; } // No else. // Set Primary CPICH. - tempECIDInfo.iCellInfo.iWcdmaCellInfo. + iECIDInfo.iCellInfo.iWcdmaCellInfo. iNwkMeasureReport[i].iCellMeasuredResult[f]. iFddInfo.iPrimaryCPICH = aIsiMessage.Get16bit( nmrListOffset + @@ -4721,14 +4729,14 @@ if ( NET_ECID_CPICH_ECNO_UNDEFINED != temp8bitUVal ) { - tempECIDInfo.iCellInfo.iWcdmaCellInfo. + iECIDInfo.iCellInfo.iWcdmaCellInfo. iNwkMeasureReport[i].iCellMeasuredResult[f]. iFddInfo.iCpichEcN0 = temp8bitUVal; } // No else. // Set CPICH RSCP. - tempECIDInfo.iCellInfo.iWcdmaCellInfo. + iECIDInfo.iCellInfo.iWcdmaCellInfo. iNwkMeasureReport[i].iCellMeasuredResult[f]. iFddInfo.iCpichRscp = aIsiMessage.Get8bit( nmrListOffset + @@ -4741,7 +4749,7 @@ if ( NET_ECID_PATHLOSS_UNDEFINED != temp8bitUVal ) { - tempECIDInfo.iCellInfo.iWcdmaCellInfo. + iECIDInfo.iCellInfo.iWcdmaCellInfo. iNwkMeasureReport[i].iCellMeasuredResult[f]. iFddInfo.iPathloss = temp8bitUVal; } @@ -4756,14 +4764,14 @@ else { TFLOGSTRING("TSY: CMmCustomMessHandler::NetNeighbourCellsResp - No ECID data found"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_NETNEIGHBOURCELLSRESP, "CMmCustomMessHandler::NetNeighbourCellsResp - No ECID data found" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_NETNEIGHBOURCELLSRESP_TD, "CMmCustomMessHandler::NetNeighbourCellsResp - No ECID data found" ); ret = KErrNotFound; } } else { TFLOGSTRING2("TSY: CMmCustomMessHandler::NetNeighbourCellsResp - NET Server Error, Success Code: %d", successCode); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_NETNEIGHBOURCELLSRESP, "CMmCustomMessHandler::NetNeighbourCellsResp;NET Server Error, Success Code=%hhu", successCode ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_NETNEIGHBOURCELLSRESP_TD, "CMmCustomMessHandler::NetNeighbourCellsResp;NET Server Error, Success Code=%hhu", successCode ); // Map cause to symbian error value. ret = CMmStaticUtility::CSCauseToEpocError( @@ -4779,7 +4787,7 @@ // Complete with packed parameter. CMmDataPackage dataPackage; - dataPackage.PackData( &tempECIDInfo.iCellInfo ); + dataPackage.PackData( &iECIDInfo.iCellInfo ); iMessageRouter->Complete( ECustomGetCellInfoIPC, @@ -4789,27 +4797,16 @@ // No else. // If info received, save and complete change notification. - if ( KErrNone == ret ) - { - if ( iECIDInfo.iCellInfo.iMode != tempECIDInfo.iCellInfo.iMode || - iECIDInfo.iMCC != tempECIDInfo.iMCC || - iECIDInfo.iMNC != tempECIDInfo.iMNC || - iECIDInfo.iCID != tempECIDInfo.iCID || - iECIDInfo.iLAC != tempECIDInfo.iLAC ) - { - // Complete with packed parameter. - CMmDataPackage dataPackage; - dataPackage.PackData( &tempECIDInfo.iCellInfo ); - - iMessageRouter->Complete( - ECustomNotifyCellInfoChangeIPC, - &dataPackage, - KErrNone ); - } - // No else. - - // Save ECID information. - iECIDInfo = tempECIDInfo; + if ( KErrNone == ret && triggerNotify ) + { + // Complete with packed parameter. + CMmDataPackage dataPackage; + dataPackage.PackData( &iECIDInfo.iCellInfo ); + + iMessageRouter->Complete( + ECustomNotifyCellInfoChangeIPC, + &dataPackage, + KErrNone ); } // No else. } @@ -4826,7 +4823,7 @@ const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CheckECIDInfo"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CHECKECIDINFO, "CMmCustomMessHandler::CheckECIDInfo" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_CHECKECIDINFO_TD, "CMmCustomMessHandler::CheckECIDInfo" ); TUint8 msgId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); @@ -4837,7 +4834,7 @@ TBool isNetRetStatusInd( NET_MODEM_REG_STATUS_IND == msgId ); TFLOGSTRING("TSY:CMmCustomMessHandler::CheckECIDInfo - Find NET_MODEM_CURRENT_CELL_INFO SubBlock"); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_CHECKECIDINFO, "CMmCustomMessHandler::CheckECIDInfo - Find NET_MODEM_CURRENT_CELL_INFO SubBlock" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_CHECKECIDINFO_TD, "CMmCustomMessHandler::CheckECIDInfo - Find NET_MODEM_CURRENT_CELL_INFO SubBlock" ); // Get NET_MODEM_CURRENT_CELL_INFO sub block // (should be always used when exists (coming when in 3G/RRC // connected mode), otherwise NET_MODEM_GSM_REG_INFO is used). @@ -4866,7 +4863,7 @@ if ( KErrNone != retValue ) { TFLOGSTRING("TSY:CMmCustomMessHandler::CheckECIDInfo - Find NET_MODEM_GSM_REG_INFO SubBlock"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_CHECKECIDINFO, "CMmCustomMessHandler::CheckECIDInfo - Find NET_MODEM_GSM_REG_INFO SubBlock" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_CHECKECIDINFO_TD, "CMmCustomMessHandler::CheckECIDInfo - Find NET_MODEM_GSM_REG_INFO SubBlock" ); sbStartOffSet = 0; @@ -4893,7 +4890,7 @@ if ( KErrNone == retValue ) { TFLOGSTRING("TSY:CMmCustomMessHandler::CheckECIDInfo - SubBlock Found"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_CHECKECIDINFO, "CMmCustomMessHandler::CheckECIDInfo, SubBlock Found" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_CHECKECIDINFO_TD, "CMmCustomMessHandler::CheckECIDInfo, SubBlock Found" ); TUint tempMCC( 0 ); // Mobile Country Code. TUint tempMNC( 0 ); // Mobile Network Code. TUint tempCID( 0 ); // Cell identity. @@ -4961,7 +4958,7 @@ ) { TFLOGSTRING2( "TSY: CMmCustomMessHandler::HandleError - Error: %d", aError ); -OstTrace1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_HANDLEERROR, "CMmCustomMessHandler::HandleError;aError=%d", aError ); +OstTrace1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_HANDLEERROR_TD, "CMmCustomMessHandler::HandleError;aError=%d", aError ); TInt resource( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) ); TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); @@ -4973,7 +4970,7 @@ default: { TFLOGSTRING("TSY: CMmCustomMessHandler::HandleError, switch resource - default.\n" ); -OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_HANDLEERROR, "CMmCustomMessHandler::HandleError, switch resource - default" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_HANDLEERROR_TD, "CMmCustomMessHandler::HandleError, switch resource - default" ); // Nothing to do here. break; } @@ -4995,14 +4992,14 @@ RMmCustomAPI::TBandSelection aBandSelection ) // band selection { TFLOGSTRING2( "TSY: CMmCustomMessHandler::GssCsServiceSetBandReq - aTransId: %d", aTransId ); -OstTraceExt1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_GSSCSSERVICESETBANDREQ, "CMmCustomMessHandler::GssCsServiceSetBandReq;aTransId=%hhu", aTransId ); +OstTraceExt1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_GSSCSSERVICESETBANDREQ_TD, "CMmCustomMessHandler::GssCsServiceSetBandReq;aTransId=%hhu", aTransId ); if ( RMmCustomAPI::KCapsNetworkModeUmts == aNetworkModeCaps || RMmCustomAPI::KCapsNetworkModeDual == aNetworkModeCaps ) { TFLOGSTRING3( "TSY: CMmCustomMessHandler::GssCsServiceSetBandReq - NWModeCaps: %d - Band: %d", aNetworkModeCaps, aBandSelection ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_GSSCSSERVICESETBANDREQ, "CMmCustomMessHandler::GssCsServiceSetBandReq; - NWModeCaps=%d - Band=%d", aNetworkModeCaps, aBandSelection ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_GSSCSSERVICESETBANDREQ_TD, "CMmCustomMessHandler::GssCsServiceSetBandReq; - NWModeCaps=%d - Band=%d", aNetworkModeCaps, aBandSelection ); // create message data buffer TBuf8< 20 > messageData; @@ -5051,7 +5048,7 @@ TInt CMmCustomMessHandler::GssCsServiceGetBandReq( TUint8 aTransId ) //transaction Id { TFLOGSTRING2( "TSY: CMmCustomMessHandler::GssCsServiceGetBandReq - aTransId: %d", aTransId ); -OstTraceExt1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_GSSCSSERVICEGETBANDREQ, "CMmCustomMessHandler::GssCsServiceGetBandReq;aTransId=%hhu", aTransId ); +OstTraceExt1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_GSSCSSERVICEGETBANDREQ_TD, "CMmCustomMessHandler::GssCsServiceGetBandReq;aTransId=%hhu", aTransId ); // create message data buffer TBuf8< 4 > messageData; @@ -5070,7 +5067,7 @@ void CMmCustomMessHandler::CompleteGetBandSelection( const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CompleteGetBandSelection"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION, "CMmCustomMessHandler::CompleteGetBandSelection" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION_TD, "CMmCustomMessHandler::CompleteGetBandSelection" ); RMmCustomAPI::TNetworkModeCaps nwModeCaps; // network mode caps RMmCustomAPI::TBandSelection bandSelection; // band selection @@ -5086,7 +5083,7 @@ TUint8 firstSubblock ( aIsiMessage.Get8bit( sbOffset ) ); TFLOGSTRING2("TSY: CMmCustomMessHandler::CompleteGetBandSelection - ECustomGetBandSelectionIPC. NrOfSubblocks:%d", nrOfSubblocks); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION, "CMmCustomMessHandler::CompleteGetBandSelection;nrOfSubblocks=%hhu", nrOfSubblocks ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION_TD, "CMmCustomMessHandler::CompleteGetBandSelection;nrOfSubblocks=%hhu", nrOfSubblocks ); // In 2G only products only sub block GSS_SELECTED_GSM_BANDS_INFO is returned. if ( 1 == nrOfSubblocks && firstSubblock == GSS_SELECTED_GSM_BAND_INFO ) @@ -5103,7 +5100,7 @@ if ( GSS_SELECTED_GSM_BAND_INFO == firstSubblock ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CompleteGetBandSelection - 1st SB = GSM BAND INFO"); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION, "CMmCustomMessHandler::CompleteGetBandSelection - 1st SB = GSM BAND INFO" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION_TD, "CMmCustomMessHandler::CompleteGetBandSelection - 1st SB = GSM BAND INFO" ); // calculate offsets gsmBandInfoOffset = sbOffset + @@ -5120,7 +5117,7 @@ else if ( GSS_SELECTED_UMTS_BAND_INFO == firstSubblock ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CompleteGetBandSelection - 1st SB = UMTS BAND INFO"); -OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION, "CMmCustomMessHandler::CompleteGetBandSelection - 1st SB = UMTS BAND INFO" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION_TD, "CMmCustomMessHandler::CompleteGetBandSelection - 1st SB = UMTS BAND INFO" ); // calculate offsets umtsBandInfoOffset = sbOffset + @@ -5139,7 +5136,7 @@ if ( GSS_UMTS_NO_BANDS == aIsiMessage.Get32bit( umtsBandInfoOffset ) ) // forced GSM { TFLOGSTRING("TSY: CMmCustomMessHandler::CompleteGetBandSelection - umtsBandInfo==GSS_UMTS_NO_BANDS => Forced GSM"); -OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION, "CMmCustomMessHandler::CompleteGetBandSelection - umtsBandInfo==GSS_UMTS_NO_BANDS => Forced GSM" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION_TD, "CMmCustomMessHandler::CompleteGetBandSelection - umtsBandInfo==GSS_UMTS_NO_BANDS => Forced GSM" ); nwModeCaps = RMmCustomAPI::KCapsNetworkModeGsm; } else @@ -5148,13 +5145,13 @@ if ( 0 < gsmBandInfoOffset && GSS_GSM_NO_BANDS == aIsiMessage.Get8bit( gsmBandInfoOffset ) ) // forced UMTS { TFLOGSTRING("TSY: CMmCustomMessHandler::CompleteGetBandSelection - gsmBandInfo==GSS_GSM_NO_BANDS => Forced UMTS"); -OstTrace0( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION, "CMmCustomMessHandler::CompleteGetBandSelection - gsmBandInfo==GSS_GSM_NO_BANDS => Forced UMTS" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION_TD, "CMmCustomMessHandler::CompleteGetBandSelection - gsmBandInfo==GSS_GSM_NO_BANDS => Forced UMTS" ); nwModeCaps = RMmCustomAPI::KCapsNetworkModeUmts; } else // dual mode { TFLOGSTRING("TSY: CMmCustomMessHandler::CompleteGetBandSelection - Dual mode"); -OstTrace0( TRACE_NORMAL, DUP6_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION, "CMmCustomMessHandler::CompleteGetBandSelection - Dual mode" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION_TD, "CMmCustomMessHandler::CompleteGetBandSelection - Dual mode" ); nwModeCaps = RMmCustomAPI::KCapsNetworkModeDual; } @@ -5162,13 +5159,13 @@ if ( GSS_UMTS_BAND_V_MASK == aIsiMessage.Get32bit( umtsBandInfoOffset ) ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CompleteGetBandSelection - UMTS850"); -OstTrace0( TRACE_NORMAL, DUP7_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION, "CMmCustomMessHandler::CompleteGetBandSelection - UMTS850" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION_TD, "CMmCustomMessHandler::CompleteGetBandSelection - UMTS850" ); bandSelection = RMmCustomAPI::ENetworkBandUmts850; } else if( GSS_UMTS_BAND_I_MASK == aIsiMessage.Get32bit( umtsBandInfoOffset ) ) { TFLOGSTRING("TSY: CMmCustomMessHandler::CompleteGetBandSelection - UMTS2100"); -OstTrace0( TRACE_NORMAL, DUP8_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION, "CMmCustomMessHandler::CompleteGetBandSelection - UMTS2100" ); +OstTrace0( TRACE_NORMAL, DUP8_CMMCUSTOMMESSHANDLER_COMPLETEGETBANDSELECTION_TD, "CMmCustomMessHandler::CompleteGetBandSelection - UMTS2100" ); bandSelection = RMmCustomAPI::ENetworkBandUmts2100; } } @@ -5193,7 +5190,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::ReadLifeTimerFromPermanentMemory.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_READLIFETIMERFROMPERMANENTMEMORY, "CMmCustomMessHandler::ReadLifeTimerFromPermanentMemory" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_READLIFETIMERFROMPERMANENTMEMORY_TD, "CMmCustomMessHandler::ReadLifeTimerFromPermanentMemory" ); // Group ID 2 + Index 2 + Filler 2 + Offset 4 + Data amount to be read 4 = 14 TBuf8<14> data; @@ -5218,7 +5215,7 @@ data.Append( static_cast( KCallLifeTimerDataAmount >> 8 ) ); data.Append( static_cast( KCallLifeTimerDataAmount ) ); - /* To be done in CPS + /* return iPhoNetSender->Send( PN_PERMANENT_DATA, aTransId, PERM_PM_RECORD_READ_REQ, @@ -5231,14 +5228,14 @@ // Breaks PERM_PM_RECORD_READ_RESP message. // ----------------------------------------------------------------------------- // -/* To be done in CPS +/* void CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse ( const TIsiReceiveC& aIsiMessage // an ISI message ) { TFLOGSTRING("TSY: CCMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_LIFETIMERFROMPERMANENTMEMORYREADRESPONSE, "CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_LIFETIMERFROMPERMANENTMEMORYREADRESPONSE_TD, "CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse" ); TInt ret( KErrNone ); @@ -5267,12 +5264,12 @@ iCallLifeTimer = aIsiMessage.Get32bit( sbStartOffSet + PERM_SB_PM_DATA_OFFSET_DATA ); TFLOGSTRING2( "TSY: CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse - iCallLifeTimer: %d", iCallLifeTimer ); -OstTrace1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_LIFETIMERFROMPERMANENTMEMORYREADRESPONSE, "CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse;iCallLifeTimer=%d", iCallLifeTimer ); +OstTrace1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_LIFETIMERFROMPERMANENTMEMORYREADRESPONSE_TD, "CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse;iCallLifeTimer=%d", iCallLifeTimer ); } else { TFLOGSTRING2( "TSY: CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse - Incorrect data size: %d", dataSize ); -OstTrace1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_LIFETIMERFROMPERMANENTMEMORYREADRESPONSE, "CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse - Incorrect data size=%u", dataSize ); +OstTrace1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_LIFETIMERFROMPERMANENTMEMORYREADRESPONSE_TD, "CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse - Incorrect data size=%u", dataSize ); TF_ASSERT( KCallLifeTimerDataAmount != dataSize ); ret = KErrGeneral; } @@ -5284,7 +5281,7 @@ { // Send request again max 3 times TFLOGSTRING("TSY: CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse - PMM not ready. Send request again\n" ); -OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_LIFETIMERFROMPERMANENTMEMORYREADRESPONSE, "CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse - PMM not ready. Send request again" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_LIFETIMERFROMPERMANENTMEMORYREADRESPONSE_TD, "CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse - PMM not ready. Send request again" ); iPMMReadRetryCounter++; if ( KMaxPMMReadRequests > iPMMReadRetryCounter ) { @@ -5295,13 +5292,13 @@ { // The first boot of the phone. TFLOGSTRING("TSY: CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse - The first boot. Set iCallLifeTimer 0\n" ); - OstTrace0( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_LIFETIMERFROMPERMANENTMEMORYREADRESPONSE, "CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse - The first boot. Set iCallLifeTimer 0" ); + OstTrace0( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_LIFETIMERFROMPERMANENTMEMORYREADRESPONSE_TD, "CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse - The first boot. Set iCallLifeTimer 0" ); iCallLifeTimer = 0; } else { TFLOGSTRING2( "TSY: CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse - PMM Status NOT OK: %d", pmmStatus ); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_LIFETIMERFROMPERMANENTMEMORYREADRESPONSE, "CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse - PMM Status NOT OK=%hhu", pmmStatus ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_LIFETIMERFROMPERMANENTMEMORYREADRESPONSE_TD, "CMmCustomMessHandler::LifeTimerFromPermanentMemoryReadResponse - PMM Status NOT OK=%hhu", pmmStatus ); } } }*/ @@ -5319,7 +5316,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::WriteLifeTimerToPermanentMemory.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_WRITELIFETIMERTOPERMANENTMEMORY, "CMmCustomMessHandler::WriteLifeTimerToPermanentMemory" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_WRITELIFETIMERTOPERMANENTMEMORY_TD, "CMmCustomMessHandler::WriteLifeTimerToPermanentMemory" ); // Group ID 2 + Index 2 + Filler 2 + Offset 4 + Data amount to be read 4 = 14 TBuf8<14> data; @@ -5345,8 +5342,8 @@ { TFLOGSTRING( "TSY: CMmCustomMessHandler::WriteLifeTimerToPermanentMemory - Call Life Timer is not set from PMM ret KErrNotReady\n" ); TFLOGSTRING("TSY: CMmCustomMessHandler::WriteLifeTimerToPermanentMemory - PERM_PM_RECORD_WRITE_REQ is NOT send\n" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_WRITELIFETIMERTOPERMANENTMEMORY, "CMmCustomMessHandler::WriteLifeTimerToPermanentMemory - Call Life Timer is not set from PMM ret KErrNotReady" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_WRITELIFETIMERTOPERMANENTMEMORY, "CMmCustomMessHandler::WriteLifeTimerToPermanentMemory - PERM_PM_RECORD_WRITE_REQ is NOT send" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_WRITELIFETIMERTOPERMANENTMEMORY_TD, "CMmCustomMessHandler::WriteLifeTimerToPermanentMemory - Call Life Timer is not set from PMM ret KErrNotReady" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_WRITELIFETIMERTOPERMANENTMEMORY_TD, "CMmCustomMessHandler::WriteLifeTimerToPermanentMemory - PERM_PM_RECORD_WRITE_REQ is NOT send" ); // Return request with KErrNotReady return ( KErrNotReady ); @@ -5362,7 +5359,7 @@ data.Append( static_cast( iCallLifeTimer >> 8 ) ); data.Append( static_cast( iCallLifeTimer ) ); - /* To be done in CPS + /* return iPhoNetSender->Send( PN_PERMANENT_DATA, aTransId, PERM_PM_RECORD_WRITE_REQ, @@ -5376,14 +5373,14 @@ // Breaks PERM_PM_RECORD_WRITE_RESP message. // ----------------------------------------------------------------------------- // -/* To be done in CPS +/* void CMmCustomMessHandler::LifeTimerToPermanentMemoryWriteResponse ( const TIsiReceiveC& aIsiMessage // an ISI message ) { TFLOGSTRING("TSY: CMmCustomMessHandler::LifeTimerToPermanentMemoryWriteResponse.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_LIFETIMERTOPERMANENTMEMORYWRITERESPONSE, "CMmCustomMessHandler::LifeTimerToPermanentMemoryWriteResponse" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_LIFETIMERTOPERMANENTMEMORYWRITERESPONSE_TD, "CMmCustomMessHandler::LifeTimerToPermanentMemoryWriteResponse" ); TInt ret( KErrNone ); @@ -5391,14 +5388,14 @@ ISI_HEADER_SIZE + PERM_PM_RECORD_WRITE_RESP_OFFSET_PMMSTATUS ); TFLOGSTRING2( "TSY: CMmCustomMessHandler::LifeTimerToPermanentMemoryWriteResponse - pmmStatus: %d", pmmStatus ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_LIFETIMERTOPERMANENTMEMORYWRITERESPONSE, "CMmCustomMessHandler::LifeTimerToPermanentMemoryWriteResponse;pmmStatus=%hhu", pmmStatus ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_LIFETIMERTOPERMANENTMEMORYWRITERESPONSE_TD, "CMmCustomMessHandler::LifeTimerToPermanentMemoryWriteResponse;pmmStatus=%hhu", pmmStatus ); if ( PMM_OK != pmmStatus ) { ret = KErrNotReady; TF_ASSERT( PMM_OK != pmmStatus ); TFLOGSTRING2( "TSY: CMmCustomMessHandler::LifeTimerToPermanentMemoryWriteResponse - Call Life Timer is not updated / error from PMM ret: %d", ret ); -OstTrace1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_LIFETIMERTOPERMANENTMEMORYWRITERESPONSE, "CMmCustomMessHandler::LifeTimerToPermanentMemoryWriteResponse - Call Life Timer is not updated / error from PMM ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_LIFETIMERTOPERMANENTMEMORYWRITERESPONSE_TD, "CMmCustomMessHandler::LifeTimerToPermanentMemoryWriteResponse - Call Life Timer is not updated / error from PMM ret=%d", ret ); } return iMessageRouter->Complete( EMmTsyUpdateLifeTimeIPC, ret ); @@ -5414,7 +5411,7 @@ ) { TFLOGSTRING("TSY: CMmCustomMessHandler::GetTotalLifeTimerValue.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_GETTOTALLIFETIMERVALUE, "CMmCustomMessHandler::GetTotalLifeTimerValue" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_GETTOTALLIFETIMERVALUE_TD, "CMmCustomMessHandler::GetTotalLifeTimerValue" ); TInt ret( KErrNone ); RMmCustomAPI::TLifeTimeData timeInfo; @@ -5426,7 +5423,7 @@ { ret = KErrNotReady; TFLOGSTRING( "TSY: CMmCustomMessHandler::GetTotalLifeTimerValue - PMM has not been able to be read ret: KErrNotReady\n" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_GETTOTALLIFETIMERVALUE, "CMmCustomMessHandler::GetTotalLifeTimerValue - PMM has not been able to be read ret: KErrNotReady" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_GETTOTALLIFETIMERVALUE_TD, "CMmCustomMessHandler::GetTotalLifeTimerValue - PMM has not been able to be read ret: KErrNotReady" ); } else { @@ -5441,9 +5438,9 @@ TFLOGSTRING2( "TSY: TSY: CMmCustomMessHandler::GetTotalLifeTimerValue - iCallLifeTimer: %d", iCallLifeTimer ); TFLOGSTRING2( "TSY: TSY: CMmCustomMessHandler::GetTotalLifeTimerValue - timeInfo.iHours: %d", timeInfo.iHours ); TFLOGSTRING2( "TSY: TSY: CMmCustomMessHandler::GetTotalLifeTimerValue - timeInfo.iMinutes: %d", timeInfo.iMinutes ); -OstTrace1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_GETTOTALLIFETIMERVALUE, "CMmCustomMessHandler::GetTotalLifeTimerValue;iCallLifeTimer=%d", iCallLifeTimer ); -OstTrace1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_GETTOTALLIFETIMERVALUE, "CMmCustomMessHandler::GetTotalLifeTimerValue;timeInfo.iHours=%u", timeInfo.iHours ); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_GETTOTALLIFETIMERVALUE, "CMmCustomMessHandler::GetTotalLifeTimerValue;timeInfo.iMinutes=%hhu", timeInfo.iMinutes ); +OstTrace1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_GETTOTALLIFETIMERVALUE_TD, "CMmCustomMessHandler::GetTotalLifeTimerValue;iCallLifeTimer=%d", iCallLifeTimer ); +OstTrace1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_GETTOTALLIFETIMERVALUE_TD, "CMmCustomMessHandler::GetTotalLifeTimerValue;timeInfo.iHours=%u", timeInfo.iHours ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_GETTOTALLIFETIMERVALUE_TD, "CMmCustomMessHandler::GetTotalLifeTimerValue;timeInfo.iMinutes=%hhu", timeInfo.iMinutes ); } CMmDataPackage dataPackage; @@ -5461,7 +5458,7 @@ TInt CMmCustomMessHandler::UiccSimPowerOffReq() { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccSimPowerOffReq.\n"); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMPOWEROFFREQ, "CMmCustomMessHandler::UiccSimPowerOffReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMPOWEROFFREQ_TD, "CMmCustomMessHandler::UiccSimPowerOffReq" ); iSapApduIfState = EUiccSapIfStatus1; // Set parameters for UICC_CONNECTION_REQ message @@ -5481,7 +5478,7 @@ void CMmCustomMessHandler::UiccSimPowerOffResp( TInt aStatus ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccSimPowerOffResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMPOWEROFFRESP, "CMmCustomMessHandler::UiccSimPowerOffResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMPOWEROFFRESP_TD, "CMmCustomMessHandler::UiccSimPowerOffResp" ); TInt err ( KErrNone ); @@ -5544,7 +5541,7 @@ TInt CMmCustomMessHandler::UiccSimWarmResetReq() { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccSimWarmResetReq.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMWARMRESETREQ, "CMmCustomMessHandler::UiccSimWarmResetReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMWARMRESETREQ_TD, "CMmCustomMessHandler::UiccSimWarmResetReq" ); TUiccParamsApduReq params; params.messHandlerPtr = static_cast( this ); @@ -5563,7 +5560,7 @@ void CMmCustomMessHandler::UiccSimWarmResetResp( TInt aStatus ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccSimWarmResetResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMWARMRESETRESP, "CMmCustomMessHandler::UiccSimWarmResetResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMWARMRESETRESP_TD, "CMmCustomMessHandler::UiccSimWarmResetResp" ); TInt err ( KErrNone ); @@ -5591,7 +5588,7 @@ TInt CMmCustomMessHandler::UiccSimGetAtrReq() { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccSimGetAtrReq.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMGETATRREQ, "CMmCustomMessHandler::UiccSimGetAtrReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMGETATRREQ_TD, "CMmCustomMessHandler::UiccSimGetAtrReq" ); TUiccParamsApduReq params; params.messHandlerPtr = static_cast( this ); @@ -5611,7 +5608,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccSimGetAtrResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMGETATRRESP, "CMmCustomMessHandler::UiccSimGetAtrResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMGETATRRESP_TD, "CMmCustomMessHandler::UiccSimGetAtrResp" ); TInt err( KErrNone ); const TDesC8* dataPtr = &aFileData; @@ -5642,7 +5639,7 @@ TInt CMmCustomMessHandler::UiccSimPowerOnReq() { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccSimPowerOnReq.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMPOWERONREQ, "CMmCustomMessHandler::UiccSimPowerOnReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMPOWERONREQ_TD, "CMmCustomMessHandler::UiccSimPowerOnReq" ); //Set APDU interface state iSapApduIfState = EUiccSapIfStatus1; @@ -5664,7 +5661,7 @@ void CMmCustomMessHandler::UiccSimPowerOnResp( TInt aStatus ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccSimPowerOnResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMPOWERONRESP, "CMmCustomMessHandler::UiccSimPowerOnResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMPOWERONRESP_TD, "CMmCustomMessHandler::UiccSimPowerOnResp" ); TInt err( KErrNone ); @@ -5714,7 +5711,7 @@ TInt aTraId ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccSimSendAPDUReq.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMSENAPDUREQ, "CMmCustomMessHandler::UiccSendAPDUReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMSENAPDUREQ_TD, "CMmCustomMessHandler::UiccSendAPDUReq" ); TUiccParamsApduReq params; params.messHandlerPtr = static_cast( this ); @@ -5736,7 +5733,7 @@ TInt aTraId ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccSendAPDUResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMSENAPDURESP, "CMmCustomMessHandler::UiccSendAPDUResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSIMSENAPDURESP_TD, "CMmCustomMessHandler::UiccSendAPDUResp" ); TInt err( KErrNone ); const TDesC8* dataPtr = &aFileData; @@ -5781,7 +5778,7 @@ TInt CMmCustomMessHandler::UiccCardReaderStatusReq() { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccCardReaderStatusReq.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCARDREADERSTATUSREQ, "CMmCustomMessHandler::UiccCardReaderStatusReq" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCARDREADERSTATUSREQ_TD, "CMmCustomMessHandler::UiccCardReaderStatusReq" ); TUiccParamsApduReq params; params.messHandlerPtr = static_cast( this ); @@ -5807,7 +5804,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccCardReaderStatusResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCARDREADERSTATUSRESP, "CMmCustomMessHandler::UiccCardReaderStatusResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCARDREADERSTATUSRESP_TD, "CMmCustomMessHandler::UiccCardReaderStatusResp" ); TInt err ( KErrNone ); CMmDataPackage dataPackage; @@ -5876,7 +5873,7 @@ ISI_HEADER_SIZE + UICC_IND_OFFSET_SERVICETYPE ) ); TFLOGSTRING2("TSY: CMmCustomMessHandler::UiccCardInd, service type: %d", serviceType ); -OstTraceExt1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCIND, "CMmCustomMessHandler::UiccCardInd;serviceType=%hhu", serviceType ); +OstTraceExt1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCIND_TD, "CMmCustomMessHandler::UiccCardInd;serviceType=%hhu", serviceType ); RMmCustomAPI::TSIMCardStatus returnStatus; returnStatus = RMmCustomAPI::SimCardUnknowError; @@ -5917,7 +5914,7 @@ const CMmDataPackage& aDataPackage ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccSendAuthenticateApdu.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU, "CMmCustomMessHandler::UiccSendAuthenticateApdu" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU_TD, "CMmCustomMessHandler::UiccSendAuthenticateApdu" ); TInt ret( KErrNone ); TBool apduSendNeeded( EFalse ); @@ -5999,7 +5996,7 @@ { // GBA not supported if card type is ICC or GBA not supported in EFust TFLOGSTRING3("TSY: CMmCustomMessHandler::UiccSendAuthenticateApdu: GBA not supported (card type: 0x%x, ss: 0x%x)\n", cardType, serviceStatus ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU, "CMmCustomMessHandler::UiccSendAuthenticateApdu: GBA not supported (card type: %x, ss: 0x%x)", cardType, serviceStatus ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU_TD, "CMmCustomMessHandler::UiccSendAuthenticateApdu: GBA not supported (card type: %x, ss: 0x%x)", cardType, serviceStatus ); ret = KErrGeneral; } break; @@ -6017,7 +6014,7 @@ { // GBA not supported if card type is ICC or GBA not supported in EFust TFLOGSTRING3("TSY: CMmCustomMessHandler::UiccSendAuthenticateApdu: GBA not supported (card type: 0x%x, ss: 0x%x)\n", cardType, serviceStatus ); -OstTraceExt2( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU, "CMmCustomMessHandler::UiccSendAuthenticateApdu: GBA not supported (card type: 0x%x, ss: 0x%x)", cardType, serviceStatus ); +OstTraceExt2( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU_TD, "CMmCustomMessHandler::UiccSendAuthenticateApdu: GBA not supported (card type: 0x%x, ss: 0x%x)", cardType, serviceStatus ); ret = KErrGeneral; } break; @@ -6036,7 +6033,7 @@ { // GBA not supported if card type is ICC or GBA not supported in EFust TFLOGSTRING3("TSY: CMmCustomMessHandler::UiccSendAuthenticateApdu: GBA not supported (card type: 0x%x, ss: 0x%x)\n", cardType, serviceStatus ); -OstTraceExt2( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU, "CMmCustomMessHandler::UiccSendAuthenticateApdu: GBA not supported (card type: 0x%x, ss: 0x%x)", cardType, serviceStatus ); +OstTraceExt2( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU_TD, "CMmCustomMessHandler::UiccSendAuthenticateApdu: GBA not supported (card type: 0x%x, ss: 0x%x)", cardType, serviceStatus ); ret = KErrGeneral; } break; @@ -6055,7 +6052,7 @@ { // MBMS not supported if card type is ICC or MBMS not supported in EFust TFLOGSTRING3("TSY: CMmCustomMessHandler::UiccSendAuthenticateApdu: MBMS security not supported (card type: 0x%x, ss: 0x%x)\n", cardType, serviceStatus ); -OstTraceExt2( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU, "CMmCustomMessHandler::UiccSendAuthenticateApdu: MBMS security not supported (card type: 0x%x, ss: 0x%x)", cardType, serviceStatus ); +OstTraceExt2( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU_TD, "CMmCustomMessHandler::UiccSendAuthenticateApdu: MBMS security not supported (card type: 0x%x, ss: 0x%x)", cardType, serviceStatus ); ret = KErrGeneral; } break; @@ -6074,7 +6071,7 @@ { // MBMS not supported if card type is ICC or MBMS not supported in EFust TFLOGSTRING3("TSY: CMmCustomMessHandler::UiccSendAuthenticateApdu: MBMS security not supported (card type: 0x%x, ss: 0x%x)\n", cardType, serviceStatus ); -OstTraceExt2( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU, "CMmCustomMessHandler::UiccSendAuthenticateApdu: MBMS security not supported (card type: 0x%x, ss: 0x%x)", cardType, serviceStatus ); +OstTraceExt2( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU_TD, "CMmCustomMessHandler::UiccSendAuthenticateApdu: MBMS security not supported (card type: 0x%x, ss: 0x%x)", cardType, serviceStatus ); ret = KErrGeneral; } break; @@ -6093,7 +6090,7 @@ { // MBMS not supported if card type is ICC or MBMS not supported in EFust TFLOGSTRING3("TSY: CMmCustomMessHandler::UiccSendAuthenticateApdu: MBMS security not supported (card type: 0x%x, ss: 0x%x)\n", cardType, serviceStatus ); -OstTraceExt2( TRACE_NORMAL, DUP6_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU, "CMmCustomMessHandler::UiccSendAuthenticateApdu: MBMS security not supported (card type: 0x%x, ss: 0x%x)", cardType, serviceStatus ); +OstTraceExt2( TRACE_NORMAL, DUP6_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU_TD, "CMmCustomMessHandler::UiccSendAuthenticateApdu: MBMS security not supported (card type: 0x%x, ss: 0x%x)", cardType, serviceStatus ); ret = KErrGeneral; } break; @@ -6101,7 +6098,7 @@ default: { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccSendAuthenticateApdu: Unknown APDU\n" ); -OstTrace0( TRACE_NORMAL, DUP7_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU, "CMmCustomMessHandler::UiccSendAuthenticateApdu: Unknown APDU" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU_TD, "CMmCustomMessHandler::UiccSendAuthenticateApdu: Unknown APDU" ); break; } } @@ -6114,7 +6111,7 @@ else { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccSendAuthenticateApdu: APDU not sent\n" ); -OstTrace0( TRACE_NORMAL, DUP8_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU, "CMmCustomMessHandler::UiccSendAuthenticateApduu: APDU not sent" ); +OstTrace0( TRACE_NORMAL, DUP8_CMMCUSTOMMESSHANDLER_UICCSENDAUTHENTICATEAPDU_TD, "CMmCustomMessHandler::UiccSendAuthenticateApduu: APDU not sent" ); } return ret; } @@ -6131,7 +6128,7 @@ TUiccTrId aTraId ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccCreateRunGsmAlgorithmApdu.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATERUNGSMALGORITHMAPDU, "CMmCustomMessHandler::UiccCreateRunGsmAlgorithmApdu" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATERUNGSMALGORITHMAPDU_TD, "CMmCustomMessHandler::UiccCreateRunGsmAlgorithmApdu" ); aParams.trId = aTraId; aParams.apdu.Append( KClaIcc ); // CLA @@ -6155,7 +6152,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCRUNGSMALGORITHMAPDURESP, "CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCRUNGSMALGORITHMAPDURESP_TD, "CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp" ); TInt ret( KErrNone ); TInt ipc( ETrIdRunGsmAlgorithmIms == aTraId ? EMobilePhoneIMSAuthenticate : ECustomGetSimAuthenticationDataIPC ); @@ -6213,14 +6210,14 @@ else { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp. APDU validation fails\n" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCRUNGSMALGORITHMAPDURESP, "CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp. APDU validation fails" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCRUNGSMALGORITHMAPDURESP_TD, "CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp. APDU validation fails" ); ret = KErrMMEtelAuthenticateFailed; } } else if( KCmdNotAllowedSecurityStatusNotSatisfied == result ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp: Security conditions not satisfied\n" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_UICCRUNGSMALGORITHMAPDURESP, "CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp: Security conditions not satisfied" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_UICCRUNGSMALGORITHMAPDURESP_TD, "CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp: Security conditions not satisfied" ); ret = CMmStaticUtility::EpocErrorCode( KErrAccessDenied, KErrGsm0707SimPin1Required ); @@ -6228,14 +6225,14 @@ else { TFLOGSTRING2("TSY: CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp. unknown result: 0x%X\n", result ); -OstTrace1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_UICCRUNGSMALGORITHMAPDURESP, "CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp. unknown result: 0x%x", result ); +OstTrace1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_UICCRUNGSMALGORITHMAPDURESP_TD, "CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp. unknown result: 0x%x", result ); ret = KErrMMEtelAuthenticateFailed; } } else { TFLOGSTRING2("TSY: CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp: UICC status not ok: 0x%x\n", aStatus ); -OstTrace1( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_UICCRUNGSMALGORITHMAPDURESP, "CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp: UICC status not ok: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_UICCRUNGSMALGORITHMAPDURESP_TD, "CMmCustomMessHandler::UiccRunGsmAlgorithmApduResp: UICC status not ok: 0x%x", aStatus ); ret = KErrMMEtelAuthenticateFailed; } @@ -6278,7 +6275,7 @@ const CMmDataPackage& aDataPackage ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccCreateGsmSecurityContextApdu.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATEGSMSECURITYCONTEXTAPDU, "CMmCustomMessHandler::UiccCreateGsmSecurityContextApdu" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATEGSMSECURITYCONTEXTAPDU_TD, "CMmCustomMessHandler::UiccCreateGsmSecurityContextApdu" ); RMmCustomAPI::TSimAuthenticationEapSim eapSim; aDataPackage.UnPackData( eapSim ); @@ -6305,7 +6302,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccGsmSecurityContextApduResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCGSMSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::UiccGsmSecurityContextApduResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCGSMSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::UiccGsmSecurityContextApduResp" ); TInt ret( KErrNone ); RMmCustomAPI::TSimAuthenticationEapSim eapSim; @@ -6335,21 +6332,21 @@ else { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccGsmSecurityContextApduResp: APDU validation failed\n" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCGSMSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::UiccGsmSecurityContextApduResp: APDU validation failed" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCGSMSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::UiccGsmSecurityContextApduResp: APDU validation failed" ); ret = KErrMMEtelAuthenticateFailed; } } else { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccGsmSecurityContextApduResp: unknown result\n" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_UICCGSMSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::UiccGsmSecurityContextApduResp: unknown result" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_UICCGSMSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::UiccGsmSecurityContextApduResp: unknown result" ); ret = KErrMMEtelAuthenticateFailed; } } else { TFLOGSTRING2("TSY: CMmCustomMessHandler::UiccGsmSecurityContextApduResp: UICC status not ok: 0x%x\n", aStatus ); -OstTrace1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_UICCGSMSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::UiccGsmSecurityContextApduResp: UICC status not ok: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_UICCGSMSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::UiccGsmSecurityContextApduResp: UICC status not ok: 0x%x", aStatus ); ret = KErrMMEtelAuthenticateFailed; } @@ -6383,7 +6380,7 @@ TUiccTrId aTraId ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccCreate3GSecurityContextApdu.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATE3GSECURITYCONTEXTAPDU, "CMmCustomMessHandler::UiccCreate3GSecurityContextApdu" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATE3GSECURITYCONTEXTAPDU_TD, "CMmCustomMessHandler::UiccCreate3GSecurityContextApdu" ); // len of data is sizeof RAND + sizeof AUTN + two length fields // (one for RAND len and one for AUTN len) @@ -6413,7 +6410,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::Uicc3GSecurityContextApduResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICC3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Uicc3GSecurityContextApduResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICC3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Uicc3GSecurityContextApduResp" ); TInt ret( KErrNone ); TInt ipc( ETrIdEEapAkaAuthenticateIms == aTraId ? EMobilePhoneIMSAuthenticate : ECustomGetSimAuthenticationDataIPC ); @@ -6499,21 +6496,21 @@ else { TFLOGSTRING("TSY: CMmCustomMessHandler::Uicc3GSecurityContextApduResp: APDU validation failed\n" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICC3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Uicc3GSecurityContextApduResp: APDU validation failed" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICC3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Uicc3GSecurityContextApduResp: APDU validation failed" ); ret = KErrMMEtelAuthenticateFailed; } } else if( KAppAuthErrorIncorrectMac == result ) { TFLOGSTRING("TSY: CMmCustomMessHandler::Uicc3GSecurityContextApduResp: incorrect MAC\n" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_UICC3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Uicc3GSecurityContextApduResp: incorrect MAC" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_UICC3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Uicc3GSecurityContextApduResp: incorrect MAC" ); // no parameters in this case ret = KErrMMEtelMacVerificationFailed; } else if( KCmdNotAllowedSecurityStatusNotSatisfied == result ) { TFLOGSTRING("TSY: CMmCustomMessHandler::Uicc3GSecurityContextApduResp: Security conditions not satisfied\n" ); -OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_UICC3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Uicc3GSecurityContextApduResp: Security conditions not satisfied" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_UICC3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Uicc3GSecurityContextApduResp: Security conditions not satisfied" ); ret = CMmStaticUtility::EpocErrorCode( KErrAccessDenied, KErrGsm0707SimPin1Required ); @@ -6521,14 +6518,14 @@ else { TFLOGSTRING("TSY: CMmCustomMessHandler::Uicc3GSecurityContextApduResp: unknown result\n" ); -OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_UICC3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Uicc3GSecurityContextApduResp: unknown result" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_UICC3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Uicc3GSecurityContextApduResp: unknown result" ); ret = KErrMMEtelAuthenticateFailed; } } else { TFLOGSTRING2("TSY: CMmCustomMessHandler::Uicc3GSecurityContextApduResp: UICC status not ok: 0x%x\n", aStatus ); -OstTrace1( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_UICC3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Uicc3GSecurityContextApduResp: UICC status not ok: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_UICC3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Uicc3GSecurityContextApduResp: UICC status not ok: 0x%x", aStatus ); ret = ETrIdEEapAkaAuthenticateIms == aTraId ? KErrGeneral : KErrMMEtelAuthenticateFailed; } @@ -6571,7 +6568,7 @@ const CMmDataPackage& aDataPackage ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccCreateGBABootstrappingApdu.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATEGBABOOTSTRAPPINGAPDU, "CMmCustomMessHandler::UiccCreateGBABootstrappingApdu" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATEGBABOOTSTRAPPINGAPDU_TD, "CMmCustomMessHandler::UiccCreateGBABootstrappingApdu" ); RMmCustomAPI::TSimAuthenticationGbaBootstrap gbaBootstrap; aDataPackage.UnPackData( gbaBootstrap ); @@ -6606,7 +6603,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccGBABootstrappingApduResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPPINGAPDURESP, "CMmCustomMessHandler::UiccGBABootstrappingApduResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPPINGAPDURESP_TD, "CMmCustomMessHandler::UiccGBABootstrappingApduResp" ); TInt ret( KErrNone ); RMmCustomAPI::TSimAuthenticationGbaBootstrap gbaBootstrap; @@ -6648,28 +6645,28 @@ else { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccGBABootstrappingApduResp: APDU validation failed\n" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPPINGAPDURESP, "CMmCustomMessHandler::UiccGBABootstrappingApduResp: APDU validation failed" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPPINGAPDURESP_TD, "CMmCustomMessHandler::UiccGBABootstrappingApduResp: APDU validation failed" ); ret = KErrGeneral; } } else if( KAppAuthErrorIncorrectMac == result ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccGBABootstrappingApduResp: incorrect MAC\n" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPPINGAPDURESP, "CMmCustomMessHandler::UiccGBABootstrappingApduResp: incorrect MAC" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPPINGAPDURESP_TD, "CMmCustomMessHandler::UiccGBABootstrappingApduResp: incorrect MAC" ); // no parameters in this case ret = KErrMMEtelMacVerificationFailed; } else { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccGBABootstrappingApduResp: unknown result\n" ); -OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPPINGAPDURESP, "CMmCustomMessHandler::UiccGBABootstrappingApduResp: unknown result" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPPINGAPDURESP_TD, "CMmCustomMessHandler::UiccGBABootstrappingApduResp: unknown result" ); ret = KErrGeneral; } } else { TFLOGSTRING2("TSY: CMmCustomMessHandler::UiccGBABootstrappingApduResp: UICC status not ok: 0x%x\n", aStatus ); -OstTrace1( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPPINGAPDURESP, "CMmCustomMessHandler::UiccGBABootstrappingApduResp: UICC status not ok: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPPINGAPDURESP_TD, "CMmCustomMessHandler::UiccGBABootstrappingApduResp: UICC status not ok: 0x%x", aStatus ); ret = KErrMMEtelAuthenticateFailed; } @@ -6703,7 +6700,7 @@ const CMmDataPackage& aDataPackage ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccGBABootstrapUpdate.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPUPDATE, "CMmCustomMessHandler::UiccGBABootstrapUpdate" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPUPDATE_TD, "CMmCustomMessHandler::UiccGBABootstrapUpdate" ); // GBA bootstrap update is done by first reading of elementary file EFgba. // After that RAND is stored temporarily and B-Tid and keylifetime is written @@ -6750,7 +6747,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccGBABootstrapReadResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPREADRESP, "CMmCustomMessHandler::UiccGBABootstrapReadResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPREADRESP_TD, "CMmCustomMessHandler::UiccGBABootstrapReadResp" ); iRandBuf.Zero(); @@ -6794,7 +6791,7 @@ else { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccGBABootstrapReadResp. File too small for update\n" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPREADRESP, "CMmCustomMessHandler::UiccGBABootstrapReadResp. File too small for update" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPREADRESP_TD, "CMmCustomMessHandler::UiccGBABootstrapReadResp. File too small for update" ); iMessageRouter->Complete( ECustomGetSimAuthenticationDataIPC, KErrArgument ); @@ -6803,7 +6800,7 @@ else { TFLOGSTRING2("TSY: CMmCustomMessHandler::UiccGBABootstrapReadResp. EFgba reading failed (0x%x)\n", aStatus ); -OstTrace1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPREADRESP, "CMmCustomMessHandler::UiccGBABootstrapReadResp. EFgba reading failed (%x)", aStatus ); +OstTrace1( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPREADRESP_TD, "CMmCustomMessHandler::UiccGBABootstrapReadResp. EFgba reading failed (%x)", aStatus ); iMessageRouter->Complete( ECustomGetSimAuthenticationDataIPC, KErrMMEtelAuthenticateFailed ); @@ -6819,7 +6816,7 @@ void CMmCustomMessHandler::UiccGBABootstrapUpdateResp( TInt aStatus ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccGBABootstrapUpdateResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPUPDATERESP, "CMmCustomMessHandler::UiccGBABootstrapUpdateResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCGBABOOTSTRAPUPDATERESP_TD, "CMmCustomMessHandler::UiccGBABootstrapUpdateResp" ); TInt ret( KErrGeneral ); RMmCustomAPI::TSimAuthenticationGbaBootstrapUpdate gbaBootstrapUpdate; @@ -6861,7 +6858,7 @@ const CMmDataPackage& aDataPackage ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccCreateGBABootstrapNafDerivationApdu.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATEGBABOOTSTRAPNAFDERIVATIONAPDU, "CMmCustomMessHandler::UiccCreateGBABootstrapNafDerivationApdu" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATEGBABOOTSTRAPNAFDERIVATIONAPDU_TD, "CMmCustomMessHandler::UiccCreateGBABootstrapNafDerivationApdu" ); RMmCustomAPI::TSimAuthenticationGbaNafDerivation gbaBootstrapNafDerivation; aDataPackage.UnPackData( gbaBootstrapNafDerivation ); @@ -6900,7 +6897,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccGBABootstrapNafDerivationApduResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCGBANAFDERIVATIONAPDURESP, "CMmCustomMessHandler::UiccGBANafDerivationApduResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCGBANAFDERIVATIONAPDURESP_TD, "CMmCustomMessHandler::UiccGBANafDerivationApduResp" ); TInt ret( KErrNone ); RMmCustomAPI::TSimAuthenticationGbaNafDerivation gbaNafDerivation; @@ -6928,7 +6925,7 @@ else { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccGBABootstrapNafDerivationApduResp: APDU validation failed\n" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCGBANAFDERIVATIONAPDURESP, "CMmCustomMessHandler::UiccGBANafDerivationApduResp: APDU validation failed" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCGBANAFDERIVATIONAPDURESP_TD, "CMmCustomMessHandler::UiccGBANafDerivationApduResp: APDU validation failed" ); ret = KErrGeneral; } } @@ -6939,14 +6936,14 @@ else { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccGBABootstrapNafDerivationApduResp: unknown result\n" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_UICCGBANAFDERIVATIONAPDURESP, "CMmCustomMessHandler::UiccGBANafDerivationApduResp: unknown result" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_UICCGBANAFDERIVATIONAPDURESP_TD, "CMmCustomMessHandler::UiccGBANafDerivationApduResp: unknown result" ); ret = KErrGeneral; } } else { TFLOGSTRING2("TSY: CMmCustomMessHandler::UiccGBABootstrapNafDerivationApduResp: UICC status not ok: 0x%x\n", aStatus ); -OstTrace1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_UICCGBANAFDERIVATIONAPDURESP, "CMmCustomMessHandler::UiccGBANafDerivationApduResp: UICC status not ok: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_UICCGBANAFDERIVATIONAPDURESP_TD, "CMmCustomMessHandler::UiccGBANafDerivationApduResp: UICC status not ok: 0x%x", aStatus ); ret = KErrMMEtelAuthenticateFailed; } @@ -6979,7 +6976,7 @@ const CMmDataPackage& aDataPackage ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccCreateMbmsMskUpdateApdu.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATEMBMSMSKUPDATEAPDU, "CMmCustomMessHandler::UiccCreateMbmsMskUpdateApdu" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATEMBMSMSKUPDATEAPDU_TD, "CMmCustomMessHandler::UiccCreateMbmsMskUpdateApdu" ); // Note. MBMS functionality is not tested in real hardware and in real environmen // because of there is no users for this authentication type. So this is implemented @@ -7018,7 +7015,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccMbmsMskUpdateApduResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCMBMSMSKUPDATEAPDURESP, "CMmCustomMessHandler::UiccMbmsMskUpdateApduResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCMBMSMSKUPDATEAPDURESP_TD, "CMmCustomMessHandler::UiccMbmsMskUpdateApduResp" ); // Note. MBMS functionality is not tested in real hardware and in real environment // because of at the moment there is no users for this authentication type. @@ -7101,7 +7098,7 @@ else { TFLOGSTRING2("TSY: CMmCustomMessHandler::UiccMbmsMskUpdateApduResp: UICC status not ok: 0x%x\n", aStatus ); -OstTrace1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCMBMSMSKUPDATEAPDURESP, "CMmCustomMessHandler::UiccMbmsMskUpdateApduResp: UICC status not ok: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCMBMSMSKUPDATEAPDURESP_TD, "CMmCustomMessHandler::UiccMbmsMskUpdateApduResp: UICC status not ok: 0x%x", aStatus ); ret = KErrMMEtelAuthenticateFailed; } @@ -7137,7 +7134,7 @@ TDesC8& aMbmsData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccMskUpdateHandleMbmsOperationData.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCMSKUPDATEHANDLEMBMSOPERATIONDATA, "CMmCustomMessHandler::UiccMskUpdateHandleMbmsOperationData" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCMSKUPDATEHANDLEMBMSOPERATIONDATA_TD, "CMmCustomMessHandler::UiccMskUpdateHandleMbmsOperationData" ); TUint8 index( 0 ); TUint32 objLen( aMbmsData.Length() ); @@ -7170,7 +7167,7 @@ TDesC8& aMbmsData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccMskUpdateHandleOMABcastOperationData.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCMSKUPDATEHANDLEOMABCASTOPERATIONDATA, "CMmCustomMessHandler::UiccMskUpdateHandleOMABcastOperationData" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCMSKUPDATEHANDLEOMABCASTOPERATIONDATA_TD, "CMmCustomMessHandler::UiccMskUpdateHandleOMABcastOperationData" ); TBuf8 omaBcastData; @@ -7212,7 +7209,7 @@ const CMmDataPackage& aDataPackage ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccCreateMbmsMtkGenerationApdu.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATEMBMSMTKGENERATIONAPDU, "CMmCustomMessHandler::UiccCreateMbmsMtkGenerationApdu" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATEMBMSMTKGENERATIONAPDU_TD, "CMmCustomMessHandler::UiccCreateMbmsMtkGenerationApdu" ); // Note. MBMS functionality is not tested in real hardware and in real environment // because of at the moment there is no users for this authentication type. @@ -7251,7 +7248,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccMbmsMtkGenerationApduResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCMBMSMTKGENERATIONAPDURESP, "CMmCustomMessHandler::UiccMbmsMtkGenerationApduResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCMBMSMTKGENERATIONAPDURESP_TD, "CMmCustomMessHandler::UiccMbmsMtkGenerationApduResp" ); // Note. MBMS functionality is not tested in real hardware and in real environment // because of at the moment there is no users for this authentication type. @@ -7328,7 +7325,7 @@ else { TFLOGSTRING2("TSY: CMmCustomMessHandler::UiccMbmsMtkGenerationApduResp: UICC status not ok: 0x%x\n", aStatus ); -OstTrace1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCMBMSMTKGENERATIONAPDURESP, "CMmCustomMessHandler::UiccMbmsMtkGenerationApduResp: UICC status not ok: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCMBMSMTKGENERATIONAPDURESP_TD, "CMmCustomMessHandler::UiccMbmsMtkGenerationApduResp: UICC status not ok: 0x%x", aStatus ); ret = KErrMMEtelAuthenticateFailed; } @@ -7364,7 +7361,7 @@ TDesC8& aMbmsData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccMtkGenHandleMbmsOperationData.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCMTKGENHANDLEMBMSOPERATIONDATA, "CMmCustomMessHandler::UiccMtkGenHandleMbmsOperationData" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCMTKGENHANDLEMBMSOPERATIONDATA_TD, "CMmCustomMessHandler::UiccMtkGenHandleMbmsOperationData" ); TUint8 index( 0 ); TUint32 objLen( aMbmsData.Length() ); @@ -7397,7 +7394,7 @@ TDesC8& aMbmsData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccMtkGenHandleOMABcastOperationData.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCMTKGENHANDLEOMABCASTOPERATIONDATA, "CMmCustomMessHandler::UiccMtkGenHandleOMABcastOperationData" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCMTKGENHANDLEOMABCASTOPERATIONDATA_TD, "CMmCustomMessHandler::UiccMtkGenHandleOMABcastOperationData" ); TBuf8 omaBcastData; @@ -7443,7 +7440,7 @@ const CMmDataPackage& aDataPackage ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccCreateMbmsMskDeletionApdu.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATEMBMSMSKDELETIONAPDU, "CMmCustomMessHandler::UiccCreateMbmsMskDeletionApdu" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATEMBMSMSKDELETIONAPDU_TD, "CMmCustomMessHandler::UiccCreateMbmsMskDeletionApdu" ); // Note. MBMS functionality is not tested in real hardware and in real environment // because of at the moment there is no users for this authentication type. @@ -7495,7 +7492,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccMbmsMskDeletionApduResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCMBMSMSKDELETIONAPDURESP, "CMmCustomMessHandler::UiccMbmsMskDeletionApduResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCMBMSMSKDELETIONAPDURESP_TD, "CMmCustomMessHandler::UiccMbmsMskDeletionApduResp" ); // Note. MBMS functionality is not tested in real hardware and in real environment // because of at the moment there is no users for this authentication type. @@ -7550,7 +7547,7 @@ else { TFLOGSTRING2("TSY: CMmCustomMessHandler::UiccMbmsMskDeletionApduResp: UICC status not ok: 0x%x\n", aStatus ); -OstTrace1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCMBMSMSKDELETIONAPDURESP, "CMmCustomMessHandler::UiccMbmsMskDeletionApduResp: UICC status not ok: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_UICCMBMSMSKDELETIONAPDURESP_TD, "CMmCustomMessHandler::UiccMbmsMskDeletionApduResp: UICC status not ok: 0x%x", aStatus ); ret = KErrMMEtelAuthenticateFailed; } @@ -7584,7 +7581,7 @@ void CMmCustomMessHandler::UiccCreateFirstBlockOfAuthRespApdu( TUiccTrId aTrId ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccCreateFirstBlockOfAuthRespApdu.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATEFIRSTBLOCKOFAUTHRESPAPDU, "CMmCustomMessHandler::UiccCreateFirstBlockOfAuthRespApdu" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCCREATEFIRSTBLOCKOFAUTHRESPAPDU_TD, "CMmCustomMessHandler::UiccCreateFirstBlockOfAuthRespApdu" ); // Fill parameters to instance created from TUiccSendApdu // needed for APDU sending @@ -7616,7 +7613,7 @@ TUint8 CMmCustomMessHandler::MapSw1Sw2ToAuthenticateResult( TUint8 sw1, TUint8 sw2 ) { TFLOGSTRING3("TSY: CMmCustomMessHandler::MapSw1Sw2ToAuthenticateResult. sw1: 0x%x sw2: 0x%x\n", sw1, sw2 ); -OstTraceExt2( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_MAPSW1SW2TOAUTHENTICATERESULT, "CMmCustomMessHandler::MapSw1Sw2ToAuthenticateResult. sw1: 0x%x sw2: 0x%x", sw1, sw2 ); +OstTraceExt2( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_MAPSW1SW2TOAUTHENTICATERESULT_TD, "CMmCustomMessHandler::MapSw1Sw2ToAuthenticateResult. sw1: 0x%x sw2: 0x%x", sw1, sw2 ); TUint8 ret( KUnknownCommandEnding ); @@ -7746,7 +7743,7 @@ default: { TFLOGSTRING("TSY: CMmCustomMessHandler::ValidateReceivedAuthenticateApdu: unknown APDU\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_VALIDATERECEIVEDAUTHENTICATEAPDU, "CMmCustomMessHandler::ValidateReceivedAuthenticateApdu: unknown APDU" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_VALIDATERECEIVEDAUTHENTICATEAPDU_TD, "CMmCustomMessHandler::ValidateReceivedAuthenticateApdu: unknown APDU" ); ret = KApduNok; break; } @@ -7762,7 +7759,7 @@ TUint8 CMmCustomMessHandler::ValidateGsmSecurityContextApduResp( const TDesC8& aApdu ) { TFLOGSTRING("TSY: CMmCustomMessHandler::ValidateGsmSecurityContextApduResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_VALIDATEGSMSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::ValidateGsmSecurityContextApduResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_VALIDATEGSMSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::ValidateGsmSecurityContextApduResp" ); TUint8 ret( KApduNok ); // apdu len is len of aApdu - 2 (because of @@ -7789,7 +7786,7 @@ TUint8 CMmCustomMessHandler::Validate3GSecurityContextApduResp( const TDesC8& aApdu ) { TFLOGSTRING("TSY: CMmCustomMessHandler::Validate3GSecurityContextApduResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Validate3GSecurityContextApduResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Validate3GSecurityContextApduResp" ); TUint8 ret( KApduOk ); @@ -7806,7 +7803,7 @@ if( KMinLenOfRes > aApdu[index] || KMaxLenOfRes < aApdu[index] ) { TFLOGSTRING("TSY: CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid RES\n" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid RES" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid RES" ); ret = KApduNok; } else @@ -7822,7 +7819,7 @@ if( KApduNok != ret ) { TFLOGSTRING("TSY: CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid CK\n" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid CK" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid CK" ); ret = KApduNok; } } @@ -7839,7 +7836,7 @@ if( KApduNok != ret ) { TFLOGSTRING("TSY: CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid IK\n" ); -OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid IK" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid IK" ); ret = KApduNok; } } @@ -7861,7 +7858,7 @@ if( KLenOfKc != aApdu[index] ) { TFLOGSTRING("TSY: CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid Kc\n" ); -OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid Kc" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid Kc" ); ret = KApduNok; } else @@ -7876,7 +7873,7 @@ if( KApduOk == ret && index > apduLen - 1 ) { TFLOGSTRING("TSY: CMmCustomMessHandler::Validate3GSecurityContextApduResp: error, APDU buffer overflow\n" ); -OstTrace0( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: error, APDU buffer overflow" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: error, APDU buffer overflow" ); ret = KApduNok; } } @@ -7887,7 +7884,7 @@ if( KLenOfAuts != aApdu[index]) { TFLOGSTRING("TSY: CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid AUTS\n" ); -OstTrace0( TRACE_NORMAL, DUP6_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid AUTS" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: invalid AUTS" ); ret = KApduNok; } else @@ -7901,14 +7898,14 @@ if( KApduOk == ret && index > apduLen - 1 ) { TFLOGSTRING("TSY: CMmCustomMessHandler::Validate3GSecurityContextApduResp: error, APDU buffer overflow\n" ); -OstTrace0( TRACE_NORMAL, DUP7_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: error, APDU buffer overflow" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: error, APDU buffer overflow" ); ret = KApduNok; } } else { TFLOGSTRING("TSY: CMmCustomMessHandler::Validate3GSecurityContextApduResp: error, unknown tag\n" ); -OstTrace0( TRACE_NORMAL, DUP8_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: error, unknown tag" ); +OstTrace0( TRACE_NORMAL, DUP8_CMMCUSTOMMESSHANDLER_VALIDATE3GSECURITYCONTEXTAPDURESP_TD, "CMmCustomMessHandler::Validate3GSecurityContextApduResp: error, unknown tag" ); ret = KApduNok; } @@ -7923,7 +7920,7 @@ TUint8 CMmCustomMessHandler::ValidateGBABootstrappingApduResp( const TDesC8& aApdu ) { TFLOGSTRING("TSY: CMmCustomMessHandler::ValidateGBABootstrappingApduResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_VALIDATEGBABOOTSTRAPPINGAPDURESP, "CMmCustomMessHandler::ValidateGBABootstrappingApduResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_VALIDATEGBABOOTSTRAPPINGAPDURESP_TD, "CMmCustomMessHandler::ValidateGBABootstrappingApduResp" ); TUint8 ret( KApduNok ); @@ -7957,7 +7954,7 @@ TUint8 CMmCustomMessHandler::ValidateGBANafDerivationApduResp( const TDesC8& aApdu ) { TFLOGSTRING("TSY: CMmCustomMessHandler::ValidateGBANafDerivationApduResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_VALIDATEGBANAFDERIVATIONAPDURESP, "CMmCustomMessHandler::ValidateGBANafDerivationApduResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_VALIDATEGBANAFDERIVATIONAPDURESP_TD, "CMmCustomMessHandler::ValidateGBANafDerivationApduResp" ); TUint8 ret = KApduNok; @@ -7994,7 +7991,7 @@ TUint8 CMmCustomMessHandler::ValidateRunGsmAlgorithmApduResp( const TDesC8& aApdu ) { TFLOGSTRING("TSY: CMmCustomMessHandler::ValidateRunGsmAlgorithmApduResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_VALIDATERUNGSMALGORITHMAPDURESP, "CMmCustomMessHandler::ValidateRunGsmAlgorithmApduResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_VALIDATERUNGSMALGORITHMAPDURESP_TD, "CMmCustomMessHandler::ValidateRunGsmAlgorithmApduResp" ); TUint8 ret( KApduNok ); @@ -8017,7 +8014,7 @@ TDes8& aTlvObject ) { TFLOGSTRING2("TSY: CMmCustomMessHandler::FindTlvObject (tag: 0x%x)\n", aTlvTag ); -OstTrace1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_FINDTLVOBJECT, "CMmCustomMessHandler::FindTlvObject (tag: 0x%x)", aTlvTag ); +OstTrace1( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_FINDTLVOBJECT_TD, "CMmCustomMessHandler::FindTlvObject (tag: 0x%x)", aTlvTag ); TBool ret( EFalse ); TUint32 index( 0 ); @@ -8054,22 +8051,22 @@ { // tlv object found TFLOGSTRING2("TSY: CMmCustomMessHandler::FindTlvObject: tag: 0x%x found\n", aTlvTag ); -OstTrace1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_FINDTLVOBJECT, "CMmCustomMessHandler::FindTlvObject: tag: 0x%x found", aTlvTag ); +OstTrace1( TRACE_NORMAL, DUP1_CMMCUSTOMMESSHANDLER_FINDTLVOBJECT_TD, "CMmCustomMessHandler::FindTlvObject: tag: 0x%x found", aTlvTag ); aTlvObject.Copy( aBerTlv.Mid( index , tlvLength ) ); ret = ETrue; } else { TFLOGSTRING3("TSY: CMmCustomMessHandler::FindTlvObject: length of aTlvObject is not enough, needed: %d max size: %d \n", tlvLength, aTlvObject.MaxSize() ); -OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_FINDTLVOBJECT, "CMmCustomMessHandler::FindTlvObject: length of aTlvObject is not enough" ); -OstTrace1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_FINDTLVOBJECT, "CMmCustomMessHandler::FindTlvObject: needed: %d", tlvLength ); -OstTrace1( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_FINDTLVOBJECT, "CMmCustomMessHandler::FindTlvObject: max size: %d", aTlvObject.MaxSize() ); +OstTrace0( TRACE_NORMAL, DUP2_CMMCUSTOMMESSHANDLER_FINDTLVOBJECT_TD, "CMmCustomMessHandler::FindTlvObject: length of aTlvObject is not enough" ); +OstTrace1( TRACE_NORMAL, DUP3_CMMCUSTOMMESSHANDLER_FINDTLVOBJECT_TD, "CMmCustomMessHandler::FindTlvObject: needed: %d", tlvLength ); +OstTrace1( TRACE_NORMAL, DUP4_CMMCUSTOMMESSHANDLER_FINDTLVOBJECT_TD, "CMmCustomMessHandler::FindTlvObject: max size: %d", aTlvObject.MaxSize() ); } } else { TFLOGSTRING("TSY: CMmCustomMessHandler::FindTlvObject: buffer overflow \n" ); -OstTrace0( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_FINDTLVOBJECT, "CMmCustomMessHandler::FindTlvObject: buffer overflow" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMCUSTOMMESSHANDLER_FINDTLVOBJECT_TD, "CMmCustomMessHandler::FindTlvObject: buffer overflow" ); } break; } @@ -8093,7 +8090,7 @@ const TDesC8& aKc ) { TFLOGSTRING("TSY: CMmCustomMessHandler::DeriveCkFromKc.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_DERIVECKFROMKC, "CMmCustomMessHandler::DeriveCkFromKc" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_DERIVECKFROMKC_TD, "CMmCustomMessHandler::DeriveCkFromKc" ); /* This operation calculates the UMTS Ciphering Key (CK) from the GSM Ciphering Key (Kc). This is done by using the c4 algorithm defined in @@ -8121,7 +8118,7 @@ const TDesC8& aKc ) { TFLOGSTRING("TSY: CMmCustomMessHandler::DeriveIkFromKc.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_DERIVEIKFROMKC, "CMmCustomMessHandler::DeriveIkFromKc" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_DERIVEIKFROMKC_TD, "CMmCustomMessHandler::DeriveIkFromKc" ); /* This operation derives the UMTS Integrity Key (IK) from the GSM Ciphering Key (Kc). This is done by using the c5 algorithm defined in @@ -8173,7 +8170,7 @@ const CMmDataPackage& aDataPackage ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccHandleImsAuthentication.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCHANDLEIMSAUTHENTICATION, "CMmCustomMessHandler::UiccHandleImsAuthentication" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCHANDLEIMSAUTHENTICATION_TD, "CMmCustomMessHandler::UiccHandleImsAuthentication" ); TInt ret( KErrNone ); // IMS authentication: @@ -8278,7 +8275,7 @@ void CMmCustomMessHandler::UiccHandleIsimActivationResp( TInt aStatus ) { TFLOGSTRING("TSY: CMmCustomMessHandler::UiccHandleIsimActivationResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCHANDLEISIMACTIVATIONRESP, "CMmCustomMessHandler::UiccHandleIsimActivationResp" ); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_UICCHANDLEISIMACTIVATIONRESP_TD, "CMmCustomMessHandler::UiccHandleIsimActivationResp" ); TUiccSendApdu params; params.messHandlerPtr = static_cast( this ); @@ -8311,6 +8308,45 @@ } } +// ----------------------------------------------------------------------------- +// CMmCustomMessHandler::CollectCbTopicIdsL +// Collects cellbroadcast topic IDs into array. Leaves if nothig found +// ----------------------------------------------------------------------------- +// +CArrayFixFlat* CMmCustomMessHandler::CollectCbTopicIdsL( + const TDesC16& aTopicIds ) const + { +TFLOGSTRING("TSY: CMmCustomMessHandler::CollectCbTopicIdsL"); +OstTrace0( TRACE_NORMAL, CMMCUSTOMMESSHANDLER_COLLECTCBTOPICIDSL, "CMmCustomMessHandler::CollectCbTopicIdsL" ); + + CArrayFixFlat* simCbTopics = + new ( ELeave ) CArrayFixFlat ( + aTopicIds.Length() ); + CleanupStack::PushL( simCbTopics ); + for ( TInt i = 0; i < aTopicIds.Length(); i++ ) + { + TUint16 cbId = + ( aTopicIds[i] >> 8 ) | ( aTopicIds[i] << 8 ); + if ( KUnusedCbMsgId != cbId ) + { + RMmCustomAPI::TSimCbTopic simCbTopic; + // CB ID + simCbTopic.iNumber = cbId; + // Topic names are not stored on the SIM + simCbTopic.iName.Zero(); + // Add CB topic to array + simCbTopics->AppendL( simCbTopic ); + } + } + simCbTopics->Compress(); + // handle this like error case + __ASSERT_ALWAYS( + 0 < simCbTopics->Count(), User::Leave( KErrNotFound ) ); + CleanupStack::Pop( simCbTopics ); + + return simCbTopics; + } + // ========================== OTHER EXPORTED FUNCTIONS ========================= //None diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmdataporthandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmdataporthandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmdataporthandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -69,7 +69,7 @@ { TFLOGSTRING("TSY: CMmDataPortHandler::CMmDataPortHandler"); -OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_CMMDATAPORTHANDLER, "CMmDataPortHandler::CMmDataPortHandler" ); +OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_CMMDATAPORTHANDLER_TD, "CMmDataPortHandler::CMmDataPortHandler" ); } @@ -82,7 +82,7 @@ { TFLOGSTRING("TSY: CMmDataPortHandler::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_CONSTRUCTL, "CMmDataPortHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_CONSTRUCTL_TD, "CMmDataPortHandler::ConstructL" ); iDP0LoanedToClient = EFalse; iDP1LoanedToClient = EFalse; @@ -105,7 +105,7 @@ { TFLOGSTRING("TSY: CMmDataPortHandler::NewL"); -OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_NEWL, "CMmDataPortHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_NEWL_TD, "CMmDataPortHandler::NewL" ); CMmDataPortHandler* dataHandler = new ( ELeave ) CMmDataPortHandler(); @@ -127,7 +127,7 @@ { TFLOGSTRING("TSY: CMmDataPortHandler::~CMmDataPortHandler"); -OstTrace0( TRACE_NORMAL, DUP1_CMMDATAPORTHANDLER_CMMDATAPORTHANDLER, "CMmDataPortHandler::~CMmDataPortHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMDATAPORTHANDLER_CMMDATAPORTHANDLER_TD, "CMmDataPortHandler::~CMmDataPortHandler" ); // Close Comms server connections if ( ECommsDataportOpened <= iCommsStatus ) @@ -158,7 +158,7 @@ { TFLOGSTRING("TSY: CMmDataPortHandler::ResetInternalAttributes"); -OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_RESETINTERNALATTRIBUTES, "CMmDataPortHandler::ResetInternalAttributes" ); +OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_RESETINTERNALATTRIBUTES_TD, "CMmDataPortHandler::ResetInternalAttributes" ); iBearerService.iBearerCaps = ( RCall::KBearerCapsCompressionNone | RCall::KBearerCapsProtocolUnknown ); @@ -218,7 +218,7 @@ { TFLOGSTRING("TSY: CMmDataPortHandler::InitDataParamsL"); -OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_INITDATAPARAMSL, "CMmDataPortHandler::InitDataParamsL" ); +OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_INITDATAPARAMSL_TD, "CMmDataPortHandler::InitDataParamsL" ); // Open dataport for AT commands. if ( ECommsNotConnected == iCommsStatus ) @@ -232,7 +232,7 @@ { TFLOGSTRING2("TSY: CMmDataPortHandler::OpenDataPortL - Left with error: %d", trapError); -OstTrace1( TRACE_NORMAL, DUP1_CMMDATAPORTHANDLER_INITDATAPARAMSL, "CMmDataPortHandler::InitDataParamsL;Left with error=%d", trapError ); +OstTrace1( TRACE_NORMAL, DUP1_CMMDATAPORTHANDLER_INITDATAPARAMSL_TD, "CMmDataPortHandler::InitDataParamsL;Left with error=%d", trapError ); } //no else @@ -252,7 +252,7 @@ { TFLOGSTRING("TSY: CMmDataPortHandler::OpenDataPortL"); -OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_OPENDATAPORTL, "CMmDataPortHandler::OpenDataPortL" ); +OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_OPENDATAPORTL_TD, "CMmDataPortHandler::OpenDataPortL" ); TInt ret( KErrNone ); @@ -284,14 +284,14 @@ iCommsStatus = ECommsServerConnected; TFLOGSTRING2("TSY: CMmDataPortHandler::OpenDataPortL - iCommPort.iCsy: %S", &iCommPort.iCsy ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMDATAPORTHANDLER_OPENDATAPORTL, "CMmDataPortHandler::OpenDataPortL;iCommPort.iCsy=%S", iCommPort.iCsy ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMDATAPORTHANDLER_OPENDATAPORTL_TD, "CMmDataPortHandler::OpenDataPortL;iCommPort.iCsy=%S", iCommPort.iCsy ); // Load dataport module User::LeaveIfError( iCommServer.LoadCommModule( iCommPort.iCsy ) ); iCommsStatus = ECommsModuleLoaded; TFLOGSTRING2("TSY: CMmDataPortHandler::OpenDataPortL - iCommPort.iPort: %S", &iCommPort.iPort); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMDATAPORTHANDLER_OPENDATAPORTL, "CMmDataPortHandler::OpenDataPortL;iCommPort.iPort=%S", iCommPort.iPort ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMDATAPORTHANDLER_OPENDATAPORTL_TD, "CMmDataPortHandler::OpenDataPortL;iCommPort.iPort=%S", iCommPort.iPort ); // Open dataport User::LeaveIfError( iDataPort.Open( iCommServer, iCommPort.iPort, @@ -337,7 +337,7 @@ { TFLOGSTRING("TSY: CMmDataPortHandler::LoanDataPort"); -OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_LOANDATAPORT, "CMmDataPortHandler::LoanDataPort" ); +OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_LOANDATAPORT_TD, "CMmDataPortHandler::LoanDataPort" ); TInt ret( KErrNone ); TInt callId( KCallIdNone ); @@ -351,7 +351,7 @@ { TFLOGSTRING2("TSY: CMmDataPortHandler::LoanDataPort - Client taking control: %S", &commPort->iPort); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMDATAPORTHANDLER_LOANDATAPORT, "CMmDataPortHandler::LoanDataPort;commPort->iPort=%S", commPort->iPort ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMDATAPORTHANDLER_LOANDATAPORT_TD, "CMmDataPortHandler::LoanDataPort;commPort->iPort=%S", commPort->iPort ); // Check port and mode if ( ( commPort->iPort == KDataPortPort1 || commPort->iPort == KDataPortPort4 || @@ -384,7 +384,7 @@ commPort->iCsy.Copy( KDataPortName ); iDP0LoanedToClient = ETrue; TFLOGSTRING2("TSY: CMmDataPortHandler::LoanDataPort - %S Loaned", &commPort->iPort ); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMDATAPORTHANDLER_LOANDATAPORT, "CMmDataPortHandler::LoanDataPort;commPort->iPort=%S", commPort->iPort ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMDATAPORTHANDLER_LOANDATAPORT_TD, "CMmDataPortHandler::LoanDataPort;commPort->iPort=%S", commPort->iPort ); } else @@ -399,7 +399,7 @@ } TFLOGSTRING2("TSY: CMmDataPortHandler::LoanDataPort - Result: %d", ret ); -OstTrace1( TRACE_NORMAL, DUP1_CMMDATAPORTHANDLER_LOANDATAPORT, "CMmDataPortHandler::LoanDataPort;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP1_CMMDATAPORTHANDLER_LOANDATAPORT_TD, "CMmDataPortHandler::LoanDataPort;ret=%d", ret ); return ret; } @@ -415,7 +415,7 @@ { TFLOGSTRING("TSY: CMmDataPortHandler::GetNextFreeDialUpPort"); -OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_GETNEXTFREEDIALUPPORT, "CMmDataPortHandler::GetNextFreeDialUpPort" ); +OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_GETNEXTFREEDIALUPPORT_TD, "CMmDataPortHandler::GetNextFreeDialUpPort" ); TInt result( KErrNone ); @@ -425,7 +425,7 @@ TFLOGSTRING2("TSY: CMmDataPortHandler::GetNextFreeDialUpPort - %S Free", &aCommPort->iPort ); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMDATAPORTHANDLER_GETNEXTFREEDIALUPPORT, "CMmDataPortHandler::GetNextFreeDialUpPort;aCommPort->iPort=%S Free", aCommPort->iPort ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMDATAPORTHANDLER_GETNEXTFREEDIALUPPORT_TD, "CMmDataPortHandler::GetNextFreeDialUpPort;aCommPort->iPort=%S Free", aCommPort->iPort ); } else if ( !iDP4LoanedToClient ) { @@ -433,7 +433,7 @@ TFLOGSTRING2("TSY: CMmDataPortHandler::GetNextFreeDialUpPort - %S Free", &aCommPort->iPort ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMDATAPORTHANDLER_GETNEXTFREEDIALUPPORT, "CMmDataPortHandler::GetNextFreeDialUpPort;aCommPort->iPort=%S Free", aCommPort->iPort ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMDATAPORTHANDLER_GETNEXTFREEDIALUPPORT_TD, "CMmDataPortHandler::GetNextFreeDialUpPort;aCommPort->iPort=%S Free", aCommPort->iPort ); } else if ( !iDP5LoanedToClient ) { @@ -441,7 +441,7 @@ TFLOGSTRING2("TSY: CMmDataPortHandler::GetNextFreeDialUpPort - %S Free", &aCommPort->iPort ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMDATAPORTHANDLER_GETNEXTFREEDIALUPPORT, "CMmDataPortHandler::GetNextFreeDialUpPort;aCommPort->iPort=%S - Free", aCommPort->iPort ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMDATAPORTHANDLER_GETNEXTFREEDIALUPPORT_TD, "CMmDataPortHandler::GetNextFreeDialUpPort;aCommPort->iPort=%S - Free", aCommPort->iPort ); } else { @@ -462,7 +462,7 @@ { TFLOGSTRING("TSY: CMmDataPortHandler::LoanDialUpPort"); -OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_LOANDIALUPPORT, "CMmDataPortHandler::LoanDialUpPort" ); +OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_LOANDIALUPPORT_TD, "CMmDataPortHandler::LoanDialUpPort" ); TInt result( KErrNone ); @@ -475,7 +475,7 @@ TFLOGSTRING2("TSY: CMmDataPortHandler::LoanDialUpPort - %S Loaned", &aCommPort->iPort ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMDATAPORTHANDLER_LOANDIALUPPORT, "CMmDataPortHandler::LoanDialUpPort;aCommPort->iPort=%S Loaned", aCommPort->iPort ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMDATAPORTHANDLER_LOANDIALUPPORT_TD, "CMmDataPortHandler::LoanDialUpPort;aCommPort->iPort=%S Loaned", aCommPort->iPort ); } else { @@ -491,7 +491,7 @@ TFLOGSTRING2("TSY: CMmDataPortHandler::LoanDialUpPort - %S Loaned", &aCommPort->iPort ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMDATAPORTHANDLER_LOANDIALUPPORT, "CMmDataPortHandler::LoanDialUpPort;aCommPort->iPort=%S Loaned", aCommPort->iPort ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMDATAPORTHANDLER_LOANDIALUPPORT_TD, "CMmDataPortHandler::LoanDialUpPort;aCommPort->iPort=%S Loaned", aCommPort->iPort ); } else { @@ -507,7 +507,7 @@ TFLOGSTRING2("TSY: CMmDataPortHandler::LoanDialUpPort - %S Loaned", &aCommPort->iPort ); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMDATAPORTHANDLER_LOANDIALUPPORT, "CMmDataPortHandler::LoanDialUpPort;aCommPort->iPort=%S Loaned", aCommPort->iPort ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMDATAPORTHANDLER_LOANDIALUPPORT_TD, "CMmDataPortHandler::LoanDialUpPort;aCommPort->iPort=%S Loaned", aCommPort->iPort ); } else { @@ -533,7 +533,7 @@ const CCallDataPackage* aCallDataPackage ) { TFLOGSTRING("TSY: CMmDataPortHandler::RecoverDataPort"); -OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_RECOVERDATAPORT, "CMmDataPortHandler::RecoverDataPort" ); +OstTrace0( TRACE_NORMAL, CMMDATAPORTHANDLER_RECOVERDATAPORT_TD, "CMmDataPortHandler::RecoverDataPort" ); TInt ret( KErrNone ); RCall::TCommPort* commPort = NULL; @@ -544,7 +544,7 @@ { TFLOGSTRING2("TSY: CMmDataPortHandler::RecoverDataPort - Client returning control: %S", &commPort->iPort ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMDATAPORTHANDLER_RECOVERDATAPORT, "CMmDataPortHandler::RecoverDataPort;Client returning control=%S", commPort->iPort ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMDATAPORTHANDLER_RECOVERDATAPORT_TD, "CMmDataPortHandler::RecoverDataPort;Client returning control=%S", commPort->iPort ); // Check if port 0 has been loaned if ( iDP0LoanedToClient && commPort->iPort == KDataPortPort0 ) { @@ -552,25 +552,25 @@ // noone needs remaining data in buffers ret = iDataPort.ResetBuffers(); TFLOGSTRING2("TSY: CMmDataPortHandler::RecoverDataPort - %S Recovered", &commPort->iPort ); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMDATAPORTHANDLER_RECOVERDATAPORT, "CMmDataPortHandler::RecoverDataPort;commPort->iPort=%S Recovered", commPort->iPort ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMDATAPORTHANDLER_RECOVERDATAPORT_TD, "CMmDataPortHandler::RecoverDataPort;commPort->iPort=%S Recovered", commPort->iPort ); } else if ( iDP1LoanedToClient && commPort->iPort == KDataPortPort1 ) { iDP1LoanedToClient = EFalse; TFLOGSTRING2("TSY: CMmDataPortHandler::RecoverDataPort - %S Recovered", &commPort->iPort ); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMDATAPORTHANDLER_RECOVERDATAPORT, "CMmDataPortHandler::RecoverDataPort;commPort->iPort=%S Recovered", commPort->iPort ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMDATAPORTHANDLER_RECOVERDATAPORT_TD, "CMmDataPortHandler::RecoverDataPort;commPort->iPort=%S Recovered", commPort->iPort ); } else if ( iDP4LoanedToClient && commPort->iPort == KDataPortPort4 ) { iDP4LoanedToClient = EFalse; TFLOGSTRING2("TSY: CMmDataPortHandler::RecoverDataPort - %S Recovered", &commPort->iPort ); -OstTraceExt1( TRACE_NORMAL, DUP5_CMMDATAPORTHANDLER_RECOVERDATAPORT, "CMmDataPortHandler::RecoverDataPort;commPort->iPort=%S Recovered", commPort->iPort ); +OstTraceExt1( TRACE_NORMAL, DUP5_CMMDATAPORTHANDLER_RECOVERDATAPORT_TD, "CMmDataPortHandler::RecoverDataPort;commPort->iPort=%S Recovered", commPort->iPort ); } else if ( iDP5LoanedToClient && commPort->iPort == KDataPortPort5 ) { iDP5LoanedToClient = EFalse; TFLOGSTRING2("TSY: CMmDataPortHandler::RecoverDataPort - %S Recovered", &commPort->iPort ); -OstTraceExt1( TRACE_NORMAL, DUP6_CMMDATAPORTHANDLER_RECOVERDATAPORT, "CMmDataPortHandler::RecoverDataPort;commPort->iPort=%S Recovered", commPort->iPort ); +OstTraceExt1( TRACE_NORMAL, DUP6_CMMDATAPORTHANDLER_RECOVERDATAPORT_TD, "CMmDataPortHandler::RecoverDataPort;commPort->iPort=%S Recovered", commPort->iPort ); } else { diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmdatautility.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmdatautility.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmdatautility.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -67,7 +67,7 @@ { TFLOGSTRING("TSY: CDataPortWriter::NewL"); -OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_NEWL, "CDataPortWriter::NewL" ); +OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_NEWL_TD, "CDataPortWriter::NewL" ); CDataPortWriter* writer = new ( ELeave ) CDataPortWriter(); CleanupStack::PushL( writer ); @@ -94,7 +94,7 @@ { //None TFLOGSTRING("TSY: CDataPortWriter::CDataPortWriter"); -OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_CDATAPORTWRITER, "CDataPortWriter::CDataPortWriter" ); +OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_CDATAPORTWRITER_TD, "CDataPortWriter::CDataPortWriter" ); } @@ -107,7 +107,7 @@ { TFLOGSTRING("TSY: CDataPortWriter::ConstructL"); -OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_CONSTRUCTL, "CDataPortWriter::ConstructL" ); +OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_CONSTRUCTL_TD, "CDataPortWriter::ConstructL" ); // initialisation of menber variables iWriteCompleted = ETrue; @@ -127,7 +127,7 @@ { TFLOGSTRING("TSY: CDataPortWriter::~CDataPortWriter"); -OstTrace0( TRACE_NORMAL, DUP1_CDATAPORTWRITER_CDATAPORTWRITER, "CDataPortWriter::~CDataPortWriter" ); +OstTrace0( TRACE_NORMAL, DUP1_CDATAPORTWRITER_CDATAPORTWRITER_TD, "CDataPortWriter::~CDataPortWriter" ); Cancel(); @@ -156,7 +156,7 @@ { TFLOGSTRING("TSY: CDataPortWriter::Init Modem initialisation"); -OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_INIT, "CDataPortWriter::Init" ); +OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_INIT_TD, "CDataPortWriter::Init" ); // Initalise modem TBuf8 ATString; @@ -181,7 +181,7 @@ { TFLOGSTRING("TSY: CDataPortWriter::AppendCommandL"); -OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_APPENDCOMMANDL, "CDataPortWriter::AppendCommandL" ); +OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_APPENDCOMMANDL_TD, "CDataPortWriter::AppendCommandL" ); iAtCommandBuffer->AppendL( aCommand ); } @@ -196,7 +196,7 @@ { TFLOGSTRING("TSY: CDataPortWriter::GetAtBuffer"); -OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_GETATBUFFER, "CDataPortWriter::GetAtBuffer" ); +OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_GETATBUFFER_TD, "CDataPortWriter::GetAtBuffer" ); return iAtCommandBuffer; } @@ -213,7 +213,7 @@ { TFLOGSTRING("TSY: CDataPortWriter::Write"); -OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_WRITE, "CDataPortWriter::Write" ); +OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_WRITE_TD, "CDataPortWriter::Write" ); // We are writing data so set the flag to ETrue. iContinueWrite = ETrue; @@ -232,7 +232,7 @@ TFLOGSTRING2("TSY: CDataPortWriter::Write - Stored into FIFO buffer: %S", &data16bit ); -OstTraceExt1( TRACE_NORMAL, DUP1_CDATAPORTWRITER_WRITE, "CDataPortWriter::Write;Stored into FIFO buffer=%S", data16bit ); +OstTraceExt1( TRACE_NORMAL, DUP1_CDATAPORTWRITER_WRITE_TD, "CDataPortWriter::Write;Stored into FIFO buffer=%S", data16bit ); #endif // TF_LOGGING_ENABLED HBufC8* tmp = NULL; @@ -282,7 +282,7 @@ TFLOGSTRING2("TSY: CDataPortWriter::Write - From FIFO buffer: %S", &data16bit); -OstTraceExt1( TRACE_NORMAL, DUP2_CDATAPORTWRITER_WRITE, "CDataPortWriter::Write;From FIFO buffer=%S", data16bit ); +OstTraceExt1( TRACE_NORMAL, DUP2_CDATAPORTWRITER_WRITE_TD, "CDataPortWriter::Write;From FIFO buffer=%S", data16bit ); #endif // TF_LOGGING_ENABLED if ( !IsActive() ) @@ -319,7 +319,7 @@ { TFLOGSTRING("TSY: CDataPortWriter::RunL"); -OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_RUNL, "CDataPortWriter::RunL" ); +OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_RUNL_TD, "CDataPortWriter::RunL" ); #ifdef TF_LOGGING_ENABLED @@ -327,7 +327,7 @@ data16bit.AppendNum( iStatus.Int() ); TFLOGSTRING2("TSY: CDataPortWriter::RunL - iStatus: %S", &data16bit); -OstTrace1( TRACE_NORMAL, DUP2_CDATAPORTWRITER_RUNL, "CDataPortWriter::RunL;iStatus: %d", iStatus.Int() ); +OstTrace1( TRACE_NORMAL, DUP2_CDATAPORTWRITER_RUNL_TD, "CDataPortWriter::RunL;iStatus: %d", iStatus.Int() ); #endif // TF_LOGGING_ENABLED if ( KRequestPending != iStatus.Int() ) @@ -352,7 +352,7 @@ } TFLOGSTRING2("TSY: CDataPortWriter::RunL - AT command deleted from FIFO buffer: %S", &data16bit); -OstTraceExt1( TRACE_NORMAL, DUP1_CDATAPORTWRITER_RUNL, "CDataPortWriter::RunL;AT command deleted from FIFO buffer=%S", data16bit ); +OstTraceExt1( TRACE_NORMAL, DUP1_CDATAPORTWRITER_RUNL_TD, "CDataPortWriter::RunL;AT command deleted from FIFO buffer=%S", data16bit ); #endif // TF_LOGGING_ENABLED if ( iWriteBuffer->At( 0 ) ) @@ -385,7 +385,7 @@ { TFLOGSTRING2("TSY: CDataPortWriter::RunError %d", aError); -OstTrace1( TRACE_NORMAL, CDATAPORTWRITER_RUNERROR, "CDataPortWriter::RunError;aError=%d", aError ); +OstTrace1( TRACE_NORMAL, CDATAPORTWRITER_RUNERROR_TD, "CDataPortWriter::RunError;aError=%d", aError ); // Line object completes client requests in case of an error. iDataPortHandler->HandleDataPortError( aError ); @@ -426,7 +426,7 @@ { TFLOGSTRING("TSY: CDataPortWriter::WriteNextL - Write next command from FIFO"); -OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_WRITENEXTL, "CDataPortWriter::WriteNextL, Write next command from FIFO" ); +OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_WRITENEXTL_TD, "CDataPortWriter::WriteNextL, Write next command from FIFO" ); if ( !IsActive() ) { @@ -464,7 +464,7 @@ TFLOGSTRING2("TSY: CDataPortWriter::WriteNextL - AT command: %S", &data16bit); -OstTraceExt1( TRACE_NORMAL, DUP1_CDATAPORTWRITER_WRITENEXTL, "CDataPortWriter::WriteNextL;AT command=%S", data16bit ); +OstTraceExt1( TRACE_NORMAL, DUP1_CDATAPORTWRITER_WRITENEXTL_TD, "CDataPortWriter::WriteNextL;AT command=%S", data16bit ); #endif //TF_LOGGING_ENABLED // Set active as write is pending @@ -489,7 +489,7 @@ { TFLOGSTRING("CDataPortWriter::DoCancel"); -OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_DOCANCEL, "CDataPortWriter::DoCancel" ); +OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_DOCANCEL_TD, "CDataPortWriter::DoCancel" ); // Stop writing into DP iContinueWrite = EFalse; @@ -507,7 +507,7 @@ { TFLOGSTRING("TSY: CDataPortWriter::BlockWrite - Blocking writes to DP"); -OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_BLOCKWRITE, "CDataPortWriter::BlockWrite" ); +OstTrace0( TRACE_NORMAL, CDATAPORTWRITER_BLOCKWRITE_TD, "CDataPortWriter::BlockWrite" ); // Stop writing into DP until DP reader has flushed RX buffer iContinueWrite = EFalse; @@ -527,7 +527,7 @@ { TFLOGSTRING("TSY: CDataPortReader::NewL"); -OstTrace0( TRACE_NORMAL, CDATAPORTREADER_NEWL, "CDataPortReader::NewL" ); +OstTrace0( TRACE_NORMAL, CDATAPORTREADER_NEWL_TD, "CDataPortReader::NewL" ); CDataPortReader* reader = new ( ELeave ) CDataPortReader(); CleanupStack::PushL( reader ); @@ -554,7 +554,7 @@ { TFLOGSTRING("TSY: CDataPortReader::CDataPortReader"); -OstTrace0( TRACE_NORMAL, CDATAPORTREADER_CDATAPORTREADER, "CDataPortReader::CDataPortReader" ); +OstTrace0( TRACE_NORMAL, CDATAPORTREADER_CDATAPORTREADER_TD, "CDataPortReader::CDataPortReader" ); // initialisation of meneber variables iModemInitComplete = EFalse; @@ -571,7 +571,7 @@ { TFLOGSTRING("TSY: CDataPortReader::~CDataPortReader"); -OstTrace0( TRACE_NORMAL, DUP1_CDATAPORTREADER_CDATAPORTREADER, "CDataPortReader::~CDataPortReader" ); +OstTrace0( TRACE_NORMAL, DUP1_CDATAPORTREADER_CDATAPORTREADER_TD, "CDataPortReader::~CDataPortReader" ); Cancel(); } @@ -586,7 +586,7 @@ { TFLOGSTRING("CDataPortReader::DoCancel"); -OstTrace0( TRACE_NORMAL, CDATAPORTREADER_DOCANCEL, "CDataPortReader::DoCancel" ); +OstTrace0( TRACE_NORMAL, CDATAPORTREADER_DOCANCEL_TD, "CDataPortReader::DoCancel" ); // Stop reading from DP iContinueRead = EFalse; @@ -603,7 +603,7 @@ { TFLOGSTRING("TSY: CDataPortReader::Read Start reading"); -OstTrace0( TRACE_NORMAL, CDATAPORTREADER_READ, "CDataPortReader::Read" ); +OstTrace0( TRACE_NORMAL, CDATAPORTREADER_READ_TD, "CDataPortReader::Read" ); iContinueRead = ETrue; // If already active, don't make a new request @@ -627,7 +627,7 @@ { TFLOGSTRING("TSY: CDataPortReader::ReadAll - Read all data from DP"); -OstTrace0( TRACE_NORMAL, CDATAPORTREADER_READALL, "CDataPortReader::ReadAll, Read all data from DP" ); +OstTrace0( TRACE_NORMAL, CDATAPORTREADER_READALL_TD, "CDataPortReader::ReadAll, Read all data from DP" ); iContinueRead = ETrue; @@ -641,7 +641,7 @@ TFLOGSTRING2("TSY: CDataPortReader::ReadAll - Data remaining: %d", dataLen ); -OstTrace1( TRACE_NORMAL, DUP1_CDATAPORTREADER_READALL, "CDataPortReader::ReadAll;Data remaining=%d", dataLen ); +OstTrace1( TRACE_NORMAL, DUP1_CDATAPORTREADER_READALL_TD, "CDataPortReader::ReadAll;Data remaining=%d", dataLen ); // Block DP writer, so that it does not generate more // responses from modem. Continue when RX buffer is empty. iDataPortWriter->BlockWrite(); @@ -652,7 +652,7 @@ { TFLOGSTRING("TSY: CDataPortReader::ReadAll - Starting to read remaining data (flushing)"); -OstTrace0( TRACE_NORMAL, DUP2_CDATAPORTREADER_READALL, "CDataPortReader::ReadAll, Starting to read remaining data (flushing)" ); +OstTrace0( TRACE_NORMAL, DUP2_CDATAPORTREADER_READALL_TD, "CDataPortReader::ReadAll, Starting to read remaining data (flushing)" ); iResp.SetLength( 0 ); iDataPort.Read( iStatus, iResp ); @@ -662,14 +662,14 @@ { TFLOGSTRING("TSY: CDataPortReader::ReadAll - Read still pending!"); -OstTrace0( TRACE_NORMAL, DUP3_CDATAPORTREADER_READALL, "CDataPortReader::ReadAll, Read still pending!" ); +OstTrace0( TRACE_NORMAL, DUP3_CDATAPORTREADER_READALL_TD, "CDataPortReader::ReadAll, Read still pending!" ); } } else { TFLOGSTRING("TSY: CDataPortReader::ReadAll - Init going or no data in RX"); -OstTrace0( TRACE_NORMAL, DUP4_CDATAPORTREADER_READALL, "CDataPortReader::ReadAll, Init going or no data in RX" ); +OstTrace0( TRACE_NORMAL, DUP4_CDATAPORTREADER_READALL_TD, "CDataPortReader::ReadAll, Init going or no data in RX" ); if ( 0 >= dataLen ) { // Set read all complete flag to true, there is no data waiting @@ -682,7 +682,7 @@ { TFLOGSTRING("TSY: CDataPortReader::ReadAll - Start normal reading"); -OstTrace0( TRACE_NORMAL, DUP5_CDATAPORTREADER_READALL, "CDataPortReader::ReadAll, Start normal reading" ); +OstTrace0( TRACE_NORMAL, DUP5_CDATAPORTREADER_READALL_TD, "CDataPortReader::ReadAll, Start normal reading" ); iResp.SetLength( 0 ); iDataPort.Read( iStatus, iResp ); @@ -702,7 +702,7 @@ { TFLOGSTRING("TSY: CDataPortReader::ReadCancel"); -OstTrace0( TRACE_NORMAL, CDATAPORTREADER_READCANCEL, "CDataPortReader::ReadCancel" ); +OstTrace0( TRACE_NORMAL, CDATAPORTREADER_READCANCEL_TD, "CDataPortReader::ReadCancel" ); // Stop reading from DP iContinueRead = EFalse; @@ -719,7 +719,7 @@ { TFLOGSTRING("TSY: CDataPortReader::ModemInitComplete"); -OstTrace0( TRACE_NORMAL, CDATAPORTREADER_MODEMINITCOMPLETE, "CDataPortReader::ModemInitComplete" ); +OstTrace0( TRACE_NORMAL, CDATAPORTREADER_MODEMINITCOMPLETE_TD, "CDataPortReader::ModemInitComplete" ); iModemInitComplete = ETrue; } @@ -734,7 +734,7 @@ { TFLOGSTRING("TSY: CDataPortReader::RunL"); -OstTrace0( TRACE_NORMAL, CDATAPORTREADER_RUNL, "CDataPortReader::RunL" ); +OstTrace0( TRACE_NORMAL, CDATAPORTREADER_RUNL_TD, "CDataPortReader::RunL" ); #ifdef TF_LOGGING_ENABLED @@ -742,7 +742,7 @@ data16bit.AppendNum( iStatus.Int() ); TFLOGSTRING2("TSY: CDataPortReader::RunL - iStatus:%S", &data16bit); -OstTrace1( TRACE_NORMAL, DUP1_CDATAPORTREADER_RUNL, "CDataPortReader::RunL;iStatus=%d", iStatus.Int() ); +OstTrace1( TRACE_NORMAL, DUP1_CDATAPORTREADER_RUNL_TD, "CDataPortReader::RunL;iStatus=%d", iStatus.Int() ); #endif // TF_LOGGING_ENABLED // KErrNone and KErrCancel are ok, others mean real error @@ -764,7 +764,7 @@ } const TDesC16 help = data16bit; TFLOGSTRING2("TSY: CDataPortReader::Read Data: %S", &data16bit); -OstTraceExt1( TRACE_NORMAL, DUP2_CDATAPORTREADER_RUNL, "CDataPortReader::RunL;data16bit=%S", help ); +OstTraceExt1( TRACE_NORMAL, DUP2_CDATAPORTREADER_RUNL_TD, "CDataPortReader::RunL;data16bit=%S", help ); #endif // TF_LOGGING_ENABLED // If flushing the dataport and modem from last connection, @@ -787,13 +787,13 @@ TFLOGSTRING2("TSY: CDataPortReader::RunL - Data remaining: %d", dataLen ); -OstTrace1( TRACE_NORMAL, DUP3_CDATAPORTREADER_RUNL, "CDataPortReader::RunL;Data remaining=%d", dataLen ); +OstTrace1( TRACE_NORMAL, DUP3_CDATAPORTREADER_RUNL_TD, "CDataPortReader::RunL;Data remaining=%d", dataLen ); } else { TFLOGSTRING("TSY: CDataPortReader::RunL - RX buffer empty, normal read continuing"); -OstTrace0( TRACE_NORMAL, DUP4_CDATAPORTREADER_RUNL, "CDataPortReader::RunL, RX buffer empty, normal read continuing" ); +OstTrace0( TRACE_NORMAL, DUP4_CDATAPORTREADER_RUNL_TD, "CDataPortReader::RunL, RX buffer empty, normal read continuing" ); iReaAllComplete = ETrue; // Request next write from iDataPortWriter @@ -837,7 +837,7 @@ { TFLOGSTRING("TSY: CDataPortReader::RunL - Cancel reading"); -OstTrace0( TRACE_NORMAL, DUP5_CDATAPORTREADER_RUNL, "CDataPortReader::RunL, Cancel reading" ); +OstTrace0( TRACE_NORMAL, DUP5_CDATAPORTREADER_RUNL_TD, "CDataPortReader::RunL, Cancel reading" ); iDataPort.ReadCancel(); } @@ -845,7 +845,7 @@ { TFLOGSTRING("TSY: CDataPortReader::RunL - Continue reading"); -OstTrace0( TRACE_NORMAL, DUP6_CDATAPORTREADER_RUNL, "CDataPortReader::RunL, Continue reading" ); +OstTrace0( TRACE_NORMAL, DUP6_CDATAPORTREADER_RUNL_TD, "CDataPortReader::RunL, Continue reading" ); // Make the reader read again... iStatus = KRequestPending; iDataPort.Read( iStatus, iResp ); @@ -856,7 +856,7 @@ { TFLOGSTRING("TSY: CDataPortReader::RunL - Continue reading"); -OstTrace0( TRACE_NORMAL, DUP7_CDATAPORTREADER_RUNL, "CDataPortReader::RunL, Continue reading" ); +OstTrace0( TRACE_NORMAL, DUP7_CDATAPORTREADER_RUNL_TD, "CDataPortReader::RunL, Continue reading" ); // Make the reader read again... iStatus = KRequestPending; iDataPort.Read( iStatus, iResp ); @@ -870,7 +870,7 @@ { TFLOGSTRING("TSY: CDataPortReader::RunL - Dataport used by other client"); -OstTrace0( TRACE_NORMAL, DUP8_CDATAPORTREADER_RUNL, "CDataPortReader::RunL, Dataport used by other client" ); +OstTrace0( TRACE_NORMAL, DUP8_CDATAPORTREADER_RUNL_TD, "CDataPortReader::RunL, Dataport used by other client" ); } // These will make the next call object creation fail in // CMmLineTsy::OpenNewObjectL as we can't handle these errors in TSY. @@ -891,7 +891,7 @@ { TFLOGSTRING2("TSY: CDataPortReader::RunError %d", aError); -OstTrace1( TRACE_NORMAL, CDATAPORTREADER_RUNERROR, "CDataPortReader::RunError;aError=%d", aError ); +OstTrace1( TRACE_NORMAL, CDATAPORTREADER_RUNERROR_TD, "CDataPortReader::RunError;aError=%d", aError ); iDataPortHandler->HandleDataPortError( aError ); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmdtmfmesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmdtmfmesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmdtmfmesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -82,7 +82,7 @@ //none TFLOGSTRING("TSY: CMmDtmfMessHandler::CMmDtmfMessHandler"); -OstTrace0( TRACE_NORMAL, CMMDTMFMESSHANDLER_CMMDTMFMESSHANDLER, "CMmDtmfMessHandler::CMmDtmfMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMDTMFMESSHANDLER_CMMDTMFMESSHANDLER_TD, "CMmDtmfMessHandler::CMmDtmfMessHandler" ); } @@ -94,7 +94,7 @@ void CMmDtmfMessHandler::ConstructL() { TFLOGSTRING("TSY: CMmDtmfMessHandler::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMDTMFMESSHANDLER_CONSTRUCTL, "CMmDtmfMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMDTMFMESSHANDLER_CONSTRUCTL_TD, "CMmDtmfMessHandler::ConstructL" ); iDTMFStringAfterW.Zero(); } @@ -109,7 +109,7 @@ CMmMessageRouter* aMessageRouter ) // pointer to the message router { TFLOGSTRING("TSY: CMmDtmfMessHandler::NewL"); -OstTrace0( TRACE_NORMAL, CMMDTMFMESSHANDLER_NEWL, "CMmDtmfMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMDTMFMESSHANDLER_NEWL_TD, "CMmDtmfMessHandler::NewL" ); CMmDtmfMessHandler* dtmfMessHandler = new ( ELeave ) CMmDtmfMessHandler(); @@ -141,7 +141,7 @@ { TFLOGSTRING("TSY: CMmDtmfMessHandler::~CMmDtmfMessHandler"); -OstTrace0( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_CMMDTMFMESSHANDLER, "CMmDtmfMessHandler::~CMmDtmfMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_CMMDTMFMESSHANDLER_TD, "CMmDtmfMessHandler::~CMmDtmfMessHandler" ); } // ----------------------------------------------------------------------------- @@ -156,7 +156,7 @@ { TFLOGSTRING2("TSY: CMmDtmfMessHandler::ExtFuncL. IPC:%d", aIpc); -OstTrace1( TRACE_NORMAL, CMMDTMFMESSHANDLER_EXTFUNCL, "CMmDtmfMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMDTMFMESSHANDLER_EXTFUNCL_TD, "CMmDtmfMessHandler::ExtFuncL;aIpc=%d", aIpc ); //*************************************************************// // NOTE: @@ -174,7 +174,7 @@ case EMobilePhoneStartDTMFTone: { TFLOGSTRING("TSY: CMmDtmfMessHandler::ExtFuncL -- EMobilePhoneStartDTMFTone"); -OstTrace0( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_EXTFUNCL, "CMmDtmfMessHandler::ExtFuncL, EMobilePhoneStartDTMFTone" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_EXTFUNCL_TD, "CMmDtmfMessHandler::ExtFuncL, EMobilePhoneStartDTMFTone" ); //unpack parameter: DTMF tone to be sent TChar* tone( NULL ); aDataPackage->UnPackData ( &tone ); @@ -190,7 +190,7 @@ case EMobilePhoneStopDTMFTone: { TFLOGSTRING("TSY: CMmDtmfMessHandler::ExtFuncL -- EMobilePhoneStopDTMFTone"); -OstTrace0( TRACE_NORMAL, DUP2_CMMDTMFMESSHANDLER_EXTFUNCL, "CMmDtmfMessHandler::ExtFuncL, EMobilePhoneStopDTMFTone" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMDTMFMESSHANDLER_EXTFUNCL_TD, "CMmDtmfMessHandler::ExtFuncL, EMobilePhoneStopDTMFTone" ); //no packed parameters //forward the request to the specific method CallDtmfStopReq ( transId ); @@ -200,12 +200,12 @@ case EMobilePhoneContinueDTMFStringSending: { TFLOGSTRING("TSY: CMmDtmfMessHandler::ExtFuncL -- EMobilePhoneContinueDTMFStringSending"); -OstTrace0( TRACE_NORMAL, DUP3_CMMDTMFMESSHANDLER_EXTFUNCL, "CMmDtmfMessHandler::ExtFuncL, EMobilePhoneContinueDTMFStringSending" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMDTMFMESSHANDLER_EXTFUNCL_TD, "CMmDtmfMessHandler::ExtFuncL, EMobilePhoneContinueDTMFStringSending" ); } case EMobilePhoneSendDTMFTones: { TFLOGSTRING("TSY: CMmDtmfMessHandler::ExtFuncL -- EMobilePhoneSendDTMFTones"); -OstTrace0( TRACE_NORMAL, DUP4_CMMDTMFMESSHANDLER_EXTFUNCL, "CMmDtmfMessHandler::ExtFuncL, EMobilePhoneSendDTMFTones" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMDTMFMESSHANDLER_EXTFUNCL_TD, "CMmDtmfMessHandler::ExtFuncL, EMobilePhoneSendDTMFTones" ); if ( !iDtmfSendOngoing || EMobilePhoneContinueDTMFStringSending == aIpc ) { //unpack parameter: DTMF tones to be sent @@ -222,7 +222,7 @@ else { TFLOGSTRING("TSY: CMmDtmfMessHandler::ExtFuncL -- dtmf send already ongoing"); -OstTrace0( TRACE_NORMAL, DUP5_CMMDTMFMESSHANDLER_EXTFUNCL, "CMmDtmfMessHandler::ExtFuncL, DTMF sending already ongoing" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMDTMFMESSHANDLER_EXTFUNCL_TD, "CMmDtmfMessHandler::ExtFuncL, DTMF sending already ongoing" ); ret = KErrServerBusy; } break; @@ -230,7 +230,7 @@ case EMobilePhoneSendDTMFTonesCancel: { TFLOGSTRING("TSY: CMmDtmfMessHandler::ExtFuncL -- EMobilePhoneSendDTMFTonesCancel"); -OstTrace0( TRACE_NORMAL, DUP6_CMMDTMFMESSHANDLER_EXTFUNCL, "CMmDtmfMessHandler::ExtFuncL, EMobilePhoneSendDTMFTonesCancel" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMDTMFMESSHANDLER_EXTFUNCL_TD, "CMmDtmfMessHandler::ExtFuncL, EMobilePhoneSendDTMFTonesCancel" ); iDtmfSendOngoing = EFalse; //no packed parameters //forward the request to the specific method @@ -241,7 +241,7 @@ { // this method should only be called for DTMF cases TFLOGSTRING2("TSY: CMmDtmfMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP7_CMMDTMFMESSHANDLER_EXTFUNCL, "CMmDtmfMessHandler::ExtFuncL;Unknown IPC=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP7_CMMDTMFMESSHANDLER_EXTFUNCL_TD, "CMmDtmfMessHandler::ExtFuncL;Unknown IPC=%d", aIpc ); ret = KErrArgument; break; } @@ -262,7 +262,7 @@ TInt messageId(aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID )); TFLOGSTRING3("TSY: CMmDtmfMessHandler::ReceiveMessageL. Resource:%d. MsgId:%d",resource, messageId); -OstTraceExt2( TRACE_NORMAL, CMMDTMFMESSHANDLER_RECEIVEMESSAGEL, "CMmDtmfMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); +OstTraceExt2( TRACE_NORMAL, CMMDTMFMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmDtmfMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); // DTMF functionality is implemented in CALL server if ( PN_MODEM_CALL == resource ) @@ -293,7 +293,7 @@ { TFLOGSTRING("TSY: CMmDtmfMessHandler::ReceiveMessageL. PN_MODEM_CALL: Switch messageID case default"); -OstTrace0( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_RECEIVEMESSAGEL, "CMmDtmfMessHandler::ReceiveMessageL,PN_MODEM_CALL: Switch messageID case default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmDtmfMessHandler::ReceiveMessageL,PN_MODEM_CALL: Switch messageID case default" ); break; } @@ -312,7 +312,7 @@ { TFLOGSTRING("TSY: CMmDtmfMessHandler::SendPostAddressL"); -OstTrace0( TRACE_NORMAL, CMMDTMFMESSHANDLER_SENDPOSTADDRESSL, "CMmDtmfMessHandler::SendPostAddressL" ); +OstTrace0( TRACE_NORMAL, CMMDTMFMESSHANDLER_SENDPOSTADDRESSL_TD, "CMmDtmfMessHandler::SendPostAddressL" ); if ( !iDtmfSendOngoing ) { @@ -334,7 +334,7 @@ TNOSDtmfType aDtmfType ) // Type of dtmf to send { TFLOGSTRING3("TSY: CMmDtmfMessHandler::CallDtmfSendReqL. TransId:%d, DtmfString:%S", aTransactionId, aDtmfString); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_CALLDTMFSENDREQL, "CMmDtmfMessHandler::CallDtmfSendReqL;aTransactionId=%hhu;aDtmfString=%s", aTransactionId, ( TUint )( aDtmfString ) ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_CALLDTMFSENDREQL_TD, "CMmDtmfMessHandler::CallDtmfSendReqL;aTransactionId=%hhu;aDtmfString=%s", aTransactionId, ( TUint )( aDtmfString ) ); TInt ret( KErrNone ); @@ -400,7 +400,7 @@ { TFLOGSTRING("TSY: CMmDtmfMessHandler::CallDtmfSendResp"); -OstTrace0( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_CALLDTMFSENDRESP, "CMmDtmfMessHandler::CallDtmfSendResp" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_CALLDTMFSENDRESP_TD, "CMmDtmfMessHandler::CallDtmfSendResp" ); TUint sbStartOffSet( 0 ); @@ -439,7 +439,7 @@ { TFLOGSTRING("TSY: CMmDtmfMessHandler::CallDtmfStopReq"); -OstTrace0( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_CALLDTMFSTOPREQ, "CMmDtmfMessHandler::CallDtmfStopReq" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_CALLDTMFSTOPREQ_TD, "CMmDtmfMessHandler::CallDtmfStopReq" ); //create dtmf stop request message //Append data for ISI message @@ -461,7 +461,7 @@ { TFLOGSTRING("TSY: CMmDtmfMessHandler::CallDtmfStopResp"); -OstTrace0( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_CALLDTMFSTOPRESP, "CMmDtmfMessHandler::CallDtmfStopResp" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_CALLDTMFSTOPRESP_TD, "CMmDtmfMessHandler::CallDtmfStopResp" ); TUint8 nbrOfsubBlocks( aIsiMessage.Get8bit( ISI_HEADER_SIZE + CALL_MODEM_DTMF_STOP_RESP_OFFSET_SUBBLOCKS ) ); @@ -493,7 +493,7 @@ { TFLOGSTRING("TSY: CMmDtmfMessHandler::CallDtmfStatusInd"); -OstTrace0( TRACE_NORMAL, DUP2_CMMDTMFMESSHANDLER_CALLDTMFSTATUSIND, "CMmDtmfMessHandler::CallDtmfStatusInd" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMDTMFMESSHANDLER_CALLDTMFSTATUSIND_TD, "CMmDtmfMessHandler::CallDtmfStatusInd" ); TUint sbStartOffSet( 0 ); @@ -510,7 +510,7 @@ CALL_MODEM_SB_DTMF_STATUS_OFFSET_STATUS) ); TFLOGSTRING2("TSY: CMmDtmfMessHandler::CallDtmfStatusInd. dtmfStatus:%d",dtmfStatus); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMDTMFMESSHANDLER_CALLDTMFSTATUSIND, "CMmDtmfMessHandler::CallDtmfStatusInd;dtmfStatus=%hhu", dtmfStatus ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMDTMFMESSHANDLER_CALLDTMFSTATUSIND_TD, "CMmDtmfMessHandler::CallDtmfStatusInd;dtmfStatus=%hhu", dtmfStatus ); if( CALL_MODEM_DTMF_IDLE == dtmfStatus ) { @@ -599,7 +599,7 @@ TUint8 &aNumOfSbInMessage ) { TFLOGSTRING2("TSY: CMmDtmfMessHandler::GetCallDtmfSendReqSubBlockL. DtmfType:%d", iDtmfType ); -OstTrace1( TRACE_NORMAL, CMMDTMFMESSHANDLER_GETCALLDTMFSENDREQSUBBLOCKL, "CMmDtmfMessHandler::GetCallDtmfSendReqSubBlockL;iDtmfType=%d", iDtmfType ); +OstTrace1( TRACE_NORMAL, CMMDTMFMESSHANDLER_GETCALLDTMFSENDREQSUBBLOCKL_TD, "CMmDtmfMessHandler::GetCallDtmfSendReqSubBlockL;iDtmfType=%d", iDtmfType ); // createReq flag is set to 'false' only in case the first character is 'w' // in DTMF string. If 'true' CALL_DTMF_SEND_REQ will be sent. TBool createReq( ETrue ); @@ -736,7 +736,7 @@ { TFLOGSTRING("TSY: CMmDtmfMessHandler::CallDtmfToneInd"); -OstTrace0( TRACE_NORMAL, CMMDTMFMESSHANDLER_CALLDTMFTONEIND, "CMmDtmfMessHandler::CallDtmfToneInd" ); +OstTrace0( TRACE_NORMAL, CMMDTMFMESSHANDLER_CALLDTMFTONEIND_TD, "CMmDtmfMessHandler::CallDtmfToneInd" ); //create and initialize TDtmfInfo RMmCustomAPI::TDtmfInfo dtmfInfo; @@ -784,7 +784,7 @@ dtmfInfo.iEvent = RMmCustomAPI::EDtmfStop; //valus of dtmfInfo.iTone has been already set as KCallDtmfNoTone; TFLOGSTRING("TSY: CMmDtmfMessHandler::CallDtmfToneInd-> No Tone"); -OstTrace0( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_CALLDTMFTONEIND, "CMmDtmfMessHandler::CallDtmfToneInd, No Tone" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMDTMFMESSHANDLER_CALLDTMFTONEIND_TD, "CMmDtmfMessHandler::CallDtmfToneInd, No Tone" ); } else { @@ -798,7 +798,7 @@ #ifdef OST_TRACE_COMPILER_IN_USE TUint16 tempDtmfTone( 0x0F&dtmfTone ); // Parameter just for tracing -OstTraceExt1( TRACE_NORMAL, DUP2_CMMDTMFMESSHANDLER_CALLDTMFTONEIND, "CMmDtmfMessHandler::CallDtmfToneInd;dtmfTone=%hx",tempDtmfTone ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMDTMFMESSHANDLER_CALLDTMFTONEIND_TD, "CMmDtmfMessHandler::CallDtmfToneInd;dtmfTone=%hx",tempDtmfTone ); #endif // OST_TRACE_COMPILER_IN_USE } } @@ -821,7 +821,7 @@ { TFLOGSTRING("TSY: CMmDtmfMessHandler::HandleError"); -OstTrace0( TRACE_NORMAL, CMMDTMFMESSHANDLER_HANDLEERROR, "CMmDtmfMessHandler::HandleError" ); +OstTrace0( TRACE_NORMAL, CMMDTMFMESSHANDLER_HANDLEERROR_TD, "CMmDtmfMessHandler::HandleError" ); } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmenstoremesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmenstoremesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmenstoremesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -70,7 +70,7 @@ CMmENStoreMessHandler::CMmENStoreMessHandler() { TFLOGSTRING("TSY: CMmENStoreMessHandler::CMmENStoreMessHandler() - Start"); -OstTrace0( TRACE_NORMAL, CMMENSTOREMESSHANDLER_CMMENSTOREMESSHANDLER, "CMmENStoreMessHandler::CMmENStoreMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMENSTOREMESSHANDLER_CMMENSTOREMESSHANDLER_TD, "CMmENStoreMessHandler::CMmENStoreMessHandler" ); } // ----------------------------------------------------------------------------- @@ -81,7 +81,7 @@ CMmENStoreMessHandler::~CMmENStoreMessHandler() { TFLOGSTRING("TSY: CMmENStoreMessHandler::~CMmENStoreMessHandler() - End"); -OstTrace0( TRACE_NORMAL, DUP1_CMMENSTOREMESSHANDLER_CMMENSTOREMESSHANDLER, "CMmENStoreMessHandler::~CMmENStoreMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMENSTOREMESSHANDLER_CMMENSTOREMESSHANDLER_TD, "CMmENStoreMessHandler::~CMmENStoreMessHandler" ); if( iEnNumberArray ) { @@ -104,7 +104,7 @@ ) { TFLOGSTRING("TSY: CMmENStoreMessHandler::NewL"); -OstTrace0( TRACE_NORMAL, CMMENSTOREMESSHANDLER_NEWL, "CMmENStoreMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMENSTOREMESSHANDLER_NEWL_TD, "CMmENStoreMessHandler::NewL" ); // Create EN store message handler CMmENStoreMessHandler* enStoreMessHandler = @@ -130,7 +130,7 @@ void CMmENStoreMessHandler::ConstructL() { TFLOGSTRING("TSY: CMmENStoreMessHandler::ConstructL()"); -OstTrace0( TRACE_NORMAL, CMMENSTOREMESSHANDLER_CONSTRUCTL, "CMmENStoreMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMENSTOREMESSHANDLER_CONSTRUCTL_TD, "CMmENStoreMessHandler::ConstructL" ); iEnNumberArray = new ( ELeave ) CArrayPtrFlat( 1 ); } @@ -147,7 +147,7 @@ const TDesC8& aFileData ) { TFLOGSTRING3("TSY:CMmENStoreMessHandler::ProcessUiccMsg, aTraId: %d, status: %d", aTraId, aStatus ); -OstTraceExt2( TRACE_NORMAL, DUP2_CMMENSTOREMESSHANDLER_PROCESSUICCMSG, "CMmENStoreMessHandler::ProcessUiccMsg;aTraId=%d;aStatus=%d", aTraId, aStatus ); +OstTraceExt2( TRACE_NORMAL, DUP2_CMMENSTOREMESSHANDLER_PROCESSUICCMSG_TD, "CMmENStoreMessHandler::ProcessUiccMsg;aTraId=%d;aStatus=%d", aTraId, aStatus ); TInt ret( KErrNone ); @@ -167,7 +167,7 @@ default: { TFLOGSTRING("TSY:CMmENStoreMessHandler::ProcessUiccMsg - unknown transaction ID" ); -OstTrace0( TRACE_NORMAL, CMMENSTOREMESSHANDLER_PROCESSUICCMSG, "CMmENStoreMessHandler::ProcessUiccMsg - unknown transaction ID" ); +OstTrace0( TRACE_NORMAL, CMMENSTOREMESSHANDLER_PROCESSUICCMSG_TD, "CMmENStoreMessHandler::ProcessUiccMsg - unknown transaction ID" ); break; } } @@ -186,7 +186,7 @@ ) { TFLOGSTRING2("TSY:CMmENStoreMessHandler::UiccReadEmergCodesResp, status: %d", aStatus ); -OstTrace1( TRACE_NORMAL, DUP2_CMMENSTOREMESSHANDLER_UICCREADEMERGCODESRESP, "CMmENStoreMessHandler::UiccReadEmergCodesResp;aStatus=%d", aStatus ); +OstTrace1( TRACE_NORMAL, DUP2_CMMENSTOREMESSHANDLER_UICCREADEMERGCODESRESP_TD, "CMmENStoreMessHandler::UiccReadEmergCodesResp;aStatus=%d", aStatus ); TInt ret( KErrNone ); // Create data package @@ -269,7 +269,7 @@ TBuf8< KEmergencyNbrLenInBytes > readIn; TFLOGSTRING3("TSY: CMmENStoreMessHandler::UiccReadEmergCodesResp. length:%d, index:%d", aFileData.Length(), index); -OstTraceExt2( TRACE_NORMAL, DUP4_CMMENSTOREMESSHANDLER_UICCREADEMERGCODESRESP, "CMmENStoreMessHandler::UiccReadEmergCodesResp;aFileData.Length()=%d;index=%d", aFileData.Length(), index ); +OstTraceExt2( TRACE_NORMAL, DUP4_CMMENSTOREMESSHANDLER_UICCREADEMERGCODESRESP_TD, "CMmENStoreMessHandler::UiccReadEmergCodesResp;aFileData.Length()=%d;index=%d", aFileData.Length(), index ); readIn.Copy(aFileData.Mid( ((index * KEmergencyNbrLenInBytes ) - 3), @@ -356,7 +356,7 @@ // Location index is not valid. Complete request with error. TFLOGSTRING2("TSY: CMmENStoreMessHandler::UiccReadEmergCodesResp\ - Invalid index: %d", iReadECCLocation); -OstTrace1( TRACE_NORMAL, DUP1_CMMENSTOREMESSHANDLER_UICCREADEMERGCODESRESP, "CMmENStoreMessHandler::UiccReadEmergCodesResp - Invalid index:;iReadECCLocation=%d", iReadECCLocation ); +OstTrace1( TRACE_NORMAL, DUP1_CMMENSTOREMESSHANDLER_UICCREADEMERGCODESRESP_TD, "CMmENStoreMessHandler::UiccReadEmergCodesResp - Invalid index:;iReadECCLocation=%d", iReadECCLocation ); ret = KErrArgument; } @@ -397,7 +397,7 @@ { // Location index is not valid. Complete request with error. TFLOGSTRING2("TSY: CMmENStoreMessHandler::UiccReadEmergCodesResp - Invalid index: %d", iReadECCLocation); -OstTrace1( TRACE_NORMAL, CMMENSTOREMESSHANDLER_UICCREADEMERGCODESRESP, "CMmENStoreMessHandler::UiccReadEmergCodesResp - Invalid index:;iReadECCLocation=%d", iReadECCLocation ); +OstTrace1( TRACE_NORMAL, CMMENSTOREMESSHANDLER_UICCREADEMERGCODESRESP_TD, "CMmENStoreMessHandler::UiccReadEmergCodesResp - Invalid index:;iReadECCLocation=%d", iReadECCLocation ); ret = KErrArgument; } } @@ -494,7 +494,7 @@ if ( 0 == iEntryCount ) { TFLOGSTRING2("TSY: CMmENStoreMessHandler::UiccReadEmergCodesResp. iUsedEntries:%d", iUsedEntries); -OstTrace1( TRACE_NORMAL, DUP3_CMMENSTOREMESSHANDLER_UICCREADEMERGCODESRESP, "CMmENStoreMessHandler::UiccReadEmergCodesResp;iUsedEntries=%d", iUsedEntries ); +OstTrace1( TRACE_NORMAL, DUP3_CMMENSTOREMESSHANDLER_UICCREADEMERGCODESRESP_TD, "CMmENStoreMessHandler::UiccReadEmergCodesResp;iUsedEntries=%d", iUsedEntries ); // Complete response with ret // Pack the data for sending to the manager @@ -525,7 +525,7 @@ TDes8& aNumberBuf) { TFLOGSTRING("TSY: CMmENStoreMessHandler::GetEmergencyNumberDigits" ); -OstTrace0( TRACE_NORMAL, CMMENSTOREMESSHANDLER_GETEMERGENCYNUMBERDIGITS, "CMmENStoreMessHandler::GetEmergencyNumberDigits" ); +OstTrace0( TRACE_NORMAL, CMMENSTOREMESSHANDLER_GETEMERGENCYNUMBERDIGITS_TD, "CMmENStoreMessHandler::GetEmergencyNumberDigits" ); TUint8 read_value = 0; TBuf8<( RMobileENStore::KEmergencyNumberSize )> numberBuf; @@ -568,7 +568,7 @@ ) { TFLOGSTRING2("TSY:CMmENStoreMessHandler::UiccENStoreGetInfoResp, status: %d", aStatus ); -OstTrace1( TRACE_NORMAL, CMMENSTOREMESSHANDLER_UICCENSTOREGETINFORESP, "CMmENStoreMessHandler::UiccENStoreGetInfoResp;aStatus=%d", aStatus ); +OstTrace1( TRACE_NORMAL, CMMENSTOREMESSHANDLER_UICCENSTOREGETINFORESP_TD, "CMmENStoreMessHandler::UiccENStoreGetInfoResp;aStatus=%d", aStatus ); TInt ret( KErrNone ); @@ -631,7 +631,7 @@ ) { TFLOGSTRING("TSY: CMmENStoreMessHandler::UiccReadEmergCodesReq"); -OstTrace0( TRACE_NORMAL, DUP1_CMMENSTOREMESSHANDLER_UICCREADEMERGCODESREQ, "CMmENStoreMessHandler::UiccReadEmergCodesReq" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMENSTOREMESSHANDLER_UICCREADEMERGCODESREQ_TD, "CMmENStoreMessHandler::UiccReadEmergCodesReq" ); TInt ret( KErrNone ); @@ -684,11 +684,11 @@ else { TFLOGSTRING("TSY: CMmENStoreMessHandler::SimReadEmergCodesReq: unknown card type."); -OstTrace0( TRACE_NORMAL, CMMENSTOREMESSHANDLER_UICCREADEMERGCODESREQ, "CMmENStoreMessHandler::UiccReadEmergCodesReq - Unknown card type." ); +OstTrace0( TRACE_NORMAL, CMMENSTOREMESSHANDLER_UICCREADEMERGCODESREQ_TD, "CMmENStoreMessHandler::UiccReadEmergCodesReq - Unknown card type." ); ret = KErrGeneral; } TFLOGSTRING2("TSY: CMmENStoreMessHandler::UiccReadEmergCodesReq ret: %d", ret); -OstTrace1( TRACE_NORMAL, DUP2_CMMENSTOREMESSHANDLER_UICCREADEMERGCODESREQ, "CMmENStoreMessHandler::UiccReadEmergCodesReq;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP2_CMMENSTOREMESSHANDLER_UICCREADEMERGCODESREQ_TD, "CMmENStoreMessHandler::UiccReadEmergCodesReq;ret=%d", ret ); return ret; } @@ -700,7 +700,7 @@ TInt CMmENStoreMessHandler::ReadEfEccFileInfo( TUiccTrId aTraId ) { TFLOGSTRING("TSY: CMmENStoreMessHandler::ReadEfEccFileInfo"); -OstTrace0( TRACE_NORMAL, DUP3_CMMENSTOREMESSHANDLER_READEFECCFILEINFO, "CMmENStoreMessHandler::ReadEfEccFileInfo" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMENSTOREMESSHANDLER_READEFECCFILEINFO_TD, "CMmENStoreMessHandler::ReadEfEccFileInfo" ); TInt ret( KErrNone ); @@ -717,7 +717,7 @@ ret = iMmUiccMessHandler->CreateUiccApplCmdReq( params ); TFLOGSTRING2("TSY: CMmENStoreMessHandler::ReadEfEccFileInfo ret %d", ret); -OstTrace1( TRACE_NORMAL, CMMENSTOREMESSHANDLER_READEFECCFILEINFO, "CMmENStoreMessHandler::ReadEfEccFileInfo;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, CMMENSTOREMESSHANDLER_READEFECCFILEINFO_TD, "CMmENStoreMessHandler::ReadEfEccFileInfo;ret=%d", ret ); return ret; } @@ -732,7 +732,7 @@ ) { TFLOGSTRING2("TSY: CMmENStoreMessHandler::ExtFuncL - Ipc: %d", aIpc); -OstTrace1( TRACE_NORMAL, CMMENSTOREMESSHANDLER_EXTFUNCL, "CMmENStoreMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMENSTOREMESSHANDLER_EXTFUNCL_TD, "CMmENStoreMessHandler::ExtFuncL;aIpc=%d", aIpc ); // Unpack parameters TInt index( 0 ); @@ -781,7 +781,7 @@ else { TFLOGSTRING("TSY: CMmENStoreMessHandler::ExtFuncL: unknown card type."); -OstTrace0( TRACE_NORMAL, DUP1_CMMENSTOREMESSHANDLER_EXTFUNCL, "CMmENStoreMessHandler::ExtFuncL - unknown card type." ); +OstTrace0( TRACE_NORMAL, DUP1_CMMENSTOREMESSHANDLER_EXTFUNCL_TD, "CMmENStoreMessHandler::ExtFuncL - unknown card type." ); ret = KErrGeneral; } break; @@ -789,7 +789,7 @@ default: { TFLOGSTRING("TSY: CMmENStoreMessHandler::SimReadEmergCodesRespL. Switch aIpc case default"); -OstTrace0( TRACE_NORMAL, DUP2_CMMENSTOREMESSHANDLER_EXTFUNCL, "CMmENStoreMessHandler::ExtFuncL - Switch aIpc case default" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMENSTOREMESSHANDLER_EXTFUNCL_TD, "CMmENStoreMessHandler::ExtFuncL - Switch aIpc case default" ); // Do nothing break; } @@ -812,7 +812,7 @@ ) { TFLOGSTRING("TSY: CMmENStoreMessHandler::HandleError"); -OstTrace0( TRACE_NORMAL, CMMENSTOREMESSHANDLER_HANDLEERROR, "CMmENStoreMessHandler::HandleError" ); +OstTrace0( TRACE_NORMAL, CMMENSTOREMESSHANDLER_HANDLEERROR_TD, "CMmENStoreMessHandler::HandleError" ); } // ================= OTHER EXPORTED FUNCTIONS ================================== diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmmessagerouter.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmmessagerouter.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmmessagerouter.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -97,7 +97,7 @@ ) { TFLOGSTRING("TSY: CMmMessageRouter::NewL"); -OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_NEWL, "CMmMessageRouter::NewL" ); +OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_NEWL_TD, "CMmMessageRouter::NewL" ); CMmMessageRouter* messageRouter = NULL; @@ -117,7 +117,7 @@ CMmMessageRouter::~CMmMessageRouter() { TFLOGSTRING("TSY: CMmMessageRouter::~CMmMessageRouter"); -OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_CMMMESSAGEROUTER, "CMmMessageRouter::~CMmMessageRouter" ); +OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_CMMMESSAGEROUTER_TD, "CMmMessageRouter::~CMmMessageRouter" ); delete iMmPhoneMessHandler; delete iMmCallMessHandler; @@ -150,7 +150,7 @@ // CMmMessageRouter::CMmMessageRouter() { -OstTrace0( TRACE_NORMAL, DUP1_CMMMESSAGEROUTER_CMMMESSAGEROUTER, "CMmMessageRouter::CMmMessageRouter" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMMESSAGEROUTER_CMMMESSAGEROUTER_TD, "CMmMessageRouter::CMmMessageRouter" ); // none } @@ -173,7 +173,7 @@ { //PRINT VERSION STRING TO LOG TFLOGSTRING(NOKIATSY_RELEASE_STR); -OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_CONSTRUCTL, NOKIATSY_RELEASE_STR ); +OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_CONSTRUCTL_TD, NOKIATSY_RELEASE_STR ); //INIT PHONET /**************************************************************/ @@ -181,7 +181,7 @@ // Creation of PhoNet objects. TFLOGSTRING("TSY: CMmMessageRouter::ConstructL -- initializing ISC API"); -OstTrace0( TRACE_NORMAL, DUP1_CMMMESSAGEROUTER_CONSTRUCTL, "CMmMessageRouter::ConstructL, initializing ISC API" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMMESSAGEROUTER_CONSTRUCTL_TD, "CMmMessageRouter::ConstructL, initializing ISC API" ); // Only for server information, which is defined with one byte. TBuf8<1> resource; @@ -205,7 +205,7 @@ TFLOGSTRING("TSY: CMmMessageRouter::ConstructL -- initializing done"); -OstTrace0( TRACE_NORMAL, DUP3_CMMMESSAGEROUTER_CONSTRUCTL, "CMmMessageRouter::ConstructL, initializing done" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMMESSAGEROUTER_CONSTRUCTL_TD, "CMmMessageRouter::ConstructL, initializing done" ); //END INIT PHONET /**************************************************************/ @@ -320,7 +320,7 @@ TInt aResult ) { TFLOGSTRING3("NTSY: CMmMessageRouter::Complete. without data package. IPC = %d, result: %d", aIpc, aResult); -OstTraceExt2( TRACE_NORMAL, CMMMESSAGEROUTER_COMPLETE, "CMmMessageRouter::Complete;aIpc=%d;aResult=%d", aIpc, aResult ); +OstTraceExt2( TRACE_NORMAL, CMMMESSAGEROUTER_COMPLETE_TD, "CMmMessageRouter::Complete;aIpc=%d;aResult=%d", aIpc, aResult ); CMmDataPackage emptyDataPackage; Complete( aIpc, &emptyDataPackage, aResult ); return; @@ -338,7 +338,7 @@ TInt aResult ) { TFLOGSTRING3("NTSY: CMmMessageRouter::Complete. IPC = %d, result: %d", aIpc, aResult); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMMESSAGEROUTER_COMPLETE, "CMmMessageRouter::Complete;aIpc=%d;aResult=%d", aIpc, aResult ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMMESSAGEROUTER_COMPLETE_TD, "CMmMessageRouter::Complete;aIpc=%d;aResult=%d", aIpc, aResult ); // Read Operator Name String (ONS Name) when SIM is ready. // Read Operator PLMN List (OPL) rules when SIM is ready. @@ -372,7 +372,7 @@ ) { TFLOGSTRING2("TSY: CMmMessageRouter::RouteRequest. IPC:%d",aIpc); -OstTrace1( TRACE_NORMAL, CMMMESSAGEROUTER_ROUTEREQUEST, "CMmMessageRouter::RouteRequest;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMMESSAGEROUTER_ROUTEREQUEST_TD, "CMmMessageRouter::RouteRequest;aIpc=%d", aIpc ); MMmMessHandlerBase* messHandler = NULL; @@ -679,7 +679,7 @@ default: { TFLOGSTRING("TSY: CMmMessageRouter::RouteRequest. Switch aIpc case Default"); -OstTrace0( TRACE_NORMAL, DUP1_CMMMESSAGEROUTER_ROUTEREQUEST, "CMmMessageRouter::RouteRequest, Switch aIpc case Default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMMESSAGEROUTER_ROUTEREQUEST_TD, "CMmMessageRouter::RouteRequest, Switch aIpc case Default" ); messHandler = NULL; } } @@ -695,7 +695,7 @@ TInt CMmMessageRouter::ExtFuncL( TInt aIpc, const CMmDataPackage* aDataPackage ) { TFLOGSTRING2("TSY: CMmMessageRouter::ExtFuncL. IPC = %d", aIpc); -OstTrace1( TRACE_NORMAL, CMMMESSAGEROUTER_EXTFUNCL, "CMmMessageRouter::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMMESSAGEROUTER_EXTFUNCL_TD, "CMmMessageRouter::ExtFuncL;aIpc=%d", aIpc ); TInt ret ( KErrNone ); @@ -722,7 +722,7 @@ EXPORT_C CMmPhoNetSender* CMmMessageRouter::GetPhoNetSender() { TFLOGSTRING("TSY: CMmMessageRouter::GetPhoNetSender"); -OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETPHONETSENDER, "CMmMessageRouter::GetPhoNetSender" ); +OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETPHONETSENDER_TD, "CMmMessageRouter::GetPhoNetSender" ); return iPhoNetSender; } @@ -734,7 +734,7 @@ EXPORT_C CMmPhoNetReceiver* CMmMessageRouter::GetPhoNetReceiver() { TFLOGSTRING("TSY: CMmMessageRouter::GetPhoNetReceiver"); -OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETPHONETRECEIVER, "CMmMessageRouter::GetPhoNetReceiver" ); +OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETPHONETRECEIVER_TD, "CMmMessageRouter::GetPhoNetReceiver" ); return iPhoNetReceiver; } @@ -746,7 +746,7 @@ CMmCallMessHandler* CMmMessageRouter::GetCallMessHandler() { TFLOGSTRING("TSY: CMmMessageRouter::GetCallMessHandler"); -OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETCALLMESSHANDLER, "CMmMessageRouter::GetCallMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETCALLMESSHANDLER_TD, "CMmMessageRouter::GetCallMessHandler" ); return iMmCallMessHandler; } @@ -758,7 +758,7 @@ CMmPhoneMessHandler* CMmMessageRouter::GetPhoneMessHandler() { TFLOGSTRING("TSY: CMmMessageRouter::GetPhoneMessHandler"); -OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETPHONEMESSHANDLER, "CMmMessageRouter::GetPhoneMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETPHONEMESSHANDLER_TD, "CMmMessageRouter::GetPhoneMessHandler" ); return iMmPhoneMessHandler; } @@ -770,7 +770,7 @@ CMmPacketServiceMessHandler* CMmMessageRouter::GetPacketServiceMessHandler() { TFLOGSTRING("TSY: CMmMessageRouter::GetPacketServiceMessHandler"); -OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETPACKETSERVICEMESSHANDLER, "CMmMessageRouter::GetPacketServiceMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETPACKETSERVICEMESSHANDLER_TD, "CMmMessageRouter::GetPacketServiceMessHandler" ); return iMmPacketServiceMessHandler; } @@ -782,7 +782,7 @@ CMmCustomMessHandler* CMmMessageRouter::GetCustomMessHandler() { TFLOGSTRING("TSY: CMmMessageRouter::GetCustomMessHandler"); -OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETCUSTOMMESSHANDLER, "CMmMessageRouter::GetCustomMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETCUSTOMMESSHANDLER_TD, "CMmMessageRouter::GetCustomMessHandler" ); return iMmCustomMessHandler; } @@ -794,7 +794,7 @@ CMmSmsMessHandler* CMmMessageRouter::GetSmsMessHandler() { TFLOGSTRING("TSY: CMmMessageRouter::GetSmsMessHandler"); -OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETSMSMESSHANDLER, "CMmMessageRouter::GetSmsMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETSMSMESSHANDLER_TD, "CMmMessageRouter::GetSmsMessHandler" ); return iMmSmsMessHandler; } @@ -806,7 +806,7 @@ CMmSupplServMessHandler* CMmMessageRouter::GetSupplServHandler() { TFLOGSTRING("TSY: CMmMessageRouter::GetSupplServHandler"); -OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETSUPPLSERVHANDLER, "CMmMessageRouter::GetSupplServHandler" ); +OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETSUPPLSERVHANDLER_TD, "CMmMessageRouter::GetSupplServHandler" ); return iMmSupplServMessHandler; } @@ -818,7 +818,7 @@ CMmPhoneBookStoreMessHandler* CMmMessageRouter::PhoneBookStoreMessHandler() { TFLOGSTRING("TSY: CMmMessageRouter::PhoneBookStoreMessHandler"); -OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_PHONEBOOKSTOREMESSHANDLER, "CMmMessageRouter::PhoneBookStoreMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_PHONEBOOKSTOREMESSHANDLER_TD, "CMmMessageRouter::PhoneBookStoreMessHandler" ); return iMmPhoneBookStoreMessHandler; } @@ -830,7 +830,7 @@ CMmNetMessHandler* CMmMessageRouter::GetNetMessHandler() { TFLOGSTRING("TSY: CMmMessageRouter::GetNetMessHandler"); -OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETNETMESSHANDLER, "CMmMessageRouter::GetNetMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMMESSAGEROUTER_GETNETMESSHANDLER_TD, "CMmMessageRouter::GetNetMessHandler" ); return iMmNetMessHandler; } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmnetmesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmnetmesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmnetmesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 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" @@ -39,7 +39,7 @@ #include #include #include -//#include To be done in CPS +//#include #include #include "OstTraceDefinitions.h" @@ -163,23 +163,23 @@ ( ( i + 1 ) == length ) ) // All bytes collected and traced. { firstTime = EFalse; -OstTraceExt1( TRACE_NORMAL, DUP6__TFLOG_PRINT_ISIMESSAGE, "TSY:Queued NET message: [ %s]", trace_msg ); +OstTraceExt1( TRACE_NORMAL, DUP6__TFLOG_PRINT_ISIMESSAGE_TD, "TSY:Queued NET message: [ %s]", trace_msg ); trace_msg.SetLength( 0 ); } else if ( firstTime ) // 1st line of the trace. { firstTime = EFalse; -OstTraceExt1( TRACE_NORMAL, DUP7__TFLOG_PRINT_ISIMESSAGE, "TSY:Queued NET message: [ %s", trace_msg ); +OstTraceExt1( TRACE_NORMAL, DUP7__TFLOG_PRINT_ISIMESSAGE_TD, "TSY:Queued NET message: [ %s", trace_msg ); trace_msg.SetLength( 0 ); } else if ( ( i + 1 ) == length ) // The last line. { -OstTraceExt1( TRACE_NORMAL, DUP8__TFLOG_PRINT_ISIMESSAGE, "TSY:Queued NET message: %s]", trace_msg ); +OstTraceExt1( TRACE_NORMAL, DUP8__TFLOG_PRINT_ISIMESSAGE_TD, "TSY:Queued NET message: %s]", trace_msg ); trace_msg.SetLength( 0 ); } else // just print bytes. { -OstTraceExt1( TRACE_NORMAL, DUP9__TFLOG_PRINT_ISIMESSAGE, "TSY:Queued NET message: %s", trace_msg ); +OstTraceExt1( TRACE_NORMAL, DUP9__TFLOG_PRINT_ISIMESSAGE_TD, "TSY:Queued NET message: %s", trace_msg ); trace_msg.SetLength( 0 ); } counter = 0; @@ -212,31 +212,31 @@ TInt ret( KErrNone ); TFLOGSTRING("TSY: CalculateNetworkInformationSbStartOffset"); - OstTrace0( TRACE_NORMAL, _CALCULATENETWORKINFORMATIONSBSTARTOFFSET, "CalculateNetworkInformationSbStartOffset" ); + OstTrace0( TRACE_NORMAL, _CALCULATENETWORKINFORMATIONSBSTARTOFFSET_TD, "CalculateNetworkInformationSbStartOffset" ); TUint8 messageId = aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ); if ( NET_MODEM_REG_STATUS_IND == messageId ) { TFLOGSTRING("TSY: CalculateNetworkInformationSbStartOffset; NET_REG_STATUS_IND"); - OstTrace0( TRACE_NORMAL, DUP1__CALCULATENETWORKINFORMATIONSBSTARTOFFSET, "CalculateNetworkInformationSbStartOffset; NET_REG_STATUS_IND" ); + OstTrace0( TRACE_NORMAL, DUP1__CALCULATENETWORKINFORMATIONSBSTARTOFFSET_TD, "CalculateNetworkInformationSbStartOffset; NET_REG_STATUS_IND" ); aSbStartOffset = SIZE_NET_MODEM_REG_STATUS_IND; } else if ( NET_MODEM_REG_STATUS_GET_RESP == messageId ) { TFLOGSTRING("TSY: CalculateNetworkInformationSbStartOffset; NET_REG_STATUS_GET_RESP"); - OstTrace0( TRACE_NORMAL, DUP2__CALCULATENETWORKINFORMATIONSBSTARTOFFSET, "CalculateNetworkInformationSbStartOffset; NET_REG_STATUS_GET_RESP" ); + OstTrace0( TRACE_NORMAL, DUP2__CALCULATENETWORKINFORMATIONSBSTARTOFFSET_TD, "CalculateNetworkInformationSbStartOffset; NET_REG_STATUS_GET_RESP" ); aSbStartOffset = SIZE_NET_MODEM_REG_STATUS_GET_RESP; } else if ( NET_SET_RESP == messageId ) { TFLOGSTRING("TSY: CalculateNetworkInformationSbStartOffset; NET_SET_RESP"); - OstTrace0( TRACE_NORMAL, DUP3__CALCULATENETWORKINFORMATIONSBSTARTOFFSET, "CalculateNetworkInformationSbStartOffset; NET_SET_RESP" ); + OstTrace0( TRACE_NORMAL, DUP3__CALCULATENETWORKINFORMATIONSBSTARTOFFSET_TD, "CalculateNetworkInformationSbStartOffset; NET_SET_RESP" ); aSbStartOffset = SIZE_NET_SET_RESP; } else { TFLOGSTRING2("TSY: CalculateNetworkInformationSbStartOffset;unknown messageId=%x", messageId); - OstTrace1( TRACE_NORMAL, DUP4__CALCULATENETWORKINFORMATIONSBSTARTOFFSET, "CalculateNetworkInformationSbStartOffset;unknown messageId=%x", messageId ); + OstTrace1( TRACE_NORMAL, DUP4__CALCULATENETWORKINFORMATIONSBSTARTOFFSET_TD, "CalculateNetworkInformationSbStartOffset;unknown messageId=%x", messageId ); ret = KErrNotSupported; } @@ -253,7 +253,7 @@ CMmNetMessHandler::CMmNetMessHandler() { TFLOGSTRING("TSY: CMmNetMessHandler::CMmNetMessHandler() - Start"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_CMMNETMESSHANDLER, "CMmNetMessHandler::CMmNetMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_CMMNETMESSHANDLER_TD, "CMmNetMessHandler::CMmNetMessHandler" ); } // ----------------------------------------------------------------------------- @@ -270,7 +270,7 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::NewL"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NEWL, "CMmNetMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NEWL_TD, "CMmNetMessHandler::NewL" ); CMmNetMessHandler* netMessHandler = new ( ELeave ) CMmNetMessHandler(); @@ -317,7 +317,7 @@ aPhoNetReceiver->RegisterL( netMessHandler, PN_PERMANENT_DATA, - PERM_PM_RECORD_READ_RESP ); To be done in CPS */ + PERM_PM_RECORD_READ_RESP ); */ CleanupStack::Pop( netMessHandler ); @@ -332,7 +332,7 @@ void CMmNetMessHandler::ConstructL() { TFLOGSTRING("TSY: CMmNetMessHandler::ConstructL()"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_CONSTRUCTL, "CMmNetMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_CONSTRUCTL_TD, "CMmNetMessHandler::ConstructL" ); iNetOperatorNameHandler = CMmNetOperatorNameHandler::NewL( this, @@ -374,7 +374,7 @@ CMmNetMessHandler::~CMmNetMessHandler() { TFLOGSTRING("TSY: CMmNetMessHandler::~CMmNetMessHandler() - End"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_CMMNETMESSHANDLER, "CMmNetMessHandler::~CMmNetMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_CMMNETMESSHANDLER_TD, "CMmNetMessHandler::~CMmNetMessHandler" ); delete iNetOperatorNameHandler; @@ -404,7 +404,7 @@ const TDesC8& aFileData ) { TFLOGSTRING3("TSY: CMmNetMessHandler::ProcessUiccMsg, transaction ID: %d, status: %d", aTraId, aStatus ); -OstTraceExt2( TRACE_NORMAL, CMMNETMESSHANDLER_PROCESSUICCMSG, "CMmNetMessHandler::ProcessUiccMsg;aTraId=%d;aStatus=%d", aTraId, aStatus ); +OstTraceExt2( TRACE_NORMAL, CMMNETMESSHANDLER_PROCESSUICCMSG_TD, "CMmNetMessHandler::ProcessUiccMsg;aTraId=%d;aStatus=%d", aTraId, aStatus ); TInt ret( KErrNone ); @@ -428,7 +428,7 @@ default: { TFLOGSTRING("TSY: CMmNetMessHandler::ProcessUiccMsg - unknown transaction ID" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_PROCESSUICCMSG, "CMmNetMessHandler::ProcessUiccMsg - - unknown transaction ID" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_PROCESSUICCMSG_TD, "CMmNetMessHandler::ProcessUiccMsg - - unknown transaction ID" ); break; } } @@ -447,7 +447,7 @@ ) { TFLOGSTRING2("TSY: CMmNetMessHandler::ExtFuncL - Ipc: %d", aIpc); -OstTrace1( TRACE_NORMAL, CMMNETMESSHANDLER_EXTFUNCL, "CMmNetMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMNETMESSHANDLER_EXTFUNCL_TD, "CMmNetMessHandler::ExtFuncL;aIpc=%d", aIpc ); //*************************************************************// // NOTE: @@ -526,7 +526,7 @@ default: { TFLOGSTRING2("TSY: CMmNetMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_EXTFUNCL, "CMmNetMessHandler::ExtFuncL;Unknown IPC=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_EXTFUNCL_TD, "CMmNetMessHandler::ExtFuncL;Unknown IPC=%d", aIpc ); ret = KErrNotSupported; break; } @@ -545,14 +545,14 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::ReceiveMessageL"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_RECEIVEMESSAGEL, "CMmNetMessHandler::ReceiveMessageL" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmNetMessHandler::ReceiveMessageL" ); // Resource and message id TInt resource( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) ); TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); TFLOGSTRING3("TSY: CMmNetMessHandler::ReceiveMessageL - MessageId:%d. Resource: %d", messageId, resource); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_RECEIVEMESSAGEL, "CMmNetMessHandler::ReceiveMessageL;messageId=%d;resource=%d", messageId, resource ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmNetMessHandler::ReceiveMessageL;messageId=%d;resource=%d", messageId, resource ); // Transaction id. TUint8 transactId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID ) ); @@ -636,7 +636,7 @@ { // No appropriate handler methods for ISI-message found. TFLOGSTRING("TSY: CMmNetMessHandler::ReceiveMessageL - no handler for the NETWORK message id"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_RECEIVEMESSAGEL, "CMmNetMessHandler::ReceiveMessageL - no handler for the NETWORK message id" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmNetMessHandler::ReceiveMessageL - no handler for the NETWORK message id" ); // Server not known break; } @@ -680,7 +680,7 @@ { // No appropriate handler methods for ISI-message found. TFLOGSTRING("TSY: CMmNetMessHandler::ReceiveMessageL - no handler for the INFO message id"); -OstTrace0( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_RECEIVEMESSAGEL, "CMmNetMessHandler::ReceiveMessageL - no handler for the INFO message id" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmNetMessHandler::ReceiveMessageL - no handler for the INFO message id" ); break; } } @@ -712,16 +712,16 @@ { // No appropriate handler methods for ISI-message found. TFLOGSTRING("TSY: CMmNetMessHandler::ReceiveMessageL - no handler for the PERMANENT_DATA message id"); -OstTrace0( TRACE_NORMAL, DUP5_CMMNETMESSHANDLER_RECEIVEMESSAGEL, "CMmNetMessHandler::ReceiveMessageL - no handler for the PERMANENT_DATA message id" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMNETMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmNetMessHandler::ReceiveMessageL - no handler for the PERMANENT_DATA message id" ); break; } } break; - } To be done in CPS */ + } */ default: { TFLOGSTRING("TSY: CMmNetMessHandler::ReceiveMessageL - Switch resource case default"); -OstTrace0( TRACE_NORMAL, DUP6_CMMNETMESSHANDLER_RECEIVEMESSAGEL, "CMmNetMessHandler::ReceiveMessageL - Switch resource case default" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMNETMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmNetMessHandler::ReceiveMessageL - Switch resource case default" ); break; // Server not known } } // End switch ( resource ) @@ -742,12 +742,13 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::NetModemRegStatusInd"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETMODEMREGSTATUSIND, "CMmNetMessHandler::NetModemRegStatusInd" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETMODEMREGSTATUSIND_TD, "CMmNetMessHandler::NetModemRegStatusInd" ); // Assistant for packaging. CMmDataPackage dataPackage; - RMobilePhone::TMobilePhoneNetworkInfoV5 networkInfo; + RMobilePhone::TMobilePhoneNetworkInfoV5 iNetworkInfoHelper = + RMobilePhone::TMobilePhoneNetworkInfoV5(); RMobilePhone::TMobilePhoneLocationAreaV1 locationArea; // Buffer for Operator code, length is 3. @@ -762,7 +763,7 @@ TUint sbStartOffSet( 0 ); // Network mode received via NET_RAT_IND/NET_RAT_RESP. - networkInfo.iMode = iNetworkMode; + iNetworkInfoHelper.iMode = iNetworkMode; // look for subblock offset to get operator info from TInt returnValue( FindOperatorInfoSubBlock( aIsiMessage, @@ -781,13 +782,13 @@ // Area information is known. locationArea.iAreaKnown = ETrue; // Set status to current. - networkInfo.iStatus = RMobilePhone::ENetworkStatusCurrent; + iNetworkInfoHelper.iStatus = RMobilePhone::ENetworkStatusCurrent; // Band info is cdma specific. - networkInfo.iBandInfo = RMobilePhone::EBandUnknown; + iNetworkInfoHelper.iBandInfo = RMobilePhone::EBandUnknown; // Sid is cdma specific, set it to default value. - networkInfo.iCdmaSID.Zero(); + iNetworkInfoHelper.iCdmaSID.Zero(); // Analog SID is cdma specific, set it to default value. - networkInfo.iAnalogSID.Zero(); + iNetworkInfoHelper.iAnalogSID.Zero(); // Get the operator code. Size is 3 bytes. operatorCode = aIsiMessage.GetData( sbStartOffSet + NET_MODEM_CURRENT_CELL_INFO_OFFSET_OPERATORCODE, @@ -795,11 +796,11 @@ // Map the operator and country code to symbian values MapOperatorAndCountryCode( operatorCode, - networkInfo.iNetworkId, - networkInfo.iCountryCode ); + iNetworkInfoHelper.iNetworkId, + iNetworkInfoHelper.iCountryCode ); // Access technology received via NET_RAT_IND/NET_RAT_RESP. - networkInfo.iAccess = iNetworkAccess; + iNetworkInfoHelper.iAccess = iNetworkAccess; // Network type. networkType = aIsiMessage.Get8bit( @@ -813,12 +814,12 @@ // HSDPA availability indicator. // If TRUE then the cell supports HSDPA. - networkInfo.iHsdpaAvailableIndicator = aIsiMessage.Get8bit( + iNetworkInfoHelper.iHsdpaAvailableIndicator = aIsiMessage.Get8bit( sbStartOffSet + NET_MODEM_CURRENT_CELL_INFO_OFFSET_HSDPAAVAILABLEINCELL ); -TFLOGSTRING2("TSY: CMmNetMessHandler::NetModemRegStatusInd, HSDPA Available Indicator = %d.", networkInfo.iHsdpaAvailableIndicator); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_NETMODEMREGSTATUSIND, "CMmNetMessHandler::NetModemRegStatusInd, HSDPA Available Indicator=%hhu", networkInfo.iHsdpaAvailableIndicator ); +TFLOGSTRING2("TSY: CMmNetMessHandler::NetModemRegStatusInd, HSDPA Available Indicator = %d.", iNetworkInfoHelper.iHsdpaAvailableIndicator); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_NETMODEMREGSTATUSIND_TD, "CMmNetMessHandler::NetModemRegStatusInd, HSDPA Available Indicator=%hhu", iNetworkInfoHelper.iHsdpaAvailableIndicator ); // This is done for SUB 403-7200: NokiaTSY: HSUPA Cell Indicator for S60 (S60 3.2.2 / S_CPR8.1). // This can be removed when actual implementation for HSUPA Cell Indicator is done. @@ -838,10 +839,10 @@ if ( hsdpaAvailableIndicator || hsupaAvailableIndicator ) { - networkInfo.iHsdpaAvailableIndicator = ETrue; - -TFLOGSTRING2("TSY: CMmNetMessHandler::NetModemRegStatusInd, HSDPA Available Indicator (HSDPA or HSUPA available) = %d.", networkInfo.iHsdpaAvailableIndicator); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_NETMODEMREGSTATUSIND, "CMmNetMessHandler::NetModemRegStatusInd, HSDPA Available Indicator (HSDPA or HSUPA available)=%hhu", networkInfo.iHsdpaAvailableIndicator ); + iNetworkInfoHelper.iHsdpaAvailableIndicator = ETrue; + +TFLOGSTRING2("TSY: CMmNetMessHandler::NetModemRegStatusInd, HSDPA Available Indicator (HSDPA or HSUPA available) = %d.", iNetworkInfoHelper.iHsdpaAvailableIndicator); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_NETMODEMREGSTATUSIND_TD, "CMmNetMessHandler::NetModemRegStatusInd, HSDPA Available Indicator (HSDPA or HSUPA available)=%hhu", iNetworkInfoHelper.iHsdpaAvailableIndicator ); } #endif // defined ( CASW_HSXPA_INDICATOR_SUPPORTED ) || defined ( INTERNAL_TESTING_CASW_HSXPA_INDICATOR_SUPPORT ) } @@ -863,7 +864,7 @@ MapNWAndRegStatus( registrationStatus, regStatus, - networkInfo.iStatus ); + iNetworkInfoHelper.iStatus ); // Get network selection mode. Will be handled after CAUSE EXTENSION // handling. @@ -893,7 +894,7 @@ } // Pack the data for sending to the manager. - dataPackage.PackData( ®Status, &networkInfo.iStatus ); + dataPackage.PackData( ®Status, &iNetworkInfoHelper.iStatus ); // Inform the manager that the network selection mode has changed. iMessageRouter->Complete( EMobilePhoneNotifyNetworkRegistrationStatusChange, @@ -931,7 +932,7 @@ networkType, operatorCode, locationArea, - networkInfo ); + iNetworkInfoHelper ); } else { @@ -956,7 +957,7 @@ // operator names. CompleteMobilePhoneNotifyCurrentNetworkChange( locationArea, - networkInfo ); + iNetworkInfoHelper ); } } else @@ -981,7 +982,7 @@ ) const { TFLOGSTRING("TSY: CMmNetMessHandler::NetModemRegStatusGetReq"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETMODEMREGSTATUSGETREQ, "CMmNetMessHandler::NetModemRegStatusGetReq" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETMODEMREGSTATUSGETREQ_TD, "CMmNetMessHandler::NetModemRegStatusGetReq" ); // Data buffer length is 2 TBuf8<2> data; @@ -1007,7 +1008,7 @@ ) const { TFLOGSTRING("TSY: CMmNetMessHandler::NetModemAvailableGetReq"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETMODEMAVAILABLEGETREQ, "CMmNetMessHandler::NetModemAvailableGetReq" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETMODEMAVAILABLEGETREQ_TD, "CMmNetMessHandler::NetModemAvailableGetReq" ); // Append data for ISI message. Has room for mode, num of subBlocks // and NET_MODEM_GSM_BAND_INFO sb. @@ -1049,7 +1050,7 @@ ) const { TFLOGSTRING("TSY: CMmNetMessHandler::NetModemAvailableGetRespL"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETMODEMAVAILABLEGETRESPL, "CMmNetMessHandler::NetModemAvailableGetRespL" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETMODEMAVAILABLEGETRESPL_TD, "CMmNetMessHandler::NetModemAvailableGetRespL" ); // Check the success of the operation. TUint8 successCode( aIsiMessage.Get8bit( @@ -1062,7 +1063,7 @@ if ( 0 < nbOfSubBlocks && NET_CAUSE_OK == successCode ) { TFLOGSTRING("TSY: CMmNetMessHandler::NetModemAvailableGetRespL - Success case"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_NETMODEMAVAILABLEGETRESPL, "CMmNetMessHandler::NetModemAvailableGetRespL - Success case" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_NETMODEMAVAILABLEGETRESPL_TD, "CMmNetMessHandler::NetModemAvailableGetRespL - Success case" ); // Handle NET_MODEM_AVAILABLE_GET_RESP ISI-message success case. iNetOperatorNameHandler->HandleManualSearchSuccessCaseL( aIsiMessage ); @@ -1070,7 +1071,7 @@ else { TFLOGSTRING("TSY: CMmNetMessHandler::NetModemAvailableGetRespL - Error case"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_NETMODEMAVAILABLEGETRESPL, "CMmNetMessHandler::NetModemAvailableGetRespL - Error case" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_NETMODEMAVAILABLEGETRESPL_TD, "CMmNetMessHandler::NetModemAvailableGetRespL - Error case" ); TInt epocError( KErrGeneral ); @@ -1078,7 +1079,7 @@ NET_CAUSE_REQUEST_INTERRUPTED == successCode ) { TFLOGSTRING("TSY: CMmNetMessHandler::NetModemAvailableGetRespL - Error case - MT call during network search"); -OstTrace0( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_NETMODEMAVAILABLEGETRESPL, "CMmNetMessHandler::NetModemAvailableGetRespL - Error case - MT call during network search" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_NETMODEMAVAILABLEGETRESPL_TD, "CMmNetMessHandler::NetModemAvailableGetRespL - Error case - MT call during network search" ); // In case of MT call during network search, NET server can // interrupt network search before client has chance to cancel // the search request. Thus in this case we need to convert the @@ -1090,7 +1091,7 @@ else { TFLOGSTRING("TSY: CMmNetMessHandler::NetModemAvailableGetRespL - Error case - Cancel or Other error"); -OstTrace0( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_NETMODEMAVAILABLEGETRESPL, "CMmNetMessHandler::NetModemAvailableGetRespL - Error case - Cancel or Other error" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_NETMODEMAVAILABLEGETRESPL_TD, "CMmNetMessHandler::NetModemAvailableGetRespL - Error case - Cancel or Other error" ); // If some other error or cancel is called, then complete // with mapped error code. epocError = CMmStaticUtility::CSCauseToEpocError( @@ -1118,7 +1119,7 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::NetAvailableCancelReq"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETAVAILABLECANCELREQ, "CMmNetMessHandler::NetAvailableCancelReq" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETAVAILABLECANCELREQ_TD, "CMmNetMessHandler::NetAvailableCancelReq" ); // Set the network search flag to ETrue. iSearchNetworkCancelIssued = ETrue; @@ -1148,7 +1149,7 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::NetAvailableCancelResp"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETAVAILABLECANCELRESP, "CMmNetMessHandler::NetAvailableCancelResp" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETAVAILABLECANCELRESP_TD, "CMmNetMessHandler::NetAvailableCancelResp" ); // Get success code TUint8 successCode( aIsiMessage.Get8bit( @@ -1189,10 +1190,10 @@ TUint8 networkSelectionMode( NET_SELECT_MODE_NO_SELECTION ); TFLOGSTRING2("TSY: CMmNetMessHandler::NetSetReq -- Manual NW selection(T/F): %d", aIsManual); -OstTrace1( TRACE_NORMAL, CMMNETMESSHANDLER_NETSETREQ, "CMmNetMessHandler::NetSetReq;aIsManual=%d", aIsManual ); +OstTrace1( TRACE_NORMAL, CMMNETMESSHANDLER_NETSETREQ_TD, "CMmNetMessHandler::NetSetReq;aIsManual=%d", aIsManual ); TFLOGSTRING3("TSY: CMmNetMessHandler::NetSetReq -- MNC: %S MCC: %S", &aMnc, &aMcc); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_NETSETREQ, "CMmNetMessHandler::NetSetReq;aMnc=%S;aMcc=%S", aMnc, aMcc ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_NETSETREQ_TD, "CMmNetMessHandler::NetSetReq;aMnc=%S;aMcc=%S", aMnc, aMcc ); // If NW selection mode is changed from manual to automatic if ( NET_SELECT_MODE_MANUAL == iSelectionMethod @@ -1212,7 +1213,7 @@ } TFLOGSTRING2("TSY: CMmNetMessHandler::NetSetReq -- NW Selection Mode: %d", networkSelectionMode); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_NETSETREQ, "CMmNetMessHandler::NetSetReq;networkSelectionMode=%hhu", networkSelectionMode ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_NETSETREQ_TD, "CMmNetMessHandler::NetSetReq;networkSelectionMode=%hhu", networkSelectionMode ); // Append data for ISI message. // Has room for registered in another protocol, num of subBlocks, @@ -1240,7 +1241,7 @@ if ( NET_SELECT_MODE_USER_RESELECTION != networkSelectionMode ) { TFLOGSTRING("TSY: CMmNetMessHandler::NetSetReq -- Adding NET_MODEM_GSM_OPERATOR_INFO SubBlock"); -OstTrace0( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_NETSETREQ, "CMmNetMessHandler::NetSetReq, Adding NET_MODEM_GSM_OPERATOR_INFO SubBlock" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_NETSETREQ_TD, "CMmNetMessHandler::NetSetReq, Adding NET_MODEM_GSM_OPERATOR_INFO SubBlock" ); // We add NET_MODEM_GSM_OPERATOR_INFO subblock to ISI. // The information about the Band is not send trough MM ETEL Api, thus // the value is set to unknown @@ -1262,7 +1263,7 @@ } TFLOGSTRING("TSY: CMmNetMessHandler::NetSetReq -- Adding NET_OPERATOR_INFO_COMMON SubBlock"); -OstTrace0( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_NETSETREQ, "CMmNetMessHandler::NetSetReq, Adding NET_OPERATOR_INFO_COMMON SubBlock" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_NETSETREQ_TD, "CMmNetMessHandler::NetSetReq, Adding NET_OPERATOR_INFO_COMMON SubBlock" ); // Data buffer for net operator info common sb. TBuf8 operatorInfoCommonBuf; @@ -1293,7 +1294,7 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::NetSetCancelReq"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETSETCANCELREQ, "CMmNetMessHandler::NetSetCancelReq" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETSETCANCELREQ_TD, "CMmNetMessHandler::NetSetCancelReq" ); // Set the network select flag to ETrue. // This flag is checked in NetSetCancelResp. @@ -1325,7 +1326,7 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::NetSetCancelResp"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETSETCANCELRESP, "CMmNetMessHandler::NetSetCancelResp" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETSETCANCELRESP_TD, "CMmNetMessHandler::NetSetCancelResp" ); // Get success code TUint8 successCode( aIsiMessage.Get8bit( @@ -1355,7 +1356,7 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::NetRatInd"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETRATIND, "CMmNetMessHandler::NetRatInd" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETRATIND_TD, "CMmNetMessHandler::NetRatInd" ); // Call NetRatResp to do the common job NetRatResp( aIsiMessage ); @@ -1373,7 +1374,7 @@ ) const { TFLOGSTRING("TSY: CMmNetMessHandler::NetRatReq"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETRATREQ, "CMmNetMessHandler::NetRatReq" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETRATREQ_TD, "CMmNetMessHandler::NetRatReq" ); // Message data size is 1 TBuf8<1> data; @@ -1402,7 +1403,7 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::NetRatResp"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETRATRESP, "CMmNetMessHandler::NetRatResp" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETRATRESP_TD, "CMmNetMessHandler::NetRatResp" ); TUint sbStartOffSet( 0 ); // NET_RAT_INFO sub block @@ -1426,7 +1427,7 @@ iNetworkMode = RMobilePhone::ENetworkModeGsm; iNetworkAccess = RMobilePhone::ENetworkAccessGsm; TFLOGSTRING("TSY: CMmNetMessHandler::NetRatResp - network mode GSM"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_NETRATRESP, "CMmNetMessHandler::NetRatResp - network mode GSM" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_NETRATRESP_TD, "CMmNetMessHandler::NetRatResp - network mode GSM" ); break; } case NET_UMTS_RAT: @@ -1434,13 +1435,13 @@ iNetworkMode = RMobilePhone::ENetworkModeWcdma; iNetworkAccess = RMobilePhone::ENetworkAccessUtran; TFLOGSTRING("TSY: CMmNetMessHandler::NetRatResp - network mode UMTS"); -OstTrace0( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_NETRATRESP, "CMmNetMessHandler::NetRatResp - network mode UMTS" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_NETRATRESP_TD, "CMmNetMessHandler::NetRatResp - network mode UMTS" ); break; } default: { TFLOGSTRING("TSY: CMmNetMessHandler::NetRatResp. default network mode"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_NETRATRESP, "CMmNetMessHandler::NetRatResp, default network mode" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_NETRATRESP_TD, "CMmNetMessHandler::NetRatResp, default network mode" ); iNetworkMode = RMobilePhone::ENetworkModeUnknown; iNetworkAccess = RMobilePhone::ENetworkAccessUnknown; break; @@ -1472,7 +1473,7 @@ ) const { TFLOGSTRING("TSY: CMmNetMessHandler::NetNetworkSelectModeSetReq"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETNETWORKSELECTMODESETREQ, "CMmNetMessHandler::NetNetworkSelectModeSetReq" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETNETWORKSELECTMODESETREQ_TD, "CMmNetMessHandler::NetNetworkSelectModeSetReq" ); TInt ret( KErrNone ); @@ -1526,7 +1527,7 @@ ) const { TFLOGSTRING("TSY: CMmNetMessHandler::NetNetworkSelectModeSetResp"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETNETWORKSELECTMODESETRESP, "CMmNetMessHandler::NetNetworkSelectModeSetResp" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETNETWORKSELECTMODESETRESP_TD, "CMmNetMessHandler::NetNetworkSelectModeSetResp" ); // Get success code TUint8 successCode( aIsiMessage.Get8bit( @@ -1552,7 +1553,7 @@ TInt CMmNetMessHandler::NetRssiGetReq() const { TFLOGSTRING("TSY: CMmNetMessHandler::NetRssiGetReq"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETRSSIGETREQ, "CMmNetMessHandler::NetRssiGetReq" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETRSSIGETREQ_TD, "CMmNetMessHandler::NetRssiGetReq" ); // Data buffer length is 2 (message size minus transId, msgId) TBuf8< SIZE_NET_RSSI_GET_REQ - 2 > reqData; @@ -1580,7 +1581,7 @@ ISI_HEADER_SIZE + NET_RSSI_GET_RESP_OFFSET_SUCCESSCODE ) ); TFLOGSTRING2("TSY: CMmNetMessHandler::NetRssiGetResp, successcode=%d", successCode); -OstTraceExt1( TRACE_NORMAL, CMMNETMESSHANDLER_NETRSSIGETRESP, "CMmNetMessHandler::NetRssiGetResp;successCode=%hhu", successCode ); +OstTraceExt1( TRACE_NORMAL, CMMNETMESSHANDLER_NETRSSIGETRESP_TD, "CMmNetMessHandler::NetRssiGetResp;successCode=%hhu", successCode ); if ( NET_CAUSE_OK == successCode ) { @@ -1617,7 +1618,7 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::NetRssiInd"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETRSSIIND, "CMmNetMessHandler::NetRssiInd" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETRSSIIND_TD, "CMmNetMessHandler::NetRssiInd" ); // Note: the unsigned value gathered from the ISI is percentages TUint8 bars( aIsiMessage.Get8bit( @@ -1658,7 +1659,7 @@ TInt32 rssiInDbm( aRSSIIsi ); TFLOGSTRING3("TSY: CMmNetMessHandler::HandleRssi -- signalBars=%d rssiInDbm=%d", signalBars, aRSSIIsi); -OstTraceExt2( TRACE_NORMAL, CMMNETMESSHANDLER_HANDLERSSI, "CMmNetMessHandler::HandleRssi;signalBars=%hhd;rssiInDbm=%hhu", signalBars, aRSSIIsi ); +OstTraceExt2( TRACE_NORMAL, CMMNETMESSHANDLER_HANDLERSSI_TD, "CMmNetMessHandler::HandleRssi;signalBars=%hhd;rssiInDbm=%hhu", signalBars, aRSSIIsi ); CMmDataPackage dataPackage; dataPackage.PackData( &signalBars, &rssiInDbm ); @@ -1681,7 +1682,7 @@ ) const { TFLOGSTRING("TSY: CMmNetMessHandler::NetTimeInd"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETTIMEIND, "CMmNetMessHandler::NetTimeInd" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETTIMEIND_TD, "CMmNetMessHandler::NetTimeInd" ); TUint sbStartOffSet( 0 ); @@ -1730,7 +1731,7 @@ totalYear = KNitzYearOffset + year; TFLOGSTRING2("TSY: CMmNetMessHandler::NetTimeInd year: %d", totalYear ); -OstTrace1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_NETTIMEIND, "CMmNetMessHandler::NetTimeInd;NetTimeInd year=%d", totalYear ); +OstTrace1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_NETTIMEIND_TD, "CMmNetMessHandler::NetTimeInd;NetTimeInd year=%d", totalYear ); // NITZ information RMobilePhone::TMobilePhoneNITZ timeDate; @@ -1806,7 +1807,7 @@ ) { TFLOGSTRING2("TSY: CMmNetMessHandler::MapNWAndRegStatus. ISARegistrationStatus:%d", aISARegistrationStatus); -OstTrace1( TRACE_NORMAL, CMMNETMESSHANDLER_MAPNWANDREGSTATUS, "CMmNetMessHandler::MapNWAndRegStatus;aRegStatus=%d", aRegStatus ); +OstTrace1( TRACE_NORMAL, CMMNETMESSHANDLER_MAPNWANDREGSTATUS_TD, "CMmNetMessHandler::MapNWAndRegStatus;aRegStatus=%d", aRegStatus ); switch ( aISARegistrationStatus ) { @@ -1860,7 +1861,7 @@ default: { TFLOGSTRING("TSY: CMmNetMessHandler::MapNWAndRegStatus. default registration status"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_MAPNWANDREGSTATUS, "CMmNetMessHandler::MapNWAndRegStatus, default registration status" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_MAPNWANDREGSTATUS_TD, "CMmNetMessHandler::MapNWAndRegStatus, default registration status" ); aNWStatus = RMobilePhone::ENetworkStatusUnknown; aRegStatus = RMobilePhone::ERegistrationUnknown; break; @@ -1881,7 +1882,7 @@ ) { TFLOGSTRING2("TSY: CMmNetMessHandler::MapNWSelectionMode. ISA selectionmode:%d", aISASelectionMode); -OstTraceExt1( TRACE_NORMAL, CMMNETMESSHANDLER_MAPNWSELECTIONMODE, "CMmNetMessHandler::MapNWSelectionMode;aISASelectionMode=%hhu", aISASelectionMode ); +OstTraceExt1( TRACE_NORMAL, CMMNETMESSHANDLER_MAPNWSELECTIONMODE_TD, "CMmNetMessHandler::MapNWSelectionMode;aISASelectionMode=%hhu", aISASelectionMode ); if ( NET_SELECT_MODE_AUTOMATIC == aISASelectionMode ) { @@ -1917,7 +1918,7 @@ { TFLOGSTRING2("TSY: CMmNetMessHandler::MapOperatorAndCountryCode - MNCLenght: %d", aMNCLength); -OstTrace1( TRACE_NORMAL, CMMNETMESSHANDLER_MAPOPERATORANDCOUNTRYCODE, "CMmNetMessHandler::MapOperatorAndCountryCode;aMNCLength=%d", aMNCLength ); +OstTrace1( TRACE_NORMAL, CMMNETMESSHANDLER_MAPOPERATORANDCOUNTRYCODE_TD, "CMmNetMessHandler::MapOperatorAndCountryCode;aMNCLength=%d", aMNCLength ); // Country code mapping TUint16 mcc1( 0 ); @@ -2003,7 +2004,7 @@ ) { TFLOGSTRING2("TSY: CMmNetMessHandler::MapNwStatus. ISANetworkStatus:%d", aISANetworkStatus); -OstTraceExt1( TRACE_NORMAL, CMMNETMESSHANDLER_MAPNWSTATUS, "CMmNetMessHandler::MapNwStatus;aISANetworkStatus=%hhu", aISANetworkStatus ); +OstTraceExt1( TRACE_NORMAL, CMMNETMESSHANDLER_MAPNWSTATUS_TD, "CMmNetMessHandler::MapNwStatus;aISANetworkStatus=%hhu", aISANetworkStatus ); switch ( aISANetworkStatus ) { @@ -2030,7 +2031,7 @@ default: { TFLOGSTRING("TSY: CMmNetMessHandler::MapNwStatus. mapped default network status"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_MAPNWSTATUS, "CMmNetMessHandler::MapNwStatus, mapped default network status" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_MAPNWSTATUS_TD, "CMmNetMessHandler::MapNwStatus, mapped default network status" ); aNWStatus = RMobilePhone::ENetworkStatusUnknown; break; } @@ -2057,7 +2058,7 @@ ISI_HEADER_SIZE + NET_CIPHERING_IND_OFFSET_CIPHERINGSTATUS ) ); TFLOGSTRING2("TSY: CMmNetMessHandler::NetCipheringInd. CipheringStatus:%d", cipheringStatus); -OstTraceExt1( TRACE_NORMAL, CMMNETMESSHANDLER_NETCIPHERINGIND, "CMmNetMessHandler::NetCipheringInd;cipheringStatus=%hhu", cipheringStatus ); +OstTraceExt1( TRACE_NORMAL, CMMNETMESSHANDLER_NETCIPHERINGIND_TD, "CMmNetMessHandler::NetCipheringInd;cipheringStatus=%hhu", cipheringStatus ); switch( cipheringStatus ) { @@ -2076,7 +2077,7 @@ default: { TFLOGSTRING("TSY: CMmNetMessHandler::NetCipheringInd. no ciphering status"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_NETCIPHERINGIND, "CMmNetMessHandler::NetCipheringInd, no ciphering status" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_NETCIPHERINGIND_TD, "CMmNetMessHandler::NetCipheringInd, no ciphering status" ); break; } } @@ -2110,7 +2111,7 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::NetRadioInfoInd"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETRADIOINFOIND, "CMmNetMessHandler::NetRadioInfoInd" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_NETRADIOINFOIND_TD, "CMmNetMessHandler::NetRadioInfoInd" ); TBool oldCell_DCH = iCell_DCH; @@ -2130,7 +2131,7 @@ // iCell_DCH is true if and only if UTRAN radio state is Cell_DCH TFLOGSTRING2("TSY: CMmNetMessHandler::NetRadioInfoInd, UTRAN radio state=%d.", radioState); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_NETRADIOINFOIND, "CMmNetMessHandler::NetRadioInfoInd;UTRAN radioState=%hhu", radioState ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_NETRADIOINFOIND_TD, "CMmNetMessHandler::NetRadioInfoInd;UTRAN radioState=%hhu", radioState ); iCell_DCH = ( ( NET_UTRAN_RADIO_CELL_DCH == radioState ) ? ETrue : EFalse ); @@ -2138,14 +2139,14 @@ else { TFLOGSTRING("TSY: CMmNetMessHandler::NetRadioInfoInd, no UTRAN radio state info."); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_NETRADIOINFOIND, "CMmNetMessHandler::NetRadioInfoInd, no UTRAN radio state info" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_NETRADIOINFOIND_TD, "CMmNetMessHandler::NetRadioInfoInd, no UTRAN radio state info" ); iCell_DCH = EFalse; } // State changed? TFLOGSTRING2("TSY: CMmNetMessHandler::NetRadioInfoInd, iCell_DCH = %d.", iCell_DCH); TFLOGSTRING2("TSY: CMmNetMessHandler::NetRadioInfoInd, oldCell_DCH = %d.", oldCell_DCH); -OstTrace1( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_NETRADIOINFOIND, "CMmNetMessHandler::NetRadioInfoInd;oldCell_DCH=%d", oldCell_DCH ); +OstTrace1( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_NETRADIOINFOIND_TD, "CMmNetMessHandler::NetRadioInfoInd;oldCell_DCH=%d", oldCell_DCH ); if ( iCell_DCH != oldCell_DCH ) { @@ -2159,11 +2160,11 @@ location.iCellId = iLastLocInfo.iCellId; TFLOGSTRING2("TSY: CMmNetMessHandler::NetRadioInfoInd, location.iAreaKnown = %d.", location.iAreaKnown); -OstTrace1( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_NETRADIOINFOIND, "CMmNetMessHandler::NetRadioInfoInd;location.iAreaKnown=%d", location.iAreaKnown ); +OstTrace1( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_NETRADIOINFOIND_TD, "CMmNetMessHandler::NetRadioInfoInd;location.iAreaKnown=%d", location.iAreaKnown ); TFLOGSTRING2("TSY: CMmNetMessHandler::NetRadioInfoInd, location.iLocationAreaCode = %d.", location.iLocationAreaCode); -OstTrace1( TRACE_NORMAL, DUP5_CMMNETMESSHANDLER_NETRADIOINFOIND, "CMmNetMessHandler::NetRadioInfoInd;location.iLocationAreaCode=%d", location.iLocationAreaCode ); +OstTrace1( TRACE_NORMAL, DUP5_CMMNETMESSHANDLER_NETRADIOINFOIND_TD, "CMmNetMessHandler::NetRadioInfoInd;location.iLocationAreaCode=%d", location.iLocationAreaCode ); TFLOGSTRING2("TSY: CMmNetMessHandler::NetRadioInfoInd, location.iCellId = %d.", location.iCellId ); -OstTrace1( TRACE_NORMAL, DUP6_CMMNETMESSHANDLER_NETRADIOINFOIND, "CMmNetMessHandler::NetRadioInfoInd;location.iCellId=%d", location.iCellId ); +OstTrace1( TRACE_NORMAL, DUP6_CMMNETMESSHANDLER_NETRADIOINFOIND_TD, "CMmNetMessHandler::NetRadioInfoInd;location.iCellId=%d", location.iCellId ); CMmDataPackage dataPackage; dataPackage.PackData( &iLastNWInfo, &location ); @@ -2188,11 +2189,11 @@ } TFLOGSTRING2("TSY: CMmNetMessHandler::NetRadioInfoInd, iLastLocInfo.iAreaKnown = %d.", iLastLocInfo.iAreaKnown); -OstTrace1( TRACE_NORMAL, DUP7_CMMNETMESSHANDLER_NETRADIOINFOIND, "CMmNetMessHandler::NetRadioInfoInd;iLastLocInfo.iAreaKnown=%d", iLastLocInfo.iAreaKnown ); +OstTrace1( TRACE_NORMAL, DUP7_CMMNETMESSHANDLER_NETRADIOINFOIND_TD, "CMmNetMessHandler::NetRadioInfoInd;iLastLocInfo.iAreaKnown=%d", iLastLocInfo.iAreaKnown ); TFLOGSTRING2("TSY: CMmNetMessHandler::NetRadioInfoInd, iLastLocInfo.iLocationAreaCode = %d.", iLastLocInfo.iLocationAreaCode); -OstTrace1( TRACE_NORMAL, DUP8_CMMNETMESSHANDLER_NETRADIOINFOIND, "CMmNetMessHandler::NetRadioInfoInd;iLastLocInfo.iLocationAreaCode=%d", iLastLocInfo.iLocationAreaCode ); +OstTrace1( TRACE_NORMAL, DUP8_CMMNETMESSHANDLER_NETRADIOINFOIND_TD, "CMmNetMessHandler::NetRadioInfoInd;iLastLocInfo.iLocationAreaCode=%d", iLastLocInfo.iLocationAreaCode ); TFLOGSTRING2("TSY: CMmNetMessHandler::NetRadioInfoInd, iLastLocInfo.iCellId = %d.", iLastLocInfo.iCellId); -OstTrace1( TRACE_NORMAL, DUP9_CMMNETMESSHANDLER_NETRADIOINFOIND, "CMmNetMessHandler::NetRadioInfoInd;iLastLocInfo.iCellId=%d", iLastLocInfo.iCellId ); +OstTrace1( TRACE_NORMAL, DUP9_CMMNETMESSHANDLER_NETRADIOINFOIND_TD, "CMmNetMessHandler::NetRadioInfoInd;iLastLocInfo.iCellId=%d", iLastLocInfo.iCellId ); } // ----------------------------------------------------------------------------- @@ -2203,7 +2204,7 @@ TInt CMmNetMessHandler::UiccReadCiReq() { TFLOGSTRING("TSY: CMmNetMessHandler::UiccReadCiReq"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_UICCREADCIREQ, "CMmNetMessHandler::UiccReadCiReq" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_UICCREADCIREQ_TD, "CMmNetMessHandler::UiccReadCiReq" ); // Set parameters for UICC_APPL_CMD_REQ message TUiccReadTransparent params; @@ -2234,7 +2235,7 @@ void CMmNetMessHandler::UiccReadCiResp( TInt aStatus, const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmNetMessHandler::UiccReadCiResp"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_UICCREADCIRESP, "CMmNetMessHandler::UiccReadCiResp" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_UICCREADCIRESP_TD, "CMmNetMessHandler::UiccReadCiResp" ); // Initialize ret value TInt ret( KErrNone ); @@ -2272,7 +2273,7 @@ TInt CMmNetMessHandler::UiccCsReadReq() { TFLOGSTRING("TSY: CMmNetMessHandler::UiccCsReadReq"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_UICCCSREADREQ, "CMmNetMessHandler::UiccCsReadReq" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_UICCCSREADREQ_TD, "CMmNetMessHandler::UiccCsReadReq" ); // At first we try to read EHPLMN, SIM file '6FD9' // When response is received and if EHPLMN is not supported @@ -2307,10 +2308,10 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmNetMessHandler::UiccCsReadEhpmlnResp"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_UICCCSREADEHPMLNRESP, "CMmNetMessHandler::UiccCsReadEhpmlnResp" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_UICCCSREADEHPMLNRESP_TD, "CMmNetMessHandler::UiccCsReadEhpmlnResp" ); // If status was OK, EHPLMN was supported - if ( KErrNone == aStatus ) + if ( UICC_STATUS_OK == aStatus ) { iHplmn = aFileData; } @@ -2349,9 +2350,9 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmNetMessHandler::UiccCsReadHpmlnResp"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_UICCCSREADHPMLNRESP, "CMmNetMessHandler::UiccCsReadHpmlnResp" ); - - if ( KErrNone == aStatus ) +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_UICCCSREADHPMLNRESP_TD, "CMmNetMessHandler::UiccCsReadHpmlnResp" ); + + if ( UICC_STATUS_OK == aStatus ) { TUint8 tempByte( 0 ); // Coding of HPMLN is defined in TS 24.008 @@ -2386,7 +2387,7 @@ void CMmNetMessHandler::SetSimNetworkInfo() { TFLOGSTRING("TSY: CMmNetMessHandler::SetSimNetworkInfo"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_SETSIMNETWORKINFO, "CMmNetMessHandler::SetSimNetworkInfo" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_SETSIMNETWORKINFO_TD, "CMmNetMessHandler::SetSimNetworkInfo" ); // iHomeInfo is declared in cmmnetmesshandler.h (class private parameter // to store the network information during the operator name is requested. @@ -2426,9 +2427,9 @@ iHomeInfo.iNetworkId ); TFLOGSTRING2("TSY: CMmNetMessHandler::SetSimNetworkInfo - CountryCode: %S", &iHomeInfo.iCountryCode); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_SETSIMNETWORKINFO, "CMmNetMessHandler::SetSimNetworkInfo - CountryCode=%S", iHomeInfo.iCountryCode ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_SETSIMNETWORKINFO_TD, "CMmNetMessHandler::SetSimNetworkInfo - CountryCode=%S", iHomeInfo.iCountryCode ); TFLOGSTRING2("TSY: CMmNetMessHandler::SetSimNetworkInfo - NetworkId: %S", &iHomeInfo.iNetworkId); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_SETSIMNETWORKINFO, "CMmNetMessHandler::SetSimNetworkInfo - NetworkId=%S", iHomeInfo.iNetworkId ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_SETSIMNETWORKINFO_TD, "CMmNetMessHandler::SetSimNetworkInfo - NetworkId=%S", iHomeInfo.iNetworkId ); // Buffer for Display tag. TBuf alphaTag; @@ -2440,7 +2441,7 @@ alphaTag ); TFLOGSTRING2("TSY: CMmNetMessHandler::SetSimNetworkInfo - Name: %S", &alphaTag); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_SETSIMNETWORKINFO, "CMmNetMessHandler::SetSimNetworkInfo - Name=%S", alphaTag ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_SETSIMNETWORKINFO_TD, "CMmNetMessHandler::SetSimNetworkInfo - Name=%S", alphaTag ); // Copy hard coded name to iDisplayTag. Long and short names not handled // in this case and they will left empty. @@ -2463,7 +2464,7 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::HandleError"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_HANDLEERROR, "CMmNetMessHandler::HandleError" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_HANDLEERROR_TD, "CMmNetMessHandler::HandleError" ); } // ----------------------------------------------------------------------------- @@ -2474,7 +2475,7 @@ TBool CMmNetMessHandler::GetImsPinVerifyStatus() { TFLOGSTRING("TSY: CMmNetMessHandler::GetImsPinVerifyStatus"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_GETIMSPINVERIFYSTATUS, "CMmNetMessHandler::GetImsPinVerifyStatus" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_GETIMSPINVERIFYSTATUS_TD, "CMmNetMessHandler::GetImsPinVerifyStatus" ); return iImsPinVerifyRequired; } @@ -2490,7 +2491,7 @@ ) { TFLOGSTRING2("TSY: CMmNetMessHandler::GpdsRadioActivityInd, NetworkMode = %d.", iNetworkMode); -OstTrace1( TRACE_NORMAL, CMMNETMESSHANDLER_GPDSRADIOACTIVITYIND, "CMmNetMessHandler::GpdsRadioActivityInd;iNetworkMode=%d", iNetworkMode ); +OstTrace1( TRACE_NORMAL, CMMNETMESSHANDLER_GPDSRADIOACTIVITYIND_TD, "CMmNetMessHandler::GpdsRadioActivityInd;iNetworkMode=%d", iNetworkMode ); // Should be ignored in 3G (information not valid). if ( RMobilePhone::ENetworkModeGsm == iNetworkMode ) @@ -2500,7 +2501,7 @@ // iPacketTransfer is true if and only // if radio activity state is GPDS_RADIO_ON TFLOGSTRING2("TSY: CMmNetMessHandler::GpdsRadioActivityInd, radio activity state=%d.", radioActivityStatus); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_GPDSRADIOACTIVITYIND, "CMmNetMessHandler::GpdsRadioActivityInd;radio activity state=%hhu", radioActivityStatus ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_GPDSRADIOACTIVITYIND_TD, "CMmNetMessHandler::GpdsRadioActivityInd;radio activity state=%hhu", radioActivityStatus ); TBool newPacketTransfer = ( ( GPDS_RADIO_ON == radioActivityStatus ) ? ETrue : EFalse ); @@ -2537,7 +2538,7 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::GpdsContextDeactivateInd"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_GPDSCONTEXTDEACTIVATEIND, "CMmNetMessHandler::GpdsContextDeactivateInd" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_GPDSCONTEXTDEACTIVATEIND_TD, "CMmNetMessHandler::GpdsContextDeactivateInd" ); // GPDS_RADIO_ACTIVITY_IND / RADIO_OFF is not received when // last context is closed => iPacketTransfer remains to ETrue // => simulate GPDS_RADIO_OFF from GPDS_CONTEXT_DEACTIVATE_IND. @@ -2566,9 +2567,9 @@ { // State changed? TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteGpdsRadioActivityInd, NEW transfer status = %d.", aNewPacketTrancferStatus); -OstTrace1( TRACE_NORMAL, CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;NEW transfer status=%d", aNewPacketTrancferStatus ); +OstTrace1( TRACE_NORMAL, CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND_TD, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;NEW transfer status=%d", aNewPacketTrancferStatus ); TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteGpdsRadioActivityInd, OLD transfer status = %d.", iPacketTransfer); -OstTrace1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;OLD transfer status=%d", iPacketTransfer ); +OstTrace1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND_TD, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;OLD transfer status=%d", iPacketTransfer ); if ( iPacketTransfer != aNewPacketTrancferStatus ) { @@ -2585,11 +2586,11 @@ location.iCellId = iLastLocInfo.iCellId; TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteGpdsRadioActivityInd, location.iAreaKnown = %d.", location.iAreaKnown); -OstTrace1( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;location.iAreaKnown=%d", location.iAreaKnown ); +OstTrace1( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND_TD, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;location.iAreaKnown=%d", location.iAreaKnown ); TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteGpdsRadioActivityInd, location.iLocationAreaCode = %d.", location.iLocationAreaCode); -OstTrace1( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;location.iLocationAreaCode=%d", location.iLocationAreaCode ); +OstTrace1( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND_TD, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;location.iLocationAreaCode=%d", location.iLocationAreaCode ); TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteGpdsRadioActivityInd, location.iCellId = %d.", location.iCellId); -OstTrace1( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;location.iCellId=%d", location.iCellId ); +OstTrace1( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND_TD, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;location.iCellId=%d", location.iCellId ); CMmDataPackage dataPackage; dataPackage.PackData( &iLastNWInfo, &location ); @@ -2613,11 +2614,11 @@ // No else TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteGpdsRadioActivityInd, iLastLocInfo.iAreaKnown = %d.", iLastLocInfo.iAreaKnown); -OstTrace1( TRACE_NORMAL, DUP5_CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;iLastLocInfo.iAreaKnown=%d", iLastLocInfo.iAreaKnown ); +OstTrace1( TRACE_NORMAL, DUP5_CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND_TD, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;iLastLocInfo.iAreaKnown=%d", iLastLocInfo.iAreaKnown ); TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteGpdsRadioActivityInd, iLastLocInfo.iLocationAreaCode = %d.", iLastLocInfo.iLocationAreaCode); -OstTrace1( TRACE_NORMAL, DUP6_CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;iLastLocInfo.iLocationAreaCode=%d", iLastLocInfo.iLocationAreaCode ); +OstTrace1( TRACE_NORMAL, DUP6_CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND_TD, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;iLastLocInfo.iLocationAreaCode=%d", iLastLocInfo.iLocationAreaCode ); TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteGpdsRadioActivityInd, iLastLocInfo.iCellId = %d.", iLastLocInfo.iCellId); -OstTrace1( TRACE_NORMAL, DUP7_CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;iLastLocInfo.iCellId=%d", iLastLocInfo.iCellId ); +OstTrace1( TRACE_NORMAL, DUP7_CMMNETMESSHANDLER_COMPLETEGPDSRADIOACTIVITYIND_TD, "CMmNetMessHandler::CompleteGpdsRadioActivityInd;iLastLocInfo.iCellId=%d", iLastLocInfo.iCellId ); } // ----------------------------------------------------------------------------- @@ -2628,14 +2629,14 @@ void CMmNetMessHandler::CompleteMobilePhoneGetHomeNetwork() { TFLOGSTRING("TSY: CMmNetMessHandler::CompleteMobilePhoneGetHomeNetwork"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_COMPLETEMOBILEPHONEGETHOMENETWORK, "CMmNetMessHandler::CompleteMobilePhoneGetHomeNetwork" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_COMPLETEMOBILEPHONEGETHOMENETWORK_TD, "CMmNetMessHandler::CompleteMobilePhoneGetHomeNetwork" ); TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteMobilePhoneGetHomeNetwork - Operator display tag: %S", &iHomeInfo.iDisplayTag); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_COMPLETEMOBILEPHONEGETHOMENETWORK, "CMmNetMessHandler::CompleteMobilePhoneGetHomeNetwork;Operator display tag=%S", iHomeInfo.iDisplayTag ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_COMPLETEMOBILEPHONEGETHOMENETWORK_TD, "CMmNetMessHandler::CompleteMobilePhoneGetHomeNetwork;Operator display tag=%S", iHomeInfo.iDisplayTag ); TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteMobilePhoneGetHomeNetwork - Operator short name: %S", &iHomeInfo.iShortName); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_COMPLETEMOBILEPHONEGETHOMENETWORK, "CMmNetMessHandler::CompleteMobilePhoneGetHomeNetwork;Operator short name=%S", iHomeInfo.iShortName ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_COMPLETEMOBILEPHONEGETHOMENETWORK_TD, "CMmNetMessHandler::CompleteMobilePhoneGetHomeNetwork;Operator short name=%S", iHomeInfo.iShortName ); TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteMobilePhoneGetHomeNetwork - Operator long name: %S", &iHomeInfo.iLongName); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_COMPLETEMOBILEPHONEGETHOMENETWORK, "CMmNetMessHandler::CompleteMobilePhoneGetHomeNetwork;Operator long name=%S", iHomeInfo.iLongName ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_COMPLETEMOBILEPHONEGETHOMENETWORK_TD, "CMmNetMessHandler::CompleteMobilePhoneGetHomeNetwork;Operator long name=%S", iHomeInfo.iLongName ); // Pack the data CMmDataPackage package; @@ -2664,7 +2665,7 @@ TUint sbStartOffSet( 0 ); TFLOGSTRING("TSY: CMmNetMessHandler::FindOperatorInfoSubBlock"); - OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_FINDOPERATORINFOSUBBLOCK, "CMmNetMessHandler::FindOperatorInfoSubBlock" ); + OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_FINDOPERATORINFOSUBBLOCK_TD, "CMmNetMessHandler::FindOperatorInfoSubBlock" ); TInt ret( CalculateNetworkInformationSbStartOffset( aIsiMessage, sbStartOffSet ) ); @@ -2679,7 +2680,7 @@ sbStartOffSet ); if ( KErrNone != ret ) { // look for NET_MODEM_GSM_REG_INFO subblock - OstTrace0( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_FINDOPERATORINFOSUBBLOCK, "CMmNetMessHandler::FindOperatorInfoSubBlock - NET_MODEM_CURRENT_CELL_INFO NOT FOUND" ); + OstTrace0( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_FINDOPERATORINFOSUBBLOCK_TD, "CMmNetMessHandler::FindOperatorInfoSubBlock - NET_MODEM_CURRENT_CELL_INFO NOT FOUND" ); TFLOGSTRING("TSY: CMmNetMessHandler::FindOperatorInfoSubBlock - NET_MODEM_CURRENT_CELL_INFO NOT FOUND"); ret = aIsiMessage.FindSubBlockOffsetById( ISI_HEADER_SIZE + sbStartOffSet, @@ -2693,7 +2694,7 @@ } else { - OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_FINDOPERATORINFOSUBBLOCK, "CMmNetMessHandler::FindOperatorInfoSubBlock - NOTHING FOUND!" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_FINDOPERATORINFOSUBBLOCK_TD, "CMmNetMessHandler::FindOperatorInfoSubBlock - NOTHING FOUND!" ); TFLOGSTRING("TSY: CMmNetMessHandler::FindOperatorInfoSubBlock - NOTHING FOUND!"); } } @@ -2715,7 +2716,7 @@ ) const { TFLOGSTRING("TSY: CMmNetMessHandler::ExtractNetworkRegistrationStatus"); - OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_EXTRACTNETWORKREGISTRATIONSTATUS, "CMmNetMessHandler::ExtractNetworkRegistrationStatus" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_EXTRACTNETWORKREGISTRATIONSTATUS_TD, "CMmNetMessHandler::ExtractNetworkRegistrationStatus" ); TUint sbStartOffSet( 0 ); TInt ret( CalculateNetworkInformationSbStartOffset( @@ -2735,7 +2736,7 @@ aRegistrationStatus = aIsiMessage.Get8bit( sbStartOffSet + NET_MODEM_REG_INFO_COMMON_OFFSET_REGISTRATIONSTATUS ); TFLOGSTRING2("TSY: CMmNetMessHandler::ExtractNetworkRegistrationStatus;registrationStatus=%d", aRegistrationStatus); - OstTraceExt1( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_EXTRACTNETWORKREGISTRATIONSTATUS, "CMmNetMessHandler::ExtractNetworkRegistrationStatus;registrationStatus=%hhu", aRegistrationStatus ); + OstTraceExt1( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_EXTRACTNETWORKREGISTRATIONSTATUS_TD, "CMmNetMessHandler::ExtractNetworkRegistrationStatus;registrationStatus=%hhu", aRegistrationStatus ); // patch registration status if this is SIM-card if ( 0 < iHplmn.Length() ) { @@ -2745,20 +2746,20 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::ExtractNetworkRegistrationStatus; NET_REG_STATUS_ROAM --> NET_REG_STATUS_HOME"); - OstTrace0( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_EXTRACTNETWORKREGISTRATIONSTATUS, "CMmNetMessHandler::ExtractNetworkRegistrationStatus; NET_REG_STATUS_ROAM --> NET_REG_STATUS_HOME" ); + OstTrace0( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_EXTRACTNETWORKREGISTRATIONSTATUS_TD, "CMmNetMessHandler::ExtractNetworkRegistrationStatus; NET_REG_STATUS_ROAM --> NET_REG_STATUS_HOME" ); aRegistrationStatus = NET_REG_STATUS_HOME; } } else { TFLOGSTRING("TSY: CMmNetMessHandler::ExtractNetworkRegistrationStatus; cant patch, HPLMN is empty"); - OstTrace0( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_EXTRACTNETWORKREGISTRATIONSTATUS, "CMmNetMessHandler::ExtractNetworkRegistrationStatus - cant patch, HPLMN is empty" ); + OstTrace0( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_EXTRACTNETWORKREGISTRATIONSTATUS_TD, "CMmNetMessHandler::ExtractNetworkRegistrationStatus - cant patch, HPLMN is empty" ); } } else { TFLOGSTRING("TSY: CMmNetMessHandler::ExtractNetworkRegistrationStatus; NET_MODEM_REG_INFO_COMMON not found"); - OstTrace0( TRACE_NORMAL, DUP5_CMMNETMESSHANDLER_EXTRACTNETWORKREGISTRATIONSTATUS, "CMmNetMessHandler::ExtractNetworkRegistrationStatus; NET_MODEM_REG_INFO_COMMON not found" ); + OstTrace0( TRACE_NORMAL, DUP5_CMMNETMESSHANDLER_EXTRACTNETWORKREGISTRATIONSTATUS_TD, "CMmNetMessHandler::ExtractNetworkRegistrationStatus; NET_MODEM_REG_INFO_COMMON not found" ); } return ret; } @@ -2776,7 +2777,7 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_COMPLETEMOBILEPHONENOTIFYCURRENTNETWORKCHANGE, "CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_COMPLETEMOBILEPHONENOTIFYCURRENTNETWORKCHANGE_TD, "CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange" ); // Assistant for packaging. CMmDataPackage dataPackage; @@ -2800,9 +2801,9 @@ TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - location.iAreaKnown = %d", location.iAreaKnown); TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - location.iLocationAreaCode = %d", location.iLocationAreaCode); TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - location.iCellId = %d", location.iCellId); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_COMPLETEMOBILEPHONENOTIFYCURRENTNETWORKCHANGE, "CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - location.iAreaKnown=%hhu", location.iAreaKnown ); -OstTrace1( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_COMPLETEMOBILEPHONENOTIFYCURRENTNETWORKCHANGE, "CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - location.iLocationAreaCode=%u", location.iLocationAreaCode ); -OstTrace1( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_COMPLETEMOBILEPHONENOTIFYCURRENTNETWORKCHANGE, "CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - location.iCellId=%u", location.iCellId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_COMPLETEMOBILEPHONENOTIFYCURRENTNETWORKCHANGE_TD, "CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - location.iAreaKnown=%hhu", location.iAreaKnown ); +OstTrace1( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_COMPLETEMOBILEPHONENOTIFYCURRENTNETWORKCHANGE_TD, "CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - location.iLocationAreaCode=%u", location.iLocationAreaCode ); +OstTrace1( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_COMPLETEMOBILEPHONENOTIFYCURRENTNETWORKCHANGE_TD, "CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - location.iCellId=%u", location.iCellId ); dataPackage.PackData( &iLastNWInfo, &location ); } @@ -2811,9 +2812,9 @@ TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - iLastLocInfo.iAreaKnown = %d", iLastLocInfo.iAreaKnown); TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - iLastLocInfo.iLocationAreaCode = %d", iLastLocInfo.iLocationAreaCode); TFLOGSTRING2("TSY: CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - iLastLocInfo.iCellId = %d", iLastLocInfo.iCellId); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_COMPLETEMOBILEPHONENOTIFYCURRENTNETWORKCHANGE, "CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - iLastLocInfo.iAreaKnown=%hhu", iLastLocInfo.iAreaKnown ); -OstTrace1( TRACE_NORMAL, DUP5_CMMNETMESSHANDLER_COMPLETEMOBILEPHONENOTIFYCURRENTNETWORKCHANGE, "CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - iLastLocInfo.iLocationAreaCode=%u", iLastLocInfo.iLocationAreaCode ); -OstTrace1( TRACE_NORMAL, DUP7_CMMNETMESSHANDLER_COMPLETEMOBILEPHONENOTIFYCURRENTNETWORKCHANGE, "CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - iLastLocInfo.iCellId=%u", iLastLocInfo.iCellId ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_COMPLETEMOBILEPHONENOTIFYCURRENTNETWORKCHANGE_TD, "CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - iLastLocInfo.iAreaKnown=%hhu", iLastLocInfo.iAreaKnown ); +OstTrace1( TRACE_NORMAL, DUP5_CMMNETMESSHANDLER_COMPLETEMOBILEPHONENOTIFYCURRENTNETWORKCHANGE_TD, "CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - iLastLocInfo.iLocationAreaCode=%u", iLastLocInfo.iLocationAreaCode ); +OstTrace1( TRACE_NORMAL, DUP7_CMMNETMESSHANDLER_COMPLETEMOBILEPHONENOTIFYCURRENTNETWORKCHANGE_TD, "CMmNetMessHandler::CompleteMobilePhoneNotifyCurrentNetworkChange - iLastLocInfo.iCellId=%u", iLastLocInfo.iCellId ); // Pack the data for sending to the manager. dataPackage.PackData( &iLastNWInfo, &iLastLocInfo ); @@ -2845,7 +2846,7 @@ ) { TFLOGSTRING("TSY: CMmNetMessHandler::QueueNetModemRegStatusMessagesL"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_QUEUENETMODEMREGSTATUSMESSAGESL, "CMmNetMessHandler::QueueNetModemRegStatusMessagesL" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_QUEUENETMODEMREGSTATUSMESSAGESL_TD, "CMmNetMessHandler::QueueNetModemRegStatusMessagesL" ); // Make a copy of received message. Allocate heap memory. // Can leave if out of mem. @@ -2879,7 +2880,7 @@ void CMmNetMessHandler::StartHandlingNetModemRegStatusMessages() { TFLOGSTRING("TSY: CMmNetMessHandler::StartHandlingNetModemRegStatusMessages"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_STARTHANDLINGNETMODEMREGSTATUSMESSAGES, "CMmNetMessHandler::StartHandlingNetModemRegStatusMessages" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_STARTHANDLINGNETMODEMREGSTATUSMESSAGES_TD, "CMmNetMessHandler::StartHandlingNetModemRegStatusMessages" ); // Continue handling if there is messages in queue // and handling not already ongoing. @@ -2887,7 +2888,7 @@ && 0 < iNetMessageQueue.Count() ) { TFLOGSTRING("TSY: CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - Start handling next queued message"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_STARTHANDLINGNETMODEMREGSTATUSMESSAGES, "CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - Start handling next queued message" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_STARTHANDLINGNETMODEMREGSTATUSMESSAGES_TD, "CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - Start handling next queued message" ); // Set flag ON as message handling start. iNetMessageHandlingOngoing = ETrue; @@ -2913,9 +2914,9 @@ if ( NET_MODEM_REG_STATUS_IND == messageId ) { TFLOGSTRING("TSY: CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_MODEM_REG_STATUS_IND"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_STARTHANDLINGNETMODEMREGSTATUSMESSAGES, "CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_MODEM_REG_STATUS_IND" ); - - // destroy previous ind and store current NET_MODEM_REG_STATUS_IND +OstTrace0( TRACE_NORMAL, DUP2_CMMNETMESSHANDLER_STARTHANDLINGNETMODEMREGSTATUSMESSAGES_TD, "CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_MODEM_REG_STATUS_IND" ); + + // destroy previous ind and store current NET_MODEM_REG_STATUS_IND // for later use delete iLastNetModemRegStatusInd; iLastNetModemRegStatusInd = tempHBuf; @@ -2926,7 +2927,7 @@ else if ( NET_MODEM_REG_STATUS_GET_RESP == messageId ) { TFLOGSTRING("TSY: CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_MODEM_REG_STATUS_GET_RESP"); -OstTrace0( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_STARTHANDLINGNETMODEMREGSTATUSMESSAGES, "CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_MODEM_REG_STATUS_GET_RESP" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMNETMESSHANDLER_STARTHANDLINGNETMODEMREGSTATUSMESSAGES_TD, "CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_MODEM_REG_STATUS_GET_RESP" ); // Get the success code. TUint8 successCode( isimessage.Get8bit( @@ -2949,7 +2950,7 @@ successCode ) ); TFLOGSTRING2("TSY: CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_MODEM_REG_STATUS_GET_RESP - Error value: %d", error); -OstTrace1( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_STARTHANDLINGNETMODEMREGSTATUSMESSAGES, "CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_MODEM_REG_STATUS_GET_RESP - Error value=%d", error ); +OstTrace1( TRACE_NORMAL, DUP4_CMMNETMESSHANDLER_STARTHANDLINGNETMODEMREGSTATUSMESSAGES_TD, "CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_MODEM_REG_STATUS_GET_RESP - Error value=%d", error ); // Initialize default return values to ECustomGetOperatorNameIPC // complete. @@ -2980,7 +2981,7 @@ else if ( NET_SET_RESP == messageId ) { TFLOGSTRING("TSY: CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_SET_RESP"); -OstTrace0( TRACE_NORMAL, DUP5_CMMNETMESSHANDLER_STARTHANDLINGNETMODEMREGSTATUSMESSAGES, "CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_SET_RESP" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMNETMESSHANDLER_STARTHANDLINGNETMODEMREGSTATUSMESSAGES_TD, "CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_SET_RESP" ); // Check if the NW selection was done ok. TUint8 successCode( isimessage.Get8bit( @@ -3017,7 +3018,7 @@ else { TFLOGSTRING2("TSY: CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_SET_RESP - Error cause value: %d", successCode); -OstTraceExt1( TRACE_NORMAL, DUP6_CMMNETMESSHANDLER_STARTHANDLINGNETMODEMREGSTATUSMESSAGES, "CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_SET_RESP - Error cause value=%hhu", successCode ); +OstTraceExt1( TRACE_NORMAL, DUP6_CMMNETMESSHANDLER_STARTHANDLINGNETMODEMREGSTATUSMESSAGES_TD, "CMmNetMessHandler::StartHandlingNetModemRegStatusMessages - NET_SET_RESP - Error cause value=%hhu", successCode ); // SuccessCode is not ok, check also for GSM specific error code. @@ -3085,7 +3086,7 @@ void CMmNetMessHandler::ContinueHandlingNetModemRegStatusMessages() { TFLOGSTRING("TSY: CMmNetMessHandler::ContinueHandlingNetModemRegStatusMessages - Continue handling queued messages"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_CONTINUEHANDLINGNETMODEMREGSTATUSMESSAGES, "CMmNetMessHandler::ContinueHandlingNetModemRegStatusMessages - Continue handling queued messages" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_CONTINUEHANDLINGNETMODEMREGSTATUSMESSAGES_TD, "CMmNetMessHandler::ContinueHandlingNetModemRegStatusMessages - Continue handling queued messages" ); // Message handling done. // Reset flag to OFF as message handling is finished. @@ -3104,7 +3105,7 @@ void CMmNetMessHandler::InitializeOnsAndOplReading() { TFLOGSTRING("TSY: CMmNetMessHandler::InitializeOnsAndOplReading"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_INITIALIZEONSANDOPLREADING, "CMmNetMessHandler::InitializeOnsAndOplReading" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_INITIALIZEONSANDOPLREADING_TD, "CMmNetMessHandler::InitializeOnsAndOplReading" ); // Set iNetMessageHandlingOngoing flag to ETrue. iNetMessageHandlingOngoing = ETrue; @@ -3124,7 +3125,7 @@ CMmMessageRouter* CMmNetMessHandler::GetMessageRouter() { TFLOGSTRING("TSY: CMmNetMessHandler::GetMessageRouter"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_GETMESSAGEROUTER, "CMmNetMessHandler::GetMessageRouter" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_GETMESSAGEROUTER_TD, "CMmNetMessHandler::GetMessageRouter" ); return iMessageRouter; } @@ -3136,7 +3137,7 @@ CMmPhoNetSender* CMmNetMessHandler::GetPhoNetSender() { TFLOGSTRING("TSY: CMmNetMessHandler::GetPhoNetSender"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_GETPHONETSENDER, "CMmNetMessHandler::GetPhoNetSender" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_GETPHONETSENDER_TD, "CMmNetMessHandler::GetPhoNetSender" ); return iPhoNetSender; } @@ -3151,7 +3152,7 @@ TUint8& aRegistrationStatus ) const { - OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_EXTRACTNETWORKREGISTRATIONSTATUS, "CMmNetMessHandler::ExtractNetworkRegistrationStatus" ); + OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_EXTRACTNETWORKREGISTRATIONSTATUS_TD, "CMmNetMessHandler::ExtractNetworkRegistrationStatus" ); TFLOGSTRING("TSY: CMmNetMessHandler::ExtractNetworkRegistrationStatus"); TUint sbStartOffSet( 0 ); @@ -3190,7 +3191,7 @@ CMmNetOperatorNameHandler* CMmNetMessHandler::GetNetOperatorNameHandler() { TFLOGSTRING("TSY: CMmNetMessHandler::GetNetOperatorNameHandler"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_GETNETOPERATORNAMEHANDLER, "CMmNetMessHandler::GetNetOperatorNameHandler" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_GETNETOPERATORNAMEHANDLER_TD, "CMmNetMessHandler::GetNetOperatorNameHandler" ); return iNetOperatorNameHandler; } @@ -3203,7 +3204,7 @@ void CMmNetMessHandler::HandleLastNetModemRegStatusInd() { TFLOGSTRING("TSY: CMmNetMessHandler::HandleLastNetModemRegStatusInd"); -OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_HANDLELASTNETMODEMREGSTATUSIND, "CMmNetMessHandler::HandleLastNetModemRegStatusInd" ); +OstTrace0( TRACE_NORMAL, CMMNETMESSHANDLER_HANDLELASTNETMODEMREGSTATUSIND_TD, "CMmNetMessHandler::HandleLastNetModemRegStatusInd" ); TBool handlingNeeded( ETrue ); if( iNetMessageQueue.Count() ) @@ -3222,7 +3223,7 @@ NET_MODEM_REG_STATUS_GET_RESP == messageId ) { TFLOGSTRING("TSY: CMmNetMessHandler::HandleLastNetModemRegStatusInd: Similar messages already in queue, no need to handle last received ind"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_HANDLELASTNETMODEMREGSTATUSIND, "CMmNetMessHandler::HandleLastNetModemRegStatusInd:: Similar messages already in queue, no need to handle last received ind" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETMESSHANDLER_HANDLELASTNETMODEMREGSTATUSIND_TD, "CMmNetMessHandler::HandleLastNetModemRegStatusInd:: Similar messages already in queue, no need to handle last received ind" ); handlingNeeded = EFalse; break; } @@ -3253,7 +3254,7 @@ CMmNetMessHandler* aNetMessHandler ) { TFLOGSTRING("TSY: CDelayTimer::NewL"); -OstTrace0( TRACE_NORMAL, CDELAYTIMER_NEWL, "CDelayTimer::NewL" ); +OstTrace0( TRACE_NORMAL, CDELAYTIMER_NEWL_TD, "CDelayTimer::NewL" ); CDelayTimer* self = new( ELeave ) CDelayTimer(); @@ -3275,7 +3276,7 @@ CDelayTimer::CDelayTimer() : CTimer( CActive::EPriorityStandard ) { TFLOGSTRING("TSY: CDelayTimer::CDelayTimer"); -OstTrace0( TRACE_NORMAL, CDELAYTIMER_CDELAYTIMER, "CDelayTimer::CDelayTimer" ); +OstTrace0( TRACE_NORMAL, CDELAYTIMER_CDELAYTIMER_TD, "CDelayTimer::CDelayTimer" ); } // ----------------------------------------------------------------------------- @@ -3286,7 +3287,7 @@ void CDelayTimer::ConstructL() { TFLOGSTRING("TSY: CDelayTimer::ConstructL"); -OstTrace0( TRACE_NORMAL, CDELAYTIMER_CONSTRUCTL, "CDelayTimer::ConstructL" ); +OstTrace0( TRACE_NORMAL, CDELAYTIMER_CONSTRUCTL_TD, "CDelayTimer::ConstructL" ); iNewPacketTransferState = ETrue; @@ -3302,7 +3303,7 @@ CDelayTimer::~CDelayTimer() { TFLOGSTRING("TSY: CDelayTimer::~CDelayTimer"); -OstTrace0( TRACE_NORMAL, DUP1_CDELAYTIMER_CDELAYTIMER, "CDelayTimer::~CDelayTimer" ); +OstTrace0( TRACE_NORMAL, DUP1_CDELAYTIMER_CDELAYTIMER_TD, "CDelayTimer::~CDelayTimer" ); Cancel(); } @@ -3317,7 +3318,7 @@ if ( iNewPacketTransferState != aNewPacketTransferState ) { TFLOGSTRING("TSY: CDelayTimer::StartDelayTimer, Restart."); -OstTrace0( TRACE_NORMAL, CDELAYTIMER_STARTDELAYTIMER, "CDelayTimer::StartDelayTimer,Restart" ); +OstTrace0( TRACE_NORMAL, CDELAYTIMER_STARTDELAYTIMER_TD, "CDelayTimer::StartDelayTimer,Restart" ); Cancel(); iNewPacketTransferState = aNewPacketTransferState; After( aTimeOut ); @@ -3333,7 +3334,7 @@ void CDelayTimer::RunL() { TFLOGSTRING2("TSY: CDelayTimer::RunL, status = %d.", iStatus.Int()); -OstTrace1( TRACE_NORMAL, CDELAYTIMER_RUNL, "CDelayTimer::RunL;iStatus.Int=%d", iStatus.Int() ); +OstTrace1( TRACE_NORMAL, CDELAYTIMER_RUNL_TD, "CDelayTimer::RunL;iStatus.Int=%d", iStatus.Int() ); // Timer request has completed, so notify the timer's owner if ( iStatus == KErrNone ) @@ -3354,7 +3355,7 @@ void CDelayTimer::DoCancel() { TFLOGSTRING("TSY: CDelayTimer::DoCancel"); -OstTrace0( TRACE_NORMAL, CDELAYTIMER_DOCANCEL, "CDelayTimer::DoCancel" ); +OstTrace0( TRACE_NORMAL, CDELAYTIMER_DOCANCEL_TD, "CDelayTimer::DoCancel" ); CTimer::DoCancel(); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmnetoperatornamehandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmnetoperatornamehandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmnetoperatornamehandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -32,7 +32,7 @@ #include #include #include -//#include To be done in CPS +//#include #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE @@ -47,7 +47,7 @@ // CONSTANTS #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING -const TUint8 KNetTransId = 0x04; // TO BE DONE WITH INFO_PP_DATA_READ_REQ +const TUint8 KNetTransId = 0x04; #endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ const TUint8 KNetPadding = 0x00; @@ -82,11 +82,11 @@ const TUint32 KNitzPmmDataLength = 0x00000040; // NITZ data read offset values for PMM. const TUint32 KNitzPmmDataOffset = 0x00000000; -//const TUint8 KNitzPmmLongNameOffset = 0x04; To be done in CPS -//const TUint8 KNitzPmmShortNameOffset = 0x2C; To be done in CPS +//const TUint8 KNitzPmmLongNameOffset = 0x04; +//const TUint8 KNitzPmmShortNameOffset = 0x2C; // NITZ name lengths in 8bit buffers. -//const TUint8 KNitzPmmLongNamelength8Bit = 40; To be done in CPS -//const TUint8 KNitzPmmShortNameLength8Bit = 20; To be done in CPS +//const TUint8 KNitzPmmLongNamelength8Bit = 40; +//const TUint8 KNitzPmmShortNameLength8Bit = 20; // MACROS //None @@ -137,7 +137,7 @@ CMmNetOperatorNameHandler::CMmNetOperatorNameHandler() { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::CMmNetOperatorNameHandler()"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_CMMNETOPERATORNAMEHANDLER, "CMmNetOperatorNameHandler::CMmNetOperatorNameHandler" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_CMMNETOPERATORNAMEHANDLER_TD, "CMmNetOperatorNameHandler::CMmNetOperatorNameHandler" ); } // ----------------------------------------------------------------------------- @@ -152,7 +152,7 @@ ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::NewL"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_NEWL, "CMmNetOperatorNameHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_NEWL_TD, "CMmNetOperatorNameHandler::NewL" ); CMmNetOperatorNameHandler* netOperatorNameHandler = new ( ELeave ) CMmNetOperatorNameHandler(); @@ -176,7 +176,7 @@ void CMmNetOperatorNameHandler::ConstructL() { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::ConstructL()"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_CONSTRUCTL, "CMmNetOperatorNameHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_CONSTRUCTL_TD, "CMmNetOperatorNameHandler::ConstructL" ); // Initialization of NITZ data. iNitzName.iMCC = 0; @@ -230,7 +230,7 @@ #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING iInfoPpEonsFeatValue = 0xFF; #endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - // TO BE DONE WITH INFO_PP_DATA_READ_RESP + iInfoPpEonsFeatValue = INFO_PP_EONS_FEAT_0; // Read INFO_PP_EONS_FEAT PP bit value. @@ -248,7 +248,7 @@ CMmNetOperatorNameHandler::~CMmNetOperatorNameHandler() { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::~CMmNetOperatorNameHandler()"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_CMMNETOPERATORNAMEHANDLER, "CMmNetOperatorNameHandler::~CMmNetOperatorNameHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_CMMNETOPERATORNAMEHANDLER_TD, "CMmNetOperatorNameHandler::~CMmNetOperatorNameHandler" ); // Closes the array and frees all memory allocated to the array. iOperatorPlmnListTable.Close(); @@ -267,7 +267,7 @@ ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::NetNitzNameInd"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND, "CMmNetOperatorNameHandler::NetNitzNameInd" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND_TD, "CMmNetOperatorNameHandler::NetNitzNameInd" ); // Reset NITZ data. iNitzName.iMCC = 0; @@ -314,7 +314,7 @@ if ( KErrNone == retValue ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::NetNitzNameInd - NET_FULL_NITZ_NAME sub block"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND, "CMmNetOperatorNameHandler::NetNitzNameInd - NET_FULL_NITZ_NAME sub block" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND_TD, "CMmNetOperatorNameHandler::NetNitzNameInd - NET_FULL_NITZ_NAME sub block" ); // Temporaly buffer for Long NITZ name. TBuf longNitzName; @@ -352,7 +352,7 @@ if ( KErrNone == retValue ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::NetNitzNameInd - NET_SHORT_NITZ_NAME sub block"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND, "CMmNetOperatorNameHandler::NetNitzNameInd - NET_SHORT_NITZ_NAME sub block" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND_TD, "CMmNetOperatorNameHandler::NetNitzNameInd - NET_SHORT_NITZ_NAME sub block" ); // Temporaly buffer for Short NITZ name. TBuf shortNitzName; @@ -386,12 +386,12 @@ TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::NetNitzNameInd - iNitzName.iShortName: %S", &iNitzName.iShortName); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::NetNitzNameInd - iCustomNitzLongNameString: %S", &iCustomNitzLongNameString); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::NetNitzNameInd - iCustomNitzShortNameString: %S", &iCustomNitzShortNameString); -OstTrace1( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND, "CMmNetOperatorNameHandler::NetNitzNameInd - iNitzName.iMCC=%u", iNitzName.iMCC ); -OstTrace1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND, "CMmNetOperatorNameHandler::NetNitzNameInd - iNitzName.iMNC=%u", iNitzName.iMNC ); -OstTraceExt1( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND, "CMmNetOperatorNameHandler::NetNitzNameInd - iNitzName.iLongName=%S", iNitzName.iLongName ); -OstTraceExt1( TRACE_NORMAL, DUP6_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND, "CMmNetOperatorNameHandler::NetNitzNameInd - iNitzName.iShortName=%S", iNitzName.iShortName ); -OstTraceExt1( TRACE_NORMAL, DUP7_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND, "CMmNetOperatorNameHandler::NetNitzNameInd - iCustomNitzLongNameString=%S", iCustomNitzLongNameString ); -OstTraceExt1( TRACE_NORMAL, DUP8_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND, "CMmNetOperatorNameHandler::NetNitzNameInd - iCustomNitzShortNameString=%S", iCustomNitzShortNameString ); +OstTrace1( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND_TD, "CMmNetOperatorNameHandler::NetNitzNameInd - iNitzName.iMCC=%u", iNitzName.iMCC ); +OstTrace1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND_TD, "CMmNetOperatorNameHandler::NetNitzNameInd - iNitzName.iMNC=%u", iNitzName.iMNC ); +OstTraceExt1( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND_TD, "CMmNetOperatorNameHandler::NetNitzNameInd - iNitzName.iLongName=%S", iNitzName.iLongName ); +OstTraceExt1( TRACE_NORMAL, DUP6_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND_TD, "CMmNetOperatorNameHandler::NetNitzNameInd - iNitzName.iShortName=%S", iNitzName.iShortName ); +OstTraceExt1( TRACE_NORMAL, DUP7_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND_TD, "CMmNetOperatorNameHandler::NetNitzNameInd - iCustomNitzLongNameString=%S", iCustomNitzLongNameString ); +OstTraceExt1( TRACE_NORMAL, DUP8_CMMNETOPERATORNAMEHANDLER_NETNITZNAMEIND_TD, "CMmNetOperatorNameHandler::NetNitzNameInd - iCustomNitzShortNameString=%S", iCustomNitzShortNameString ); // Compare NITZ name got in NET_NITZ_NAME_IND to stored values in PMM. CompareNitzNameToPmmValues(); @@ -415,7 +415,7 @@ ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::ConvertOperatorName"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_CONVERTOPERATORNAME, "CMmNetOperatorNameHandler::ConvertOperatorName" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_CONVERTOPERATORNAME_TD, "CMmNetOperatorNameHandler::ConvertOperatorName" ); // Network Name information element. // See 3GPP 24.008 figure 10.5.80 and table 10.5.94. @@ -497,7 +497,7 @@ if ( countryInitialsNeeded ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::ConvertOperatorName - Country's Initials needed"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_CONVERTOPERATORNAME, "CMmNetOperatorNameHandler::ConvertOperatorName - Country's Initials needed" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_CONVERTOPERATORNAME_TD, "CMmNetOperatorNameHandler::ConvertOperatorName - Country's Initials needed" ); // Initialize ret value. TInt ret( KErrNotFound ); @@ -520,7 +520,7 @@ if ( EGSMDefaultAlphabetCoding == codingSchemeInUse ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::ConvertOperatorName - 7-Bit coding used"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_CONVERTOPERATORNAME, "CMmNetOperatorNameHandler::ConvertOperatorName - 7-Bit coding used" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_CONVERTOPERATORNAME_TD, "CMmNetOperatorNameHandler::ConvertOperatorName - 7-Bit coding used" ); // Used coding is GSM 7-bit Default alphabet. // // Calculate correct value of GSM 7-bit characters. @@ -554,7 +554,7 @@ else if ( EUCS2Coding == codingSchemeInUse ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::ConvertOperatorName - UCS2 coding used"); -OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_CONVERTOPERATORNAME, "CMmNetOperatorNameHandler::ConvertOperatorName - UCS2 coding used" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_CONVERTOPERATORNAME_TD, "CMmNetOperatorNameHandler::ConvertOperatorName - UCS2 coding used" ); // Used coding is UCS2(16-bit). // // Append operator name Text String. @@ -567,7 +567,7 @@ } } TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::ConvertOperatorName - Converted Operator Name: %S", &aOperatorName); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_CONVERTOPERATORNAME, "CMmNetOperatorNameHandler::ConvertOperatorName - Converted Operator Name=%S", aOperatorName ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_CONVERTOPERATORNAME_TD, "CMmNetOperatorNameHandler::ConvertOperatorName - Converted Operator Name=%S", aOperatorName ); } // ----------------------------------------------------------------------------- @@ -585,7 +585,7 @@ ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetOperatorName"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName" ); // Buffer for Display tag. TBuf tempDisplayTag; @@ -621,10 +621,10 @@ TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::GetOperatorName - Current MNC: %d", tempMNC); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::GetOperatorName - Current LAC: %d", lac); TFLOGSTRING4("TSY: CMmNetOperatorNameHandler::GetOperatorName - Operator Code BCD string: %02X %02X %02X", aOperatorCode[0], aOperatorCode[1], aOperatorCode[2]); -OstTrace1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName - Current MCC=%u", tempMCC ); -OstTrace1( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName - Current MNC=%u", tempMNC ); -OstTrace1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName - Current LAC=%u", lac ); -OstTraceExt3( TRACE_NORMAL, DUP10_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName - Operator Code BCD string=%hhx %hhx %hhx", aOperatorCode[0], aOperatorCode[1], aOperatorCode[2] ); +OstTrace1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName - Current MCC=%u", tempMCC ); +OstTrace1( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName - Current MNC=%u", tempMNC ); +OstTrace1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName - Current LAC=%u", lac ); +OstTraceExt3( TRACE_NORMAL, DUP10_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName - Operator Code BCD string=%hhx %hhx %hhx", aOperatorCode[0], aOperatorCode[1], aOperatorCode[2] ); // Starting to get Network name in priority order. // @@ -646,7 +646,7 @@ if ( aCampedInHplmn ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetOperatorName - Registered to HPLMN"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName - Registered to HPLMN" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName - Registered to HPLMN" ); // Handle PP bit values. tempPnnIdentifier = HandlePnnRecordWithPPbitValueInHplmn( aOperatorCode, @@ -668,7 +668,7 @@ if ( 0 < iEonsName.iLongName.Length() ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetOperatorName - PNN Record is read earlier and EONS names exist"); -OstTrace0( TRACE_NORMAL, DUP13_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName - PNN Record is read earlier and EONS names exist" ); +OstTrace0( TRACE_NORMAL, DUP13_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName - PNN Record is read earlier and EONS names exist" ); CopyEonsName( aNetworkName ); // EONS name handled. No need to check NITZ. @@ -678,7 +678,7 @@ else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetOperatorName - PNN Record not read earlier"); -OstTrace0( TRACE_NORMAL, DUP6_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName - PNN Record not read earlier" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName - PNN Record not read earlier" ); // Setting iFromGetOperatorName flag to ETrue as // SimOperatorReqReadPnn request is sended from // GetOperatorName method. @@ -705,12 +705,12 @@ else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetOperatorName - Not registered to HPLMN"); -OstTrace0( TRACE_NORMAL, DUP7_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName - Not registered to HPLMN" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName - Not registered to HPLMN" ); // OPL rules are read and list available. if ( iOplRulesRead && iOplListAvailable ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetOperatorName - OPL Rules handling"); -OstTrace0( TRACE_NORMAL, DUP8_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName - OPL Rules handling" ); +OstTrace0( TRACE_NORMAL, DUP8_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName - OPL Rules handling" ); // EONS name consists of OPL rule and PNN record. One OPL rule consist // of PLMN code, LAC range and PNN record number. OPL rules are read // from SIM when EMmTsyBootNotifySimStatusReadyIPC is completed and @@ -725,7 +725,7 @@ if ( iOplRuleMatch ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetOperatorName - OPL Rules match"); -OstTrace0( TRACE_NORMAL, DUP9_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName - OPL Rules match" ); +OstTrace0( TRACE_NORMAL, DUP9_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName - OPL Rules match" ); // OPL rule exist for current network. // // If matching PNN record is not stored in internal memory @@ -741,7 +741,7 @@ if ( 0 < iEonsName.iLongName.Length() ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetOperatorName - PNN Record is read earlier and EONS names exist"); -OstTrace0( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName - PNN Record is read earlier and EONS names exist" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName - PNN Record is read earlier and EONS names exist" ); CopyEonsName( aNetworkName ); // EONS name handled. No need to check NITZ. @@ -751,7 +751,7 @@ else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetOperatorName - PNN Record not read earlier"); -OstTrace0( TRACE_NORMAL, DUP11_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName - PNN Record not read earlier" ); +OstTrace0( TRACE_NORMAL, DUP11_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName - PNN Record not read earlier" ); // Setting iFromGetOperatorName flag to ETrue as // SimOperatorReqReadPnn request is sended from // GetOperatorName method. @@ -781,7 +781,7 @@ if ( checkNitzName ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetOperatorName - NITZ name is needed to check"); -OstTrace0( TRACE_NORMAL, DUP12_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName - NITZ name is needed to check" ); +OstTrace0( TRACE_NORMAL, DUP12_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName - NITZ name is needed to check" ); // Check if NITZ long/short name exist and NITZ data will match for // current Country and Network codes. NitzNameChecker( tempMCC, tempMNC, aNetworkName ); @@ -797,11 +797,11 @@ TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::GetOperatorName, RMmCustomAPI::TOperatorNameInfo, Name: %S", &iOperNameInfo.iName); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::GetOperatorName, RMmCustomAPI::TOperatorNameInfo, Type: %d", iOperNameInfo.iType); -OstTrace0( TRACE_NORMAL, DUP14_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName - Completing" ); -OstTraceExt1( TRACE_NORMAL, DUP15_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName, Operator display tag=%S", aNetworkName.iDisplayTag ); -OstTraceExt1( TRACE_NORMAL, DUP16_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName, Operator long name=%S", aNetworkName.iLongName ); -OstTraceExt1( TRACE_NORMAL, DUP17_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName, Operator short name=%S", aNetworkName.iShortName ); -OstTraceExt2( TRACE_NORMAL, DUP21_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME, "CMmNetOperatorNameHandler::GetOperatorName, RMmCustomAPI::TOperatorNameInfo - Name=%S;Type=%hhu", iOperNameInfo.iName, iOperNameInfo.iType ); +OstTrace0( TRACE_NORMAL, DUP14_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName - Completing" ); +OstTraceExt1( TRACE_NORMAL, DUP15_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName, Operator display tag=%S", aNetworkName.iDisplayTag ); +OstTraceExt1( TRACE_NORMAL, DUP16_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName, Operator long name=%S", aNetworkName.iLongName ); +OstTraceExt1( TRACE_NORMAL, DUP17_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName, Operator short name=%S", aNetworkName.iShortName ); +OstTraceExt2( TRACE_NORMAL, DUP21_CMMNETOPERATORNAMEHANDLER_GETOPERATORNAME_TD, "CMmNetOperatorNameHandler::GetOperatorName, RMmCustomAPI::TOperatorNameInfo - Name=%S;Type=%hhu", iOperNameInfo.iName, iOperNameInfo.iType ); // Complete ECustomGetOperatorNameIPC. // Packed parameter: a RMmCustomAPI::TOperatorNameInfo. @@ -836,7 +836,7 @@ ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_HANDLEMANUALSEARCHSUCCESSCASEL, "CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_HANDLEMANUALSEARCHSUCCESSCASEL_TD, "CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL" ); TUint8 nbOfSubBlocks( aIsiMessage.Get8bit( ISI_HEADER_SIZE + NET_MODEM_AVAILABLE_GET_RESP_OFFSET_SUBBLOCKCOUNT ) ); @@ -846,7 +846,7 @@ TUint8 amountOfNetworks( nbOfSubBlocks / 2 ); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL - Found networks: %d", amountOfNetworks); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_HANDLEMANUALSEARCHSUCCESSCASEL, "CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL - Found networks=%hhu", amountOfNetworks ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_HANDLEMANUALSEARCHSUCCESSCASEL_TD, "CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL - Found networks=%hhu", amountOfNetworks ); // Reset manual network search list array that it can be reused. iManualSearchNetworkList.Reset(); @@ -872,14 +872,13 @@ RArray networkStatusList; TUint sbStartOffSet( 0 ); - TUint8 subBlockIndex( 1 ); // Initialize value for data append handled successfully. TBool handlingSuccessful( ETrue ); // Get all NET_MODEM_AVAIL_NETWORK_INFO_COMMON subblocks first, // keep data in the networkStatusList. - for ( TUint8 i = 0; i < amountOfNetworks; i++ ) + for ( TUint8 i = 1; i <= nbOfSubBlocks; i++ ) { // Helper variable. RMobilePhone::TMobilePhoneNetworkStatus status( @@ -888,7 +887,7 @@ // SubBlock NET_MODEM_AVAIL_NETWORK_INFO_COMMON. if ( ( KErrNone == aIsiMessage.FindSubBlockOffsetByIndex( ISI_HEADER_SIZE + SIZE_NET_MODEM_AVAILABLE_GET_RESP, - subBlockIndex, + i, EIsiSubBlockTypeId8Len8, sbStartOffSet ) ) && ( NET_MODEM_AVAIL_NETWORK_INFO_COMMON == aIsiMessage.Get8bit( @@ -896,7 +895,7 @@ NET_MODEM_AVAIL_NETWORK_INFO_COMMON_OFFSET_SUBBLOCKID ) ) ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL - NET_MODEM_AVAIL_NETWORK_INFO_COMMON subblock"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_HANDLEMANUALSEARCHSUCCESSCASEL, "CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL - NET_MODEM_AVAIL_NETWORK_INFO_COMMON subblock" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_HANDLEMANUALSEARCHSUCCESSCASEL_TD, "CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL - NET_MODEM_AVAIL_NETWORK_INFO_COMMON subblock" ); // Network status. TUint8 networkStatus( aIsiMessage.Get8bit( @@ -910,28 +909,19 @@ networkStatusList.Append( status ); } - if ( KErrNone == aIsiMessage.FindSubBlockOffsetByIndex( - ISI_HEADER_SIZE + SIZE_NET_MODEM_AVAILABLE_GET_RESP, - subBlockIndex, - EIsiSubBlockTypeId8Len8, - sbStartOffSet ) ) - { - subBlockIndex++; - } - // No else - sbStartOffSet = 0; } // Another loop to get the NET_MODEM_DETAILED_NETWORK_INFO subblocks, // update the iManualSearchNetworkList and iManualSearchDataList // with the new values. - for ( TUint8 j = 0; j < amountOfNetworks; j++ ) + TUint8 detailedIndex( 0 ); + for ( TUint8 j = 1; j <= nbOfSubBlocks; j++ ) { // SubBlock NET_MODEM_DETAILED_NETWORK_INFO. if ( ( KErrNone == aIsiMessage.FindSubBlockOffsetByIndex( ISI_HEADER_SIZE + SIZE_NET_MODEM_AVAILABLE_GET_RESP, - subBlockIndex, + j, EIsiSubBlockTypeId8Len8, sbStartOffSet ) ) && ( NET_MODEM_DETAILED_NETWORK_INFO == aIsiMessage.Get8bit( @@ -940,10 +930,12 @@ && handlingSuccessful ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL - NET_MODEM_DETAILED_NETWORK_INFO subblock"); -OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_HANDLEMANUALSEARCHSUCCESSCASEL, "CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL - NET_MODEM_DETAILED_NETWORK_INFO subblock" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_HANDLEMANUALSEARCHSUCCESSCASEL_TD, "CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL - NET_MODEM_DETAILED_NETWORK_INFO subblock" ); // Set the network status from the networkStatusList created in the // previous loop. - entry.iStatus = networkStatusList[j]; + entry.iStatus = networkStatusList[detailedIndex]; + // Found detailed network info, add index + detailedIndex++; // Get the operator code. // Length of the operator code is 3 bytes. @@ -1026,9 +1018,9 @@ TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL, MCC: %d", tempManualSearchDataList.iMCC); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL, MNC: %d", tempManualSearchDataList.iMNC); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL, LocationAreaCode: %d", tempManualSearchDataList.iLocationAreaCode); -OstTrace1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_HANDLEMANUALSEARCHSUCCESSCASEL, "CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL; MCC=%u", tempManualSearchDataList.iMCC ); -OstTrace1( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_HANDLEMANUALSEARCHSUCCESSCASEL, "CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL; MNC=%u", tempManualSearchDataList.iMNC ); -OstTrace1( TRACE_NORMAL, DUP6_CMMNETOPERATORNAMEHANDLER_HANDLEMANUALSEARCHSUCCESSCASEL, "CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL; LocationAreaCode=%u", tempManualSearchDataList.iLocationAreaCode ); +OstTrace1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_HANDLEMANUALSEARCHSUCCESSCASEL_TD, "CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL; MCC=%u", tempManualSearchDataList.iMCC ); +OstTrace1( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_HANDLEMANUALSEARCHSUCCESSCASEL_TD, "CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL; MNC=%u", tempManualSearchDataList.iMNC ); +OstTrace1( TRACE_NORMAL, DUP6_CMMNETOPERATORNAMEHANDLER_HANDLEMANUALSEARCHSUCCESSCASEL_TD, "CMmNetOperatorNameHandler::HandleManualSearchSuccessCaseL; LocationAreaCode=%u", tempManualSearchDataList.iLocationAreaCode ); // Add entry to iManualSearchNetworkList array. // Catch possible error in append. @@ -1059,16 +1051,6 @@ entry.iShortName.Zero(); } - if ( KErrNone == aIsiMessage.FindSubBlockOffsetByIndex( - ISI_HEADER_SIZE + SIZE_NET_MODEM_AVAILABLE_GET_RESP, - subBlockIndex, - EIsiSubBlockTypeId8Len8, - sbStartOffSet ) ) - { - subBlockIndex++; - } - // No else. - sbStartOffSet = 0; } @@ -1103,13 +1085,13 @@ void CMmNetOperatorNameHandler::GetManualSearchOperatorNameL() { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL" ); // Amount of networks to be checked. TUint8 amountOfNetworks( iManualSearchNetworkList.Count() ); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - amount of networks: %d", amountOfNetworks); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - amount of networks=%hhu", amountOfNetworks ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - amount of networks=%hhu", amountOfNetworks ); // Temporaly network name data. RMobilePhone::TMobilePhoneNetworkInfoV5 networkName; @@ -1130,7 +1112,7 @@ && completeNow ) { TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Index value: %d", iManualSearchIndexValue); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Index value=%hhu", iManualSearchIndexValue ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Index value=%hhu", iManualSearchIndexValue ); // Hard coded name type. TInt hardCodedNameType( ENetNameNotSet ); @@ -1153,9 +1135,9 @@ TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL, MCC: %d", mcc); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL, MNC: %d", mnc); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL, LocationAreaCode: %d", locationAreaCode); -OstTrace1( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL; MCC=%u", mcc ); -OstTrace1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL; MNC=%u", mnc ); -OstTrace1( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL; LocationAreaCode=%u", locationAreaCode ); +OstTrace1( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL; MCC=%u", mcc ); +OstTrace1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL; MNC=%u", mnc ); +OstTrace1( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL; LocationAreaCode=%u", locationAreaCode ); // Starting to get Network name in priority order. // @@ -1184,7 +1166,7 @@ if ( NET_GSM_HOME_PLMN == networkType ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Registered to HPLMN"); -OstTrace0( TRACE_NORMAL, DUP6_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Registered to HPLMN" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Registered to HPLMN" ); // Handle PP bit values. tempPnnIdentifier = HandlePnnRecordWithPPbitValueInHplmn( operatorCode, @@ -1201,7 +1183,7 @@ if ( iEonsName.iPNNIdentifier == tempPnnIdentifier ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - PNN Record is read earlier"); -OstTrace0( TRACE_NORMAL, DUP7_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - PNN Record is read earlier" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - PNN Record is read earlier" ); // Matching PNN record has read earlier from SIM, // no need to read again. // Copy EONS names. @@ -1210,7 +1192,7 @@ else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - PNN Record not read earlier"); -OstTrace0( TRACE_NORMAL, DUP8_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - PNN Record not read earlier" ); +OstTrace0( TRACE_NORMAL, DUP8_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - PNN Record not read earlier" ); // Setting iFromGetManualSearchOperatorName flag to // ETrue as SimOperatorReqReadPnn request is sended // from GetManualSearchOperatorName method. @@ -1235,12 +1217,12 @@ else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Not registered to HPLMN"); -OstTrace0( TRACE_NORMAL, DUP9_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Not registered to HPLMN" ); +OstTrace0( TRACE_NORMAL, DUP9_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Not registered to HPLMN" ); // OPL rules are read and list available. if ( iOplRulesRead && iOplListAvailable ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - OPL Rules handling"); -OstTrace0( TRACE_NORMAL, DUP10_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - OPL Rules handling" ); +OstTrace0( TRACE_NORMAL, DUP10_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - OPL Rules handling" ); // EONS name consists of OPL rule and PNN record. One OPL rule consist // of PLMN code, LAC range and PNN record number. OPL rules are read // from SIM when EMmTsyBootNotifySimStatusReadyIPC is completed and @@ -1257,7 +1239,7 @@ if ( iOplRuleMatch ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - OPL Rules match"); -OstTrace0( TRACE_NORMAL, DUP11_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - OPL Rules match" ); +OstTrace0( TRACE_NORMAL, DUP11_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - OPL Rules match" ); // OPL rule exist for current network. // // If matching PNN record is not stored in internal memory @@ -1268,7 +1250,7 @@ if ( iEonsName.iPNNIdentifier == tempPnnIdentifier ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - PNN Record is read earlier"); -OstTrace0( TRACE_NORMAL, DUP12_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - PNN Record is read earlier" ); +OstTrace0( TRACE_NORMAL, DUP12_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - PNN Record is read earlier" ); // Matching PNN record has read earlier from SIM, // no need to read again. // Copy EONS names. @@ -1277,7 +1259,7 @@ else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - PNN Record not read earlier"); -OstTrace0( TRACE_NORMAL, DUP13_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - PNN Record not read earlier" ); +OstTrace0( TRACE_NORMAL, DUP13_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - PNN Record not read earlier" ); // Setting iFromGetManualSearchOperatorName flag to // ETrue as SimOperatorReqReadPnn request is sended // from GetManualSearchOperatorName method. @@ -1313,7 +1295,7 @@ if ( 0 < networkName.iLongName.Length() ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - EONS name available"); -OstTrace0( TRACE_NORMAL, DUP14_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - EONS name available" ); +OstTrace0( TRACE_NORMAL, DUP14_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - EONS name available" ); // Copy EONS Long name to correct index. iManualSearchNetworkList[iManualSearchIndexValue].iLongName.Copy( networkName.iLongName ); @@ -1329,7 +1311,7 @@ else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - No EONS name available, DisplayTag name added to Long and Short names"); -OstTrace0( TRACE_NORMAL, DUP15_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - No EONS name available, DisplayTag name added to Long and Short names" ); +OstTrace0( TRACE_NORMAL, DUP15_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - No EONS name available, DisplayTag name added to Long and Short names" ); // If no EONS name, copy DisplayTag to long and short name buffers. networkName.iLongName.Copy( networkName.iDisplayTag.Left( @@ -1347,9 +1329,9 @@ TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Operator display tag: %S", &networkName.iDisplayTag); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Operator long name: %S", &networkName.iLongName); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Operator short name: %S", &networkName.iShortName); -OstTraceExt1( TRACE_NORMAL, DUP16_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Operator display tag=%S", networkName.iDisplayTag ); -OstTraceExt1( TRACE_NORMAL, DUP17_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Operator long name=%S", networkName.iLongName ); -OstTraceExt1( TRACE_NORMAL, DUP18_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Operator short name=%S", networkName.iShortName ); +OstTraceExt1( TRACE_NORMAL, DUP16_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Operator display tag=%S", networkName.iDisplayTag ); +OstTraceExt1( TRACE_NORMAL, DUP17_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Operator long name=%S", networkName.iLongName ); +OstTraceExt1( TRACE_NORMAL, DUP18_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Operator short name=%S", networkName.iShortName ); // Update index value. iManualSearchIndexValue++; @@ -1365,7 +1347,7 @@ if ( iManualSearchIndexValue == amountOfNetworks ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - All found Networks are handled"); -OstTrace0( TRACE_NORMAL, DUP19_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - All found Networks are handled" ); +OstTrace0( TRACE_NORMAL, DUP19_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - All found Networks are handled" ); // All found networks are handled. allNetworksInManualSearchHandled = ETrue; } @@ -1375,7 +1357,7 @@ if ( allNetworksInManualSearchHandled && completeNow ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Completing"); -OstTrace0( TRACE_NORMAL, DUP20_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Completing" ); +OstTrace0( TRACE_NORMAL, DUP20_CMMNETOPERATORNAMEHANDLER_GETMANUALSEARCHOPERATORNAMEL_TD, "CMmNetOperatorNameHandler::GetManualSearchOperatorNameL - Completing" ); // Complete. CompleteMobilePhoneGetDetectedNetworksV2Phase1L(); @@ -1390,10 +1372,10 @@ void CMmNetOperatorNameHandler::InfoPpReadReq() { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::InfoPpReadReq"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_INFOPPREADREQ, "CMmNetOperatorNameHandler::InfoPpReadReq" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_INFOPPREADREQ_TD, "CMmNetOperatorNameHandler::InfoPpReadReq" ); #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING -// TO BE DONE WITH INFO_PP_DATA_READ_REQ + // Construct INFO_PP_READ_REQ message. // Data length is INFO_BATCH_TYPE + sub block count + INFO_SB_PP sub block. TBuf8<2 + SIZE_INFO_SB_PP> infoPpReadReqData; @@ -1448,12 +1430,12 @@ { // Get status. #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING -// TO BE DONE WITH INFO_PP_DATA_READ_RESP + TUint8 status( aIsiMessage.Get8bit( ISI_HEADER_SIZE + INFO_PP_READ_RESP_OFFSET_STATUS ) ); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::InfoPpReadResp - Status: %d", status); -OstTraceExt1( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_INFOPPREADRESP, "CMmNetOperatorNameHandler::InfoPpReadResp;status=%hhu", status ); +OstTraceExt1( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_INFOPPREADRESP_TD, "CMmNetOperatorNameHandler::InfoPpReadResp;status=%hhu", status ); if ( INFO_OK == status ) { @@ -1488,7 +1470,7 @@ if ( INFO_PP_EONS_FEAT_0 == pPFeatures[1] ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::InfoPpReadResp - PP Value - INFO_PP_EONS_FEAT_0"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_INFOPPREADRESP, "CMmNetOperatorNameHandler::InfoPpReadResp - PP Value - INFO_PP_EONS_FEAT_0" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_INFOPPREADRESP_TD, "CMmNetOperatorNameHandler::InfoPpReadResp - PP Value - INFO_PP_EONS_FEAT_0" ); // Phone will always assume that there is a name // for HPLMN in PNN#1 (in PNN record number one), // without checking rules from EF-OPL first. @@ -1497,7 +1479,7 @@ else if ( INFO_PP_EONS_FEAT_1 == pPFeatures[1] ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::InfoPpReadResp - PP Value - INFO_PP_EONS_FEAT_1"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_INFOPPREADRESP, "CMmNetOperatorNameHandler::InfoPpReadResp - PP Value - INFO_PP_EONS_FEAT_1" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_INFOPPREADRESP_TD, "CMmNetOperatorNameHandler::InfoPpReadResp - PP Value - INFO_PP_EONS_FEAT_1" ); // Phone will go through rules from OPL even when // in service in HPLMN, if rule for HPLMN is not // found from OPL, then it assumes that PNN#1 @@ -1507,7 +1489,7 @@ else if ( INFO_PP_EONS_FEAT_2 == pPFeatures[1] ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::InfoPpReadResp - PP Value - INFO_PP_EONS_FEAT_2"); -OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_INFOPPREADRESP, "CMmNetOperatorNameHandler::InfoPpReadResp - PP Value - INFO_PP_EONS_FEAT_2" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_INFOPPREADRESP_TD, "CMmNetOperatorNameHandler::InfoPpReadResp - PP Value - INFO_PP_EONS_FEAT_2" ); // Phone will never assume that there is a name // for HPLMN in PNN#1. It will show EONS name for // HPLMN only when it is found from EF-OPL, except @@ -1517,7 +1499,7 @@ else if ( INFO_PP_EONS_FEAT_3 == pPFeatures[1] ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::InfoPpReadResp - PP Value - INFO_PP_EONS_FEAT_3"); -OstTrace0( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_INFOPPREADRESP, "CMmNetOperatorNameHandler::InfoPpReadResp - PP Value - INFO_PP_EONS_FEAT_3" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_INFOPPREADRESP_TD, "CMmNetOperatorNameHandler::InfoPpReadResp - PP Value - INFO_PP_EONS_FEAT_3" ); // Phone will never assume that there is a name // for HPLMN in PNN#1. It will show EONS name for // HPLMN only when it is found from EF-OPL, except @@ -1542,7 +1524,7 @@ void CMmNetOperatorNameHandler::PermPmRecordWriteReq() { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::PermPmRecordWriteReq"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_PERMPMRECORDWRITEREQ, "CMmNetOperatorNameHandler::PermPmRecordWriteReq" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_PERMPMRECORDWRITEREQ_TD, "CMmNetOperatorNameHandler::PermPmRecordWriteReq" ); // Temporaly buffers for names. RMobilePhone::TMobilePhoneNetworkLongName tempLongName; @@ -1614,7 +1596,7 @@ } // Sending message to phonet. - /* To be done in CPS + /* iNetMessHandler->GetPhoNetSender()->Send( PN_PERMANENT_DATA, KNetTransId, @@ -1627,14 +1609,14 @@ // Breaks a PERM_PM_RECORD_WRITE_RESP ISI message. // ----------------------------------------------------------------------------- // -/* To be done in CPS +/* void CMmNetOperatorNameHandler::PermPmRecordWriteResp ( const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::PermPmRecordWriteResp"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_PERMPMRECORDWRITERESP, "CMmNetOperatorNameHandler::PermPmRecordWriteResp" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_PERMPMRECORDWRITERESP_TD, "CMmNetOperatorNameHandler::PermPmRecordWriteResp" ); TUint8 status( aIsiMessage.Get8bit( @@ -1645,13 +1627,13 @@ { // NITZ data is successfully stored to PMM. TFLOGSTRING("TSY: CMmNetOperatorNameHandler::PermPmRecordWriteResp - NITZ data successfully stored to PMM"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDWRITERESP, "CMmNetOperatorNameHandler::PermPmRecordWriteResp - NITZ data successfully stored to PMM" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDWRITERESP_TD, "CMmNetOperatorNameHandler::PermPmRecordWriteResp - NITZ data successfully stored to PMM" ); } else { // Storing failed. TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::PermPmRecordWriteResp - NITZ data storing failed, error value: %d", status); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDWRITERESP, "CMmNetOperatorNameHandler::PermPmRecordWriteResp - NITZ data storing failed, error value=%hhu", status ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDWRITERESP_TD, "CMmNetOperatorNameHandler::PermPmRecordWriteResp - NITZ data storing failed, error value=%hhu", status ); } } */ @@ -1664,7 +1646,7 @@ void CMmNetOperatorNameHandler::PermPmRecordReadReq() { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::PermPmRecordReadReq"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADREQ, "CMmNetOperatorNameHandler::PermPmRecordReadReq" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADREQ_TD, "CMmNetOperatorNameHandler::PermPmRecordReadReq" ); // Create message data buffer (14 bytes) for // - Group ID (2 bytes), @@ -1697,7 +1679,7 @@ messageData.Append( static_cast( KNitzPmmDataLength ) ); // Sending message to phonet. - /* To be done in CPS + /* iNetMessHandler->GetPhoNetSender()->Send( PN_PERMANENT_DATA, KNetTransId, @@ -1710,14 +1692,14 @@ // Breaks a PERM_PM_RECORD_READ_RESP ISI message. // ----------------------------------------------------------------------------- // -/* To be done in CPS +/* void CMmNetOperatorNameHandler::PermPmRecordReadResp ( const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::PermPmRecordReadResp"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADRESP, "CMmNetOperatorNameHandler::PermPmRecordReadResp" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADRESP_TD, "CMmNetOperatorNameHandler::PermPmRecordReadResp" ); TUint8 status( aIsiMessage.Get8bit( ISI_HEADER_SIZE + PERM_PM_RECORD_READ_RESP_OFFSET_PMMSTATUS ) ); @@ -1727,7 +1709,7 @@ { // NITZ data is successfully read from PMM. TFLOGSTRING("TSY: CMmNetOperatorNameHandler::PermPmRecordReadResp - NITZ data successfully read from PMM"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADRESP, "CMmNetOperatorNameHandler::PermPmRecordReadResp - NITZ data successfully read from PMM" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADRESP_TD, "CMmNetOperatorNameHandler::PermPmRecordReadResp - NITZ data successfully read from PMM" ); // NITZ data buffer has room for: // - MCC, MNC, Long name and Short name ( 64 bytes ). @@ -1825,17 +1807,17 @@ { // Reading failed. No data stored or other error when reading. TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::PermPmRecordReadResp - NITZ data reading failed from PMM, error value: %d", status); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADRESP, "CMmNetOperatorNameHandler::PermPmRecordReadResp - NITZ data reading failed from PMM, error value=%hhu", status ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADRESP_TD, "CMmNetOperatorNameHandler::PermPmRecordReadResp - NITZ data reading failed from PMM, error value=%hhu", status ); } TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::PermPmRecordReadResp - iNitzNamePmm.iMCC: %d", iNitzNamePmm.iMCC); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::PermPmRecordReadResp - iNitzNamePmm.iMNC: %d", iNitzNamePmm.iMNC); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::PermPmRecordReadResp - iNitzNamePmm.iLongName: %S", &iNitzNamePmm.iLongName); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::PermPmRecordReadResp - iNitzNamePmm.iShortName: %S", &iNitzNamePmm.iShortName); -OstTrace1( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADRESP, "CMmNetOperatorNameHandler::PermPmRecordReadResp - iNitzNamePmm.iMCC=%u", iNitzNamePmm.iMCC ); -OstTrace1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADRESP, "CMmNetOperatorNameHandler::PermPmRecordReadResp - iNitzNamePmm.iMNC=%u", iNitzNamePmm.iMNC ); -OstTraceExt1( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADRESP, "CMmNetOperatorNameHandler::PermPmRecordReadResp - iNitzNamePmm.iLongName=%S", iNitzNamePmm.iLongName ); -OstTraceExt1( TRACE_NORMAL, DUP6_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADRESP, "CMmNetOperatorNameHandler::PermPmRecordReadResp - iNitzNamePmm.iShortName=%S", iNitzNamePmm.iShortName ); +OstTrace1( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADRESP_TD, "CMmNetOperatorNameHandler::PermPmRecordReadResp - iNitzNamePmm.iMCC=%u", iNitzNamePmm.iMCC ); +OstTrace1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADRESP_TD, "CMmNetOperatorNameHandler::PermPmRecordReadResp - iNitzNamePmm.iMNC=%u", iNitzNamePmm.iMNC ); +OstTraceExt1( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADRESP_TD, "CMmNetOperatorNameHandler::PermPmRecordReadResp - iNitzNamePmm.iLongName=%S", iNitzNamePmm.iLongName ); +OstTraceExt1( TRACE_NORMAL, DUP6_CMMNETOPERATORNAMEHANDLER_PERMPMRECORDREADRESP_TD, "CMmNetOperatorNameHandler::PermPmRecordReadResp - iNitzNamePmm.iShortName=%S", iNitzNamePmm.iShortName ); }*/ // ----------------------------------------------------------------------------- @@ -1853,7 +1835,7 @@ ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::HandleOnsAndHardCodedName"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_HANDLEONSANDHARDCODEDNAME, "CMmNetOperatorNameHandler::HandleOnsAndHardCodedName" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_HANDLEONSANDHARDCODEDNAME_TD, "CMmNetOperatorNameHandler::HandleOnsAndHardCodedName" ); // Check ONS name and hard coded names in priority and add then // correct name to iDisplayTag. @@ -1863,7 +1845,7 @@ ENetApacName != aHardCodedNameType ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - ONS Name added"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_HANDLEONSANDHARDCODEDNAME, "CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - ONS Name added" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_HANDLEONSANDHARDCODEDNAME_TD, "CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - ONS Name added" ); // ONS (Operator Name String) name is read from SIM when // EMmTsyBootNotifySimStatusReadyIPC is completed and // when refresh happens. @@ -1880,7 +1862,7 @@ else if ( ENetApacName == aHardCodedNameType ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - Hard coded APAC Name added"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_HANDLEONSANDHARDCODEDNAME, "CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - Hard coded APAC Name added" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_HANDLEONSANDHARDCODEDNAME_TD, "CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - Hard coded APAC Name added" ); // Copy Hard coded APAC name. aNetworkName.iDisplayTag.Copy( aDisplayTag ); // Add Operator name info data. @@ -1890,7 +1872,7 @@ else if ( ENetLatinName == aHardCodedNameType ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - Hard coded Latin Name added"); -OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_HANDLEONSANDHARDCODEDNAME, "CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - Hard coded Latin Name added" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_HANDLEONSANDHARDCODEDNAME_TD, "CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - Hard coded Latin Name added" ); // Copy Hard coded Latin name. aNetworkName.iDisplayTag.Copy( aDisplayTag ); // Add Operator name info data. @@ -1900,7 +1882,7 @@ else if ( ENetCountryMncName == aHardCodedNameType ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - Hard coded CountryMnc Name added"); -OstTrace0( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_HANDLEONSANDHARDCODEDNAME, "CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - Hard coded CountryMnc Name added" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_HANDLEONSANDHARDCODEDNAME_TD, "CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - Hard coded CountryMnc Name added" ); // Copy Hard coded CountryMnc name. aNetworkName.iDisplayTag.Copy( aDisplayTag ); // Add Operator name info data. @@ -1910,7 +1892,7 @@ else if ( ENetMccMncName == aHardCodedNameType ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - Hard coded MccMnc Name added"); -OstTrace0( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_HANDLEONSANDHARDCODEDNAME, "CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - Hard coded MccMnc Name added" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_HANDLEONSANDHARDCODEDNAME_TD, "CMmNetOperatorNameHandler::HandleOnsAndHardCodedName - Hard coded MccMnc Name added" ); // Copy Hard coded MccMnc name. aNetworkName.iDisplayTag.Copy( aDisplayTag ); // Add Operator name info data. @@ -1933,7 +1915,7 @@ ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_HANDLEPNNRECORDWITHPPBITVALUEINHPLMN, "CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_HANDLEPNNRECORDWITHPPBITVALUEINHPLMN_TD, "CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn" ); // Temp PNN record identifier initialization. TUint8 tempPnnIdentifier( 0 ); @@ -1944,7 +1926,7 @@ if ( INFO_PP_EONS_FEAT_0 == iInfoPpEonsFeatValue ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn - PP bit INFO_PP_EONS_FEAT_0"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_HANDLEPNNRECORDWITHPPBITVALUEINHPLMN, "CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn - PP bit INFO_PP_EONS_FEAT_0" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_HANDLEPNNRECORDWITHPPBITVALUEINHPLMN_TD, "CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn - PP bit INFO_PP_EONS_FEAT_0" ); // Phone will always assume that there is a name // for HPLMN in PNN#1 (in PNN record number one), // without checking rules from EF-OPL first. @@ -1958,7 +1940,7 @@ if ( iOplRulesRead && iOplListAvailable ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn - OPL Rules handling"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_HANDLEPNNRECORDWITHPPBITVALUEINHPLMN, "CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn - OPL Rules handling" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_HANDLEPNNRECORDWITHPPBITVALUEINHPLMN_TD, "CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn - OPL Rules handling" ); // EONS name consists of OPL rule and PNN record. // One OPL rule consist of PLMN code, LAC range // and PNN record number. OPL rules are read from @@ -1980,7 +1962,7 @@ if ( INFO_PP_EONS_FEAT_1 == iInfoPpEonsFeatValue ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn - PP bit INFO_PP_EONS_FEAT_1"); -OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_HANDLEPNNRECORDWITHPPBITVALUEINHPLMN, "CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn - PP bit INFO_PP_EONS_FEAT_1" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_HANDLEPNNRECORDWITHPPBITVALUEINHPLMN_TD, "CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn - PP bit INFO_PP_EONS_FEAT_1" ); // Phone will go through rules from OPL even when // in service in HPLMN, if rule for HPLMN is not // found from OPL, then it assumes that PNN#1 @@ -2011,7 +1993,7 @@ else if ( INFO_PP_EONS_FEAT_2 == iInfoPpEonsFeatValue ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn - PP bit INFO_PP_EONS_FEAT_2"); -OstTrace0( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_HANDLEPNNRECORDWITHPPBITVALUEINHPLMN, "CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn - PP bit INFO_PP_EONS_FEAT_2" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_HANDLEPNNRECORDWITHPPBITVALUEINHPLMN_TD, "CMmNetOperatorNameHandler::HandlePnnRecordWithPPbitValueInHplmn - PP bit INFO_PP_EONS_FEAT_2" ); // Phone will never assume that there is a name // for HPLMN in PNN#1. It will show EONS name for // HPLMN only when it is found from EF-OPL, except @@ -2057,8 +2039,8 @@ { TFLOGSTRING4("TSY: CMmNetOperatorNameHandler::OplRulesChecker - Operator Code BCD string: %02X %02X %02X", aOperatorCode[0], aOperatorCode[1], aOperatorCode[2]); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::OplRulesChecker - LAC: %d", aLac); -OstTraceExt3( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_OPLRULESCHECKER, "CMmNetOperatorNameHandler::OplRulesChecker - Operator Code BCD string: %hhx %hhx %hhx", aOperatorCode[0], aOperatorCode[1], aOperatorCode[2] ); -OstTrace1( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_OPLRULESCHECKER, "CMmNetOperatorNameHandler::OplRulesChecker - LAC: %u", aLac ); +OstTraceExt3( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_OPLRULESCHECKER_TD, "CMmNetOperatorNameHandler::OplRulesChecker - Operator Code BCD string: %hhx %hhx %hhx", aOperatorCode[0], aOperatorCode[1], aOperatorCode[2] ); +OstTrace1( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_OPLRULESCHECKER_TD, "CMmNetOperatorNameHandler::OplRulesChecker - LAC: %u", aLac ); // Initialize. TUint8 index( 0 ); @@ -2072,7 +2054,7 @@ while ( index < numberOfRecords && !iOplRuleMatch ) { TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::OplRulesChecker - saved OPL list index: %d", index); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_OPLRULESCHECKER, "CMmNetOperatorNameHandler::OplRulesChecker - saved OPL list index=%hhu", index ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_OPLRULESCHECKER_TD, "CMmNetOperatorNameHandler::OplRulesChecker - saved OPL list index=%hhu", index ); // Check OPL rule record. OplRuleRecordChecker( index, @@ -2083,13 +2065,13 @@ if ( iOplRuleMatch ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::OplRulesChecker - OPL rule match"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_OPLRULESCHECKER, "CMmNetOperatorNameHandler::OplRulesChecker - OPL rule match" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_OPLRULESCHECKER_TD, "CMmNetOperatorNameHandler::OplRulesChecker - OPL rule match" ); tempPnnIdentifier = iOperatorPlmnListTable[index].iPNNIdentifier; } else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::OplRulesChecker - OPL rule doesn't match"); -OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_OPLRULESCHECKER, "CMmNetOperatorNameHandler::OplRulesChecker - OPL rule doesn't match" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_OPLRULESCHECKER_TD, "CMmNetOperatorNameHandler::OplRulesChecker - OPL rule doesn't match" ); // No match. // Increase index value. index++; @@ -2097,7 +2079,7 @@ } TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::OplRulesChecker - PNN Identifier: %d", tempPnnIdentifier); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_OPLRULESCHECKER, "CMmNetOperatorNameHandler::OplRulesChecker - PNN Identifier=%hhu", tempPnnIdentifier ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_OPLRULESCHECKER_TD, "CMmNetOperatorNameHandler::OplRulesChecker - PNN Identifier=%hhu", tempPnnIdentifier ); return tempPnnIdentifier; } @@ -2115,7 +2097,7 @@ ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::OplRuleRecordChecker"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER, "CMmNetOperatorNameHandler::OplRuleRecordChecker" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER_TD, "CMmNetOperatorNameHandler::OplRuleRecordChecker" ); // Buffer for SIM Operator code, length is 3. TBuf8 simOperatorCode; @@ -2144,8 +2126,8 @@ TFLOGSTRING4("TSY: CMmNetOperatorNameHandler::OplRuleRecordChecker - BCCH MCC1 MCC2 MCC3 : %X %X %X", bcchMcc1, bcchMcc2, bcchMcc3); TFLOGSTRING4("TSY: CMmNetOperatorNameHandler::OplRuleRecordChecker - BCCH MNC1 MNC2 MNC3 : %X %X %X", bcchMnc1, bcchMnc2, bcchMnc3); -OstTraceExt3( TRACE_NORMAL, DUP6_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER, "CMmNetOperatorNameHandler::OplRuleRecordChecker - BCCH MCC1 MCC2 MCC3 : %hx %hx %hx", bcchMcc1, bcchMcc2, bcchMcc3 ); -OstTraceExt3( TRACE_NORMAL, DUP7_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER, "CMmNetOperatorNameHandler::OplRuleRecordChecker - BCCH MNC1 MNC2 MNC3 : %hx %hx %hx", bcchMnc1, bcchMnc2, bcchMnc3 ); +OstTraceExt3( TRACE_NORMAL, DUP6_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER_TD, "CMmNetOperatorNameHandler::OplRuleRecordChecker - BCCH MCC1 MCC2 MCC3 : %hx %hx %hx", bcchMcc1, bcchMcc2, bcchMcc3 ); +OstTraceExt3( TRACE_NORMAL, DUP7_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER_TD, "CMmNetOperatorNameHandler::OplRuleRecordChecker - BCCH MNC1 MNC2 MNC3 : %hx %hx %hx", bcchMnc1, bcchMnc2, bcchMnc3 ); // BCCH MCC. bcchMccNumber = 100 * bcchMcc1 + 10 * bcchMcc2 + bcchMcc3; @@ -2159,8 +2141,8 @@ TFLOGSTRING4("TSY: CMmNetOperatorNameHandler::OplRuleRecordChecker - SIM MCC1 MCC2 MCC3 : %X %X %X", simMcc1, simMcc2, simMcc3); TFLOGSTRING4("TSY: CMmNetOperatorNameHandler::OplRuleRecordChecker - SIM MNC1 MNC2 MNC3 : %X %X %X", simMnc1, simMnc2, simMnc3); -OstTraceExt3( TRACE_NORMAL, DUP8_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER, "CMmNetOperatorNameHandler::OplRuleRecordChecker - SIM MCC1 MCC2 MCC3 : %hx %hx %hx", simMcc1, simMcc2, simMcc3 ); -OstTraceExt3( TRACE_NORMAL, DUP9_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER, "CMmNetOperatorNameHandler::OplRuleRecordChecker - SIM MNC1 MNC2 MNC3 : %hx %hx %hx", simMnc1, simMnc2, simMnc3 ); +OstTraceExt3( TRACE_NORMAL, DUP8_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER_TD, "CMmNetOperatorNameHandler::OplRuleRecordChecker - SIM MCC1 MCC2 MCC3 : %hx %hx %hx", simMcc1, simMcc2, simMcc3 ); +OstTraceExt3( TRACE_NORMAL, DUP9_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER_TD, "CMmNetOperatorNameHandler::OplRuleRecordChecker - SIM MNC1 MNC2 MNC3 : %hx %hx %hx", simMnc1, simMnc2, simMnc3 ); // Flag for OPL rule checking. TBool digitMatch( EFalse ); @@ -2238,18 +2220,18 @@ if ( digitMatch ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::OplRuleRecordChecker - MCC and MNC match"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER, "CMmNetOperatorNameHandler::OplRuleRecordChecker - MCC and MNC match" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER_TD, "CMmNetOperatorNameHandler::OplRuleRecordChecker - MCC and MNC match" ); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::OplRuleRecordChecker - BCCH LAC: %d", aLac); TFLOGSTRING3("TSY: CMmNetOperatorNameHandler::OplRuleRecordChecker - SIM LAC between: %d - %d", iOperatorPlmnListTable[aIndex].iLACUpperLimit, iOperatorPlmnListTable[aIndex].iLACLowerLimit); -OstTrace1( TRACE_NORMAL, DUP10_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER, "CMmNetOperatorNameHandler::OplRuleRecordChecker - BCCH LAC: %u", aLac ); -OstTraceExt2( TRACE_NORMAL, DUP11_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER, "CMmNetOperatorNameHandler::OplRuleRecordChecker - SIM LAC between: %u - %u", iOperatorPlmnListTable[aIndex].iLACUpperLimit, iOperatorPlmnListTable[aIndex].iLACLowerLimit ); +OstTrace1( TRACE_NORMAL, DUP10_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER_TD, "CMmNetOperatorNameHandler::OplRuleRecordChecker - BCCH LAC: %u", aLac ); +OstTraceExt2( TRACE_NORMAL, DUP11_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER_TD, "CMmNetOperatorNameHandler::OplRuleRecordChecker - SIM LAC between: %u - %u", iOperatorPlmnListTable[aIndex].iLACUpperLimit, iOperatorPlmnListTable[aIndex].iLACLowerLimit ); if ( ( aLac <= iOperatorPlmnListTable[aIndex].iLACUpperLimit ) && ( aLac >= iOperatorPlmnListTable[aIndex].iLACLowerLimit ) ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::OplRuleRecordChecker - LAC match => OPL Rule match"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER, "CMmNetOperatorNameHandler::OplRuleRecordChecker - LAC match => OPL Rule match" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER_TD, "CMmNetOperatorNameHandler::OplRuleRecordChecker - LAC match => OPL Rule match" ); // MCC, MNC and LAC value match. // Set iOplRuleMatch value to ETrue. // This informs that OPL record match. @@ -2258,7 +2240,7 @@ else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::OplRuleRecordChecker - LAC doesn't match => OPL Rule doesn't match"); -OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER, "CMmNetOperatorNameHandler::OplRuleRecordChecker - LAC doesn't match => OPL Rule doesn't match" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER_TD, "CMmNetOperatorNameHandler::OplRuleRecordChecker - LAC doesn't match => OPL Rule doesn't match" ); // LAC value range doesn't match. // Set iOplRuleMatch value to EFalse. // This informs that OPL record didn't match. @@ -2268,7 +2250,7 @@ else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::OplRuleRecordChecker - MCC or MNC didn't match => OPL Rule doesn't match"); -OstTrace0( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER, "CMmNetOperatorNameHandler::OplRuleRecordChecker - MCC or MNC didn't match => OPL Rule doesn't match" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_OPLRULERECORDCHECKER_TD, "CMmNetOperatorNameHandler::OplRuleRecordChecker - MCC or MNC didn't match => OPL Rule doesn't match" ); // Set iOplRuleMatch value to EFalse. // This informs that OPL record didn't match. iOplRuleMatch = EFalse; @@ -2287,14 +2269,14 @@ ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::CopyEonsName"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_COPYEONSNAME, "CMmNetOperatorNameHandler::CopyEonsName" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_COPYEONSNAME_TD, "CMmNetOperatorNameHandler::CopyEonsName" ); // Copy Long EONS name if exist. // If no Long EONS name there is no short EONS name either. if ( 0 < iEonsName.iLongName.Length() ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::CopyEonsName - EONS Long name"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_COPYEONSNAME, "CMmNetOperatorNameHandler::CopyEonsName - EONS Long name" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_COPYEONSNAME_TD, "CMmNetOperatorNameHandler::CopyEonsName - EONS Long name" ); // Copy EONS Long name. aNetworkData.iLongName.Copy( iEonsName.iLongName ); @@ -2307,7 +2289,7 @@ if ( 0 < iEonsName.iShortName.Length() ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::CopyEonsName - EONS Short name"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_COPYEONSNAME, "CMmNetOperatorNameHandler::CopyEonsName - EONS Short name" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_COPYEONSNAME_TD, "CMmNetOperatorNameHandler::CopyEonsName - EONS Short name" ); // Copy EONS Short name. aNetworkData.iShortName.Copy( iEonsName.iShortName ); @@ -2328,7 +2310,7 @@ ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::NitzNameChecker"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_NITZNAMECHECKER, "CMmNetOperatorNameHandler::NitzNameChecker" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_NITZNAMECHECKER_TD, "CMmNetOperatorNameHandler::NitzNameChecker" ); // Check if NITZ long/short name exist and will match for // current Country and Network codes. @@ -2336,7 +2318,7 @@ && ( iNitzName.iMNC == aMNC ) ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::NitzNameChecker - NITZ MCC/MNC codes match"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_NITZNAMECHECKER, "CMmNetOperatorNameHandler::NitzNameChecker - NITZ MCC/MNC codes match" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_NITZNAMECHECKER_TD, "CMmNetOperatorNameHandler::NitzNameChecker - NITZ MCC/MNC codes match" ); // Copy Long NITZ name if exist. if ( 0 < iNitzName.iLongName.Length() ) @@ -2375,7 +2357,7 @@ void CMmNetOperatorNameHandler::CompareNitzNameToPmmValues() { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::CompareNitzNameToPmmValues"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_COMPARENITZNAMETOPMMVALUES, "CMmNetOperatorNameHandler::CompareNitzNameToPmmValues" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_COMPARENITZNAMETOPMMVALUES_TD, "CMmNetOperatorNameHandler::CompareNitzNameToPmmValues" ); // Initialize to ETrue. TBool valuesMatch( ETrue ); @@ -2387,7 +2369,7 @@ || ( 0 != iNitzNamePmm.iShortName.Compare( iNitzName.iShortName ) ) ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::CompareNitzNameToPmmValues - No match"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_COMPARENITZNAMETOPMMVALUES, "CMmNetOperatorNameHandler::CompareNitzNameToPmmValues - No match" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_COMPARENITZNAMETOPMMVALUES_TD, "CMmNetOperatorNameHandler::CompareNitzNameToPmmValues - No match" ); // No match. valuesMatch = EFalse; } @@ -2396,7 +2378,7 @@ if ( !valuesMatch ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::CompareNitzNameToPmmValues - Update PMM with new NITZ name data"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_COMPARENITZNAMETOPMMVALUES, "CMmNetOperatorNameHandler::CompareNitzNameToPmmValues - Update PMM with new NITZ name data" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_COMPARENITZNAMETOPMMVALUES_TD, "CMmNetOperatorNameHandler::CompareNitzNameToPmmValues - Update PMM with new NITZ name data" ); // Copy new values. iNitzNamePmm = iNitzName; @@ -2419,7 +2401,7 @@ ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::Packed7to8Format"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_PACKED7TO8FORMAT, "CMmNetOperatorNameHandler::Packed7to8Format" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_PACKED7TO8FORMAT_TD, "CMmNetOperatorNameHandler::Packed7to8Format" ); // The string is in packed GSM 7-bit Default Alphabet format. // To be converted to 8-bit format. @@ -2438,12 +2420,12 @@ ( aString[i] & maskRightPartOfCurrentByte ) << shiftLeft ); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::Packed7to8Format - Buffer index: %d", i); -OstTrace1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_PACKED7TO8FORMAT, "CMmNetOperatorNameHandler::Packed7to8Format - Buffer index=%u", i ); +OstTrace1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_PACKED7TO8FORMAT_TD, "CMmNetOperatorNameHandler::Packed7to8Format - Buffer index=%u", i ); TUint8 character( leftPartOfCurrentChar | leftPartFromPreviousByte ); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::Packed7to8Format - Character: %X", character); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_PACKED7TO8FORMAT, "CMmNetOperatorNameHandler::Packed7to8Format - Character=%hhx", character ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_PACKED7TO8FORMAT_TD, "CMmNetOperatorNameHandler::Packed7to8Format - Character=%hhx", character ); // Append the character in the output text string. aOutput.Append( character ); @@ -2458,7 +2440,7 @@ character = aString[i] >> 1; TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::Packed7to8Format - Character: %X", character); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_PACKED7TO8FORMAT, "CMmNetOperatorNameHandler::Packed7to8Format - Character=%hhx", character ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_PACKED7TO8FORMAT_TD, "CMmNetOperatorNameHandler::Packed7to8Format - Character=%hhx", character ); // Continue. aOutput.Append( character ); // Restart. @@ -2488,7 +2470,7 @@ ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::ConvertGsm7ToUnicode16"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_CONVERTGSM7TOUNICODE16, "CMmNetOperatorNameHandler::ConvertGsm7ToUnicode16" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_CONVERTGSM7TOUNICODE16_TD, "CMmNetOperatorNameHandler::ConvertGsm7ToUnicode16" ); TInt i( 0 ); TInt outputMaxLength( aOutput.MaxLength() ); @@ -2581,7 +2563,7 @@ // Unknown characters will be converted into a space. aOutput.Append( static_cast( 0x20 ) ); TFLOGSTRING("TSY: CMmNetOperatorNameHandler::ConvertGsm7ToUnicode16, Unknown char is converted into a space."); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_CONVERTGSM7TOUNICODE16, "CMmNetOperatorNameHandler::ConvertGsm7ToUnicode16, Unknown char is converted into a space." ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_CONVERTGSM7TOUNICODE16_TD, "CMmNetOperatorNameHandler::ConvertGsm7ToUnicode16, Unknown char is converted into a space." ); } break; } @@ -2600,7 +2582,7 @@ // Unknown characters will be converted into a space. aOutput.Append( static_cast( 0x20 ) ); TFLOGSTRING("TSY: CMmNetOperatorNameHandler::ConvertGsm7ToUnicode16, Unknown char is converted into a space."); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_CONVERTGSM7TOUNICODE16, "CMmNetOperatorNameHandler::ConvertGsm7ToUnicode16, Unknown char is converted into a space." ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_CONVERTGSM7TOUNICODE16_TD, "CMmNetOperatorNameHandler::ConvertGsm7ToUnicode16, Unknown char is converted into a space." ); } } } @@ -2614,7 +2596,7 @@ void CMmNetOperatorNameHandler::CompleteMobilePhoneGetDetectedNetworksV2Phase1L() { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::CompleteMobilePhoneGetDetectedNetworksV2Phase1L"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_COMPLETEMOBILEPHONEGETDETECTEDNETWORKSV2PHASE1L, "CMmNetOperatorNameHandler::CompleteMobilePhoneGetDetectedNetworksV2Phase1L" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_COMPLETEMOBILEPHONEGETDETECTEDNETWORKSV2PHASE1L_TD, "CMmNetOperatorNameHandler::CompleteMobilePhoneGetDetectedNetworksV2Phase1L" ); // Completing EMobilePhoneGetDetectedNetworksV2Phase1 IPC with found // operators in manual search need to use the CMobilePhoneNetworkListV2 @@ -2679,7 +2661,7 @@ TInt CMmNetOperatorNameHandler::GetPnnRecordIdentifierValue() { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::GetPnnRecordIdentifierValue"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_GETPNNRECORDIDENTIFIERVALUE, "CMmNetOperatorNameHandler::GetPnnRecordIdentifierValue" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_GETPNNRECORDIDENTIFIERVALUE_TD, "CMmNetOperatorNameHandler::GetPnnRecordIdentifierValue" ); return iEonsName.iPNNIdentifier; } @@ -2691,7 +2673,7 @@ void CMmNetOperatorNameHandler::UiccReadOplRecordCount() { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccReadOplRecordCount"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCREADOPLRECORDCOUNT, "CMmNetOperatorNameHandler::UiccReadOplRecordCount" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCREADOPLRECORDCOUNT_TD, "CMmNetOperatorNameHandler::UiccReadOplRecordCount" ); // Initialize to default value iOplListAvailable = EFalse; @@ -2729,7 +2711,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccOplRecordCountResponse"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCOPLRECORDCOUNTRESPONSE, "CMmNetOperatorNameHandler::UiccOplRecordCountResponse" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCOPLRECORDCOUNTRESPONSE_TD, "CMmNetOperatorNameHandler::UiccOplRecordCountResponse" ); TBool checkRefresh( ETrue ); if ( UICC_STATUS_OK == aStatus ) @@ -2750,13 +2732,13 @@ else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccOplRecordCountResponse - No OPL records on (U)SIM"); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_UICCOPLRECORDCOUNTRESPONSE, "CMmNetOperatorNameHandler::UiccOplRecordCountResponse - No OPL records on (U)SIM" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_UICCOPLRECORDCOUNTRESPONSE_TD, "CMmNetOperatorNameHandler::UiccOplRecordCountResponse - No OPL records on (U)SIM" ); } } else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccOplRecordCountResponse - Reading of OPL record count failed"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_UICCOPLRECORDCOUNTRESPONSE, "CMmNetOperatorNameHandler::UiccOplRecordCountResponse - Reading of OPL record count failed" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_UICCOPLRECORDCOUNTRESPONSE_TD, "CMmNetOperatorNameHandler::UiccOplRecordCountResponse - Reading of OPL record count failed" ); } // There was error reading OPL or record number was zero. @@ -2787,7 +2769,7 @@ void CMmNetOperatorNameHandler::UiccReadOplReq() { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccReadOplResp"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCREADOPLREQ, "CMmNetOperatorNameHandler::UiccReadOplReq" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCREADOPLREQ_TD, "CMmNetOperatorNameHandler::UiccReadOplReq" ); TUint8 fileIdSfi( 0x1A ); // Default value for 3G // Get card type to define SFI @@ -2824,7 +2806,7 @@ void CMmNetOperatorNameHandler::UiccReadOplResp( const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccReadOplResp"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCREADOPLRESP, "CMmNetOperatorNameHandler::UiccReadOplResp" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCREADOPLRESP_TD, "CMmNetOperatorNameHandler::UiccReadOplResp" ); if ( 8 == aFileData.Length() ) { // Temp data @@ -2853,10 +2835,10 @@ TFLOGSTRING4("TSY: CMmNetOperatorNameHandler::SimOperatorRespReadOpl, Operator Code BCD string: %02X %02X %02X", tempOperatorPlmnList.iOperCodeBCD[0], tempOperatorPlmnList.iOperCodeBCD[1], tempOperatorPlmnList.iOperCodeBCD[2]); TFLOGSTRING3("TSY: CMmNetOperatorNameHandler::SimOperatorRespReadOpl, LAC between: %d - %d", tempOperatorPlmnList.iLACUpperLimit, tempOperatorPlmnList.iLACLowerLimit); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::SimOperatorRespReadOpl, PNN Identifier: %d", tempOperatorPlmnList.iPNNIdentifier); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_UICCREADOPLRESP, "CMmNetOperatorNameHandler::UiccReadOplResp;iOplRecordNumber=%hhu", iOplRecordNumber ); -OstTraceExt3( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_UICCREADOPLRESP, "CMmNetOperatorNameHandler::UiccReadOplResp;tempOperatorPlmnList.iOperCodeBCD[0]=%hhx;tempOperatorPlmnList.iOperCodeBCD[1]=%hhx;tempOperatorPlmnList.iOperCodeBCD[2]=%hhx", tempOperatorPlmnList.iOperCodeBCD[0], tempOperatorPlmnList.iOperCodeBCD[1], tempOperatorPlmnList.iOperCodeBCD[2] ); -OstTraceExt2( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_UICCREADOPLRESP, "CMmNetOperatorNameHandler::UiccReadOplResp;tempOperatorPlmnList.iLACUpperLimit=%u;tempOperatorPlmnList.iLACLowerLimit=%u", tempOperatorPlmnList.iLACUpperLimit, tempOperatorPlmnList.iLACLowerLimit ); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_UICCREADOPLRESP, "CMmNetOperatorNameHandler::UiccReadOplResp;tempOperatorPlmnList.iPNNIdentifier=%hhd", tempOperatorPlmnList.iPNNIdentifier ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_UICCREADOPLRESP_TD, "CMmNetOperatorNameHandler::UiccReadOplResp;iOplRecordNumber=%hhu", iOplRecordNumber ); +OstTraceExt3( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_UICCREADOPLRESP_TD, "CMmNetOperatorNameHandler::UiccReadOplResp;tempOperatorPlmnList.iOperCodeBCD[0]=%hhx;tempOperatorPlmnList.iOperCodeBCD[1]=%hhx;tempOperatorPlmnList.iOperCodeBCD[2]=%hhx", tempOperatorPlmnList.iOperCodeBCD[0], tempOperatorPlmnList.iOperCodeBCD[1], tempOperatorPlmnList.iOperCodeBCD[2] ); +OstTraceExt2( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_UICCREADOPLRESP_TD, "CMmNetOperatorNameHandler::UiccReadOplResp;tempOperatorPlmnList.iLACUpperLimit=%u;tempOperatorPlmnList.iLACLowerLimit=%u", tempOperatorPlmnList.iLACUpperLimit, tempOperatorPlmnList.iLACLowerLimit ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_UICCREADOPLRESP_TD, "CMmNetOperatorNameHandler::UiccReadOplResp;tempOperatorPlmnList.iPNNIdentifier=%hhd", tempOperatorPlmnList.iPNNIdentifier ); // Clear buffer before next round tempOperatorPlmnList.iOperCodeBCD.Zero(); @@ -2867,7 +2849,7 @@ else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccReadOplResp - Invalid data in OPL record"); -OstTrace0( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_UICCREADOPLRESP, "CMmNetOperatorNameHandler::UiccReadOplResp - Invalid data in OPL record" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_UICCREADOPLRESP_TD, "CMmNetOperatorNameHandler::UiccReadOplResp - Invalid data in OPL record" ); } } @@ -2879,7 +2861,7 @@ void CMmNetOperatorNameHandler::UiccOperatorReq() { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccOperatorReq" ); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCOPERATORREQ, "CMmNetOperatorNameHandler::UiccOperatorReq" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCOPERATORREQ_TD, "CMmNetOperatorNameHandler::UiccOperatorReq" ); // Set parameters for UICC_APPL_CMD_REQ message TUiccReadTransparent params; @@ -2910,7 +2892,7 @@ ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccOperatorResp"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESP, "CMmNetOperatorNameHandler::UiccOperatorResp" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESP_TD, "CMmNetOperatorNameHandler::UiccOperatorResp" ); if ( UICC_STATUS_OK == aStatus ) { @@ -2931,12 +2913,12 @@ iOperatorNameString.Append( static_cast ( aFileData[i] ) ); } TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::UiccOperatorResp, ONS Name: %S", &iOperatorNameString); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESP, "CMmNetOperatorNameHandler::UiccOperatorResp;iOperatorNameString=%S", iOperatorNameString ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESP_TD, "CMmNetOperatorNameHandler::UiccOperatorResp;iOperatorNameString=%S", iOperatorNameString ); } else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccOperatorResp - Error occured, data not available"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESP, "CMmNetOperatorNameHandler::UiccOperatorResp- Error occured, data not available" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESP_TD, "CMmNetOperatorNameHandler::UiccOperatorResp- Error occured, data not available" ); // Data not available. iOperatorNameString.Zero(); } @@ -2961,7 +2943,7 @@ const TDesC8& aFileData ) { TFLOGSTRING3("TSY:CMmNetOperatorNameHandler::ProcessUiccMsg, aTraId: %d, status: %d", aTraId, aStatus ); -OstTraceExt2( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_PROCESSUICCMSG, "CMmNetOperatorNameHandler::ProcessUiccMsg;aTraId=%d;aStatus=%d", aTraId, aStatus ); +OstTraceExt2( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_PROCESSUICCMSG_TD, "CMmNetOperatorNameHandler::ProcessUiccMsg;aTraId=%d;aStatus=%d", aTraId, aStatus ); TInt ret( KErrNone ); TInt status( KErrNone ); @@ -2988,7 +2970,7 @@ else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::ProcessUiccMsg(ETrIdReadOplRecord) - Error occured when reading OPL record"); -OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_PROCESSUICCMSG, "CMmNetOperatorNameHandler::ProcessUiccMsg - - Error occured when reading OPL record" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_PROCESSUICCMSG_TD, "CMmNetOperatorNameHandler::ProcessUiccMsg - - Error occured when reading OPL record" ); } // There are still records left. Continue reading regardless of @@ -3006,7 +2988,7 @@ if ( ! iOplListAvailable ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::ProcessUiccMsg(ETrIdReadOplRecord) - No OPL records available"); -OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_PROCESSUICCMSG, "CMmNetOperatorNameHandler::ProcessUiccMsg - No OPL records available" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_PROCESSUICCMSG_TD, "CMmNetOperatorNameHandler::ProcessUiccMsg - No OPL records available" ); // Reset array iOperatorPlmnListTable.Reset(); status = KErrNotFound; @@ -3042,7 +3024,7 @@ default: { TFLOGSTRING("TSY:CMmNetOperatorNameHandler::ProcessUiccMsg - unknown transaction ID" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_PROCESSUICCMSG, "CMmNetOperatorNameHandler::ProcessUiccMsg - unknown transaction ID" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_PROCESSUICCMSG_TD, "CMmNetOperatorNameHandler::ProcessUiccMsg - unknown transaction ID" ); break; } } @@ -3064,7 +3046,7 @@ ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::SendReadPnnReq"); -OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_SENDREADPNNREQ, "CMmNetOperatorNameHandler::SendReadPnnReq" ); +OstTrace0( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_SENDREADPNNREQ_TD, "CMmNetOperatorNameHandler::SendReadPnnReq" ); // Store Country code and Network code. iEonsName.iMCC = aMCC; @@ -3092,7 +3074,7 @@ void CMmNetOperatorNameHandler::UiccOperatorReqReadPnn( TUint8 aPnnIdentifier ) { TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::UiccOperatorReqReadPnn, PNN Identifier: %d", aPnnIdentifier); -OstTraceExt1( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCOPERATORREQREADPNN, "CMmNetOperatorNameHandler::UiccOperatorReqReadPnn;aPnnIdentifier=%hhu", aPnnIdentifier ); +OstTraceExt1( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCOPERATORREQREADPNN_TD, "CMmNetOperatorNameHandler::UiccOperatorReqReadPnn;aPnnIdentifier=%hhu", aPnnIdentifier ); TUint8 fileIdSfi( 0x19 ); // Default value for 3G // Get card type to define SFI @@ -3131,7 +3113,7 @@ const TDesC8& aFileData ) { TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - Status value: %d", aStatus); -OstTrace1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_UICCOPERATORREQREADPNN, "CMmNetOperatorNameHandler::UiccOperatorReqReadPnn;aStatus=%d", aStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_UICCOPERATORREQREADPNN_TD, "CMmNetOperatorNameHandler::UiccOperatorReqReadPnn;aStatus=%d", aStatus ); // Is there PNN record available. Value initialize to EFalse. TBool pnnRecordAvailable( EFalse ); @@ -3204,17 +3186,17 @@ TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - iEonsName.iPNNIdentifier: %d", iEonsName.iPNNIdentifier); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - iCustomEonsNameString: %S", &iCustomEonsNameString); -OstTrace1( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iEonsName.iMCC=%u", iEonsName.iMCC ); -OstTrace1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iEonsName.iMNC=%u", iEonsName.iMNC ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iEonsName.iLongName=%S", iEonsName.iLongName ); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iEonsName.iShortName=%S", iEonsName.iShortName ); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iEonsName.iPNNIdentifier=%hhu", iEonsName.iPNNIdentifier ); -OstTraceExt1( TRACE_NORMAL, DUP23_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iCustomEonsNameString=%S", iCustomEonsNameString ); +OstTrace1( TRACE_NORMAL, CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iEonsName.iMCC=%u", iEonsName.iMCC ); +OstTrace1( TRACE_NORMAL, DUP1_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iEonsName.iMNC=%u", iEonsName.iMNC ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iEonsName.iLongName=%S", iEonsName.iLongName ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iEonsName.iShortName=%S", iEonsName.iShortName ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iEonsName.iPNNIdentifier=%hhu", iEonsName.iPNNIdentifier ); +OstTraceExt1( TRACE_NORMAL, DUP23_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iCustomEonsNameString=%S", iCustomEonsNameString ); } else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - Error occured, data not available"); -OstTrace0( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL- Error occured, data not available" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL- Error occured, data not available" ); // Data not available. Cause may be that file does not exist // on (U)SIM card, or requested record does not exist in file. @@ -3229,7 +3211,7 @@ if ( iFromGetOperatorName ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL, continue to complete NotifyCurrentNetworkChange"); -OstTrace0( TRACE_NORMAL, DUP6_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnLcontinue to complete NotifyCurrentNetworkChange" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnLcontinue to complete NotifyCurrentNetworkChange" ); // Set flag back to EFalse. iFromGetOperatorName = EFalse; @@ -3245,14 +3227,14 @@ if ( pnnRecordAvailable ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - EONS name available"); -OstTrace0( TRACE_NORMAL, DUP7_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL- EONS name available" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL- EONS name available" ); // EONS names found. CopyEonsName( iNetworkData ); } else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - EONS name not available, NITZ name will checked"); -OstTrace0( TRACE_NORMAL, DUP8_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL- EONS name not available, NITZ name will checked" ); +OstTrace0( TRACE_NORMAL, DUP8_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL- EONS name not available, NITZ name will checked" ); // Need to check NITZ name as EONS name not available. @@ -3278,12 +3260,12 @@ TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL, Operator short name: %S", &iNetworkData.iShortName); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL, RMmCustomAPI::TOperatorNameInfo, Name: %S", &iOperNameInfo.iName); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL, RMmCustomAPI::TOperatorNameInfo, Type: %d", iOperNameInfo.iType); -OstTrace0( TRACE_NORMAL, DUP9_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - Completing" ); -OstTraceExt1( TRACE_NORMAL, DUP10_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iNetworkData.iDisplayTag=%S", iNetworkData.iDisplayTag ); -OstTraceExt1( TRACE_NORMAL, DUP11_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iNetworkData.iLongName=%S", iNetworkData.iLongName ); -OstTraceExt1( TRACE_NORMAL, DUP12_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iNetworkData.iShortName=%S", iNetworkData.iShortName ); -OstTraceExt1( TRACE_NORMAL, DUP13_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iOperNameInfo.iName=%S", iOperNameInfo.iName ); -OstTrace1( TRACE_NORMAL, DUP14_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iOperNameInfo.iType=%d", iOperNameInfo.iType ); +OstTrace0( TRACE_NORMAL, DUP9_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - Completing" ); +OstTraceExt1( TRACE_NORMAL, DUP10_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iNetworkData.iDisplayTag=%S", iNetworkData.iDisplayTag ); +OstTraceExt1( TRACE_NORMAL, DUP11_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iNetworkData.iLongName=%S", iNetworkData.iLongName ); +OstTraceExt1( TRACE_NORMAL, DUP12_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iNetworkData.iShortName=%S", iNetworkData.iShortName ); +OstTraceExt1( TRACE_NORMAL, DUP13_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iOperNameInfo.iName=%S", iOperNameInfo.iName ); +OstTrace1( TRACE_NORMAL, DUP14_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iOperNameInfo.iType=%d", iOperNameInfo.iType ); // Complete ECustomGetOperatorNameIPC. // Packed parameter: a RMmCustomAPI::TOperatorNameInfo. @@ -3311,9 +3293,9 @@ if ( iFromGetManualSearchOperatorName ) { TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL, continue handling Manual Network search - Index value: %d", iManualSearchIndexValue); -OstTraceExt1( TRACE_NORMAL, DUP15_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iManualSearchIndexValue=%hhu", iManualSearchIndexValue ); +OstTraceExt1( TRACE_NORMAL, DUP15_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iManualSearchIndexValue=%hhu", iManualSearchIndexValue ); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - Operator display tag: %S", &iNetworkData.iDisplayTag); -OstTraceExt1( TRACE_NORMAL, DUP16_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - Operator display tag;iNetworkData.iDisplayTag=%S", iNetworkData.iDisplayTag ); +OstTraceExt1( TRACE_NORMAL, DUP16_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - Operator display tag;iNetworkData.iDisplayTag=%S", iNetworkData.iDisplayTag ); // Set flag back to EFalse. iFromGetManualSearchOperatorName = EFalse; @@ -3322,7 +3304,7 @@ if ( pnnRecordAvailable ) { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - Manual search - EONS name available"); -OstTrace0( TRACE_NORMAL, DUP17_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL- Manual search - EONS name available" ); +OstTrace0( TRACE_NORMAL, DUP17_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL- Manual search - EONS name available" ); // Check is EONS Long name exist. // If no Long EONS name there is no short EONS name either. @@ -3332,7 +3314,7 @@ iManualSearchNetworkList[iManualSearchIndexValue].iLongName.Copy( iEonsName.iLongName ); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - Operator long name: %S", &iEonsName.iLongName); -OstTraceExt1( TRACE_NORMAL, DUP18_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL- Operator long name;iEonsName.iLongName=%S", iEonsName.iLongName ); +OstTraceExt1( TRACE_NORMAL, DUP18_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL- Operator long name;iEonsName.iLongName=%S", iEonsName.iLongName ); // Check is EONS Short name exist. @@ -3342,14 +3324,14 @@ iManualSearchNetworkList[iManualSearchIndexValue].iShortName.Copy( iEonsName.iShortName ); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - Operator short name: %S", &iEonsName.iShortName); -OstTraceExt1( TRACE_NORMAL, DUP19_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iEonsName.iShortName=%S", iEonsName.iShortName ); +OstTraceExt1( TRACE_NORMAL, DUP19_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iEonsName.iShortName=%S", iEonsName.iShortName ); } } } else { TFLOGSTRING("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - Manual search, No EONS name available, DisplayTag name added to Long and Short names"); -OstTrace0( TRACE_NORMAL, DUP20_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL- Manual search, No EONS name available, DisplayTag name added to Long and Short names" ); +OstTrace0( TRACE_NORMAL, DUP20_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL- Manual search, No EONS name available, DisplayTag name added to Long and Short names" ); // If no EONS name, copy DisplayTag to long and short name // buffers. @@ -3367,8 +3349,8 @@ TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - Operator long name: %S", &iNetworkData.iLongName); TFLOGSTRING2("TSY: CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL - Operator short name: %S", &iNetworkData.iShortName); -OstTraceExt1( TRACE_NORMAL, DUP21_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iNetworkData.iLongName=%S", iNetworkData.iLongName ); -OstTraceExt1( TRACE_NORMAL, DUP22_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iNetworkData.iLongName=%S", iNetworkData.iLongName ); +OstTraceExt1( TRACE_NORMAL, DUP21_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iNetworkData.iLongName=%S", iNetworkData.iLongName ); +OstTraceExt1( TRACE_NORMAL, DUP22_CMMNETOPERATORNAMEHANDLER_UICCOPERATORRESPREADPNNL_TD, "CMmNetOperatorNameHandler::UiccOperatorRespReadPnnL;iNetworkData.iLongName=%S", iNetworkData.iLongName ); } // Update index value. diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmpacketcontextmesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmpacketcontextmesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmpacketcontextmesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -37,6 +37,8 @@ #include #include #include +#include +#include #if (NCP_COMMON_S60_VERSION_SUPPORT==S60_VERSION_32) #include @@ -56,6 +58,15 @@ // Offset to subblock length in EIsiSubBlockTypeId8Len8 subblock const TUint KSubblockTypeId8Len8LengthOffset = 1; +// Can be used as parameter in places where tr id is needed, but +// the value is not relevant +const TUint8 KNoTrId = 0; + +// Masks for getting bytes out of name_add_ind and name_remove_ind +const TUint KMaskNameByte1 = 0x000000FF; +const TUint KMaskNameByte2 = 0x0000FF00; +const TUint KMaskNameByte3 = 0x00FF0000; + // MACROS //None @@ -91,7 +102,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::NewL." ); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_NEWL, "CMmPacketContextMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_NEWL_TD, "CMmPacketContextMessHandler::NewL" ); CMmPacketContextMessHandler* packetContextMessHandler = new ( ELeave ) CMmPacketContextMessHandler(); @@ -145,6 +156,11 @@ aPhoNetReceiver->RegisterL( packetContextMessHandler, PN_MODEM_CALL, CALL_MODEM_RESOURCE_RESP ); + aPhoNetReceiver->RegisterL( + packetContextMessHandler, PN_NAMESERVICE, PNS_NAME_ADD_IND ); + aPhoNetReceiver->RegisterL( + packetContextMessHandler, PN_NAMESERVICE, PNS_NAME_REMOVE_IND ); + CleanupStack::Pop( packetContextMessHandler ); return packetContextMessHandler; @@ -159,7 +175,7 @@ { //None TFLOGSTRING("TSY: CMmPacketContextMessHandler::CMmPacketContextMessHandler" ); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CMMPACKETCONTEXTMESSHANDLER, "CMmPacketContextMessHandler::CMmPacketContextMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CMMPACKETCONTEXTMESSHANDLER_TD, "CMmPacketContextMessHandler::CMmPacketContextMessHandler" ); } @@ -172,7 +188,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::ConstructL."); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CONSTRUCTL, "CMmPacketContextMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CONSTRUCTL_TD, "CMmPacketContextMessHandler::ConstructL" ); #ifdef DUMMY_NIF_PEP_FOR_PACKET_DATA_TESTING_DOS iTransIdForProxies = 0; @@ -199,7 +215,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::~CMmPacketContextMessHandler." ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_CMMPACKETCONTEXTMESSHANDLER, "CMmPacketContextMessHandler::~CMmPacketContextMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_CMMPACKETCONTEXTMESSHANDLER_TD, "CMmPacketContextMessHandler::~CMmPacketContextMessHandler" ); // Delete owned iMmPipeControl object if ( iMmPipeController ) @@ -233,7 +249,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::ReceiveMessageL" ); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketContextMessHandler::ReceiveMessageL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketContextMessHandler::ReceiveMessageL" ); TInt resource( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) ); TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); @@ -334,7 +350,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::ReceiveMessageL. Switch messageId case default"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketContextMessHandler::ReceiveMessageL" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketContextMessHandler::ReceiveMessageL" ); //None break; @@ -358,11 +374,35 @@ break; } + case PN_NAMESERVICE: + { + switch( messageId ) + { + case PNS_NAME_ADD_IND: + { + PnsNameAddInd( aIsiMessage ); + break; + } + case PNS_NAME_REMOVE_IND: + { + PnsNameRemoveInd( aIsiMessage ); + break; + } + default: + { + TFLOGSTRING2("TSY: CMmPacketContextMessHandler::ReceiveMessageL - PN_NAMESERVICE - unknown msgId: %d", messageId); + OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketContextMessHandler::ReceiveMessageL;unknown messageId=%d", messageId ); + break; + } + } + break; + } + default: { - TFLOGSTRING("TSY: CMmPacketContextMessHandler::ReceiveMessageL. Switch resource case default"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketContextMessHandler::ReceiveMessageL" ); +TFLOGSTRING("TSY: CMmPacketContextMessHandler::ReceiveMessageL. Switch resource case default"); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketContextMessHandler::ReceiveMessageL" ); //None break; @@ -380,7 +420,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextIdCreateReq. TransId: %d", aCreateContextIdTransId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDCREATEREQ, "CMmPacketContextMessHandler::GpdsContextIdCreateReq;aCreateContextIdTransId=%hhu", aCreateContextIdTransId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDCREATEREQ_TD, "CMmPacketContextMessHandler::GpdsContextIdCreateReq;aCreateContextIdTransId=%hhu", aCreateContextIdTransId ); //Append data for ISI message TBuf8<1> data; @@ -406,7 +446,7 @@ ISI_HEADER_SIZE + GPDS_CONTEXT_ID_CREATE_RESP_OFFSET_UTID ) ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextIdCreateResp.CreateTraId: %d", createContextIdTraId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDCREATERESP, "CMmPacketContextMessHandler::GpdsContextIdCreateResp;createContextIdTraId=%hhu", createContextIdTraId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDCREATERESP_TD, "CMmPacketContextMessHandler::GpdsContextIdCreateResp;createContextIdTraId=%hhu", createContextIdTraId ); // context stuff exists TInt ret = iContextList->CreateContextIdTraIdOK( createContextIdTraId ); @@ -427,7 +467,7 @@ } else { - InitialiseContextPhase3( status, contextId ); + InitialiseContextPhase3( status, contextId, createContextIdTraId ); } } //no else @@ -443,7 +483,7 @@ { TFLOGSTRING( "TSY: CMmPacketContextMessHandler::GpdsContextIdCreateInd." ); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDCREATEIND, "CMmPacketContextMessHandler::GpdsContextIdCreateInd" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDCREATEIND_TD, "CMmPacketContextMessHandler::GpdsContextIdCreateInd" ); // Get context id TUint8 contextId( aIsiMessage.Get8bit( @@ -471,7 +511,7 @@ { // Creation of context id succeeded -> Call // InitialiseContextPhase3L with GPDS_OK - InitialiseContextPhase3( GPDS_OK, contextId ); + InitialiseContextPhase3( GPDS_OK, contextId, KNoTrId ); } // no else } @@ -489,9 +529,9 @@ { TFLOGSTRING3( "TSY: CMmPacketContextMessHandler::GpdsLlConfigureReq. TransId: %d, ContextId: %d", aTransactionId, aContextId ); -OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsLlConfigureReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId ); +OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsLlConfigureReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId ); TFLOGSTRING2( "TSY: CMmPacketContextMessHandler::GpdsLlConfigureReq. PipeHandle: %d", aPipeHandle ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsLlConfigureReq;aPipeHandle=%hhu", aPipeHandle ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsLlConfigureReq;aPipeHandle=%hhu", aPipeHandle ); // Set the message data that consists of three parameters TBuf8 messageData; @@ -518,7 +558,7 @@ { TFLOGSTRING( "TSY: CMmPacketContextMessHandler::GpdsLlConfigureResp."); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGURERESP, "CMmPacketContextMessHandler::GpdsLlConfigureResp" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGURERESP_TD, "CMmPacketContextMessHandler::GpdsLlConfigureResp" ); // Get transaction id TUint8 transActionId( aIsiMessage.Get8bit( @@ -559,7 +599,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsLlConfigureResp. Initialisation Complete failed" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGURERESP, "CMmPacketContextMessHandler::GpdsLlConfigureResp, Initialisation Complete failed" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSLLCONFIGURERESP_TD, "CMmPacketContextMessHandler::GpdsLlConfigureResp, Initialisation Complete failed" ); } //no else } @@ -628,7 +668,7 @@ { TFLOGSTRING3("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. TransId: %d ContextId: %d", aTransactionId, aContextId ); -OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsContextConfigureReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId ); +OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsContextConfigureReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId ); // Initializing ret value to KErrNone TInt ret( KErrNone ); @@ -672,7 +712,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. signalling indication ON"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsContextConfigureReq, signalling indication ON" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsContextConfigureReq, signalling indication ON" ); TBuf8 tempSbBuffer; TIsiSubBlock flagInfoSubBlock( @@ -697,7 +737,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. DNS address request indication indication ON"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsContextConfigureReq, DNS address request indication indication ON" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsContextConfigureReq, DNS address request indication indication ON" ); TInt ret( iContextList->SetDNSAddressInfoToContextInfo( aContextId ) ); @@ -705,7 +745,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. DNS Requested"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsContextConfigureReq, DNS Requested" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsContextConfigureReq, DNS Requested" ); TBuf8 tempDnsAddrInfo; TIsiSubBlock reqInfoSubBlock( @@ -737,7 +777,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. PCSCF Requested"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsContextConfigureReq, PCSCF Requested" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsContextConfigureReq, PCSCF Requested" ); TBuf8 tempPscfAddrInfo; TIsiSubBlock reqInfoSubBlock( @@ -763,7 +803,7 @@ if ( aMediaAuthorization || aPacketFilterPtr ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. MediaAuthorization || PacketFilterPtr"); -OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsContextConfigureReq, MediaAuthorization || PacketFilterPtr" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsContextConfigureReq, MediaAuthorization || PacketFilterPtr" ); TBuf8 gpdsTftInfoSbBuffer; TIsiSubBlock gpdsTftInfoSubBlock( @@ -789,7 +829,7 @@ if ( KErrNone == ret ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. there were no errors"); -OstTrace0( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketContextMessHandler::GpdsContextConfigureReq, there were no errors" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketContextMessHandler::GpdsContextConfigureReq, there were no errors" ); // Add GPDS_COMP_INFO subblock // sub block of Configure Req @@ -877,7 +917,7 @@ ret = iContextList->GetContextNameByContextId( contextId, contextName ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextConfigureResp. GetContextNameByContextId returns:%d", ret); -OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP, "CMmPacketContextMessHandler::GpdsContextConfigureResp;returns=%d", ret ); +OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP_TD, "CMmPacketContextMessHandler::GpdsContextConfigureResp;returns=%d", ret ); // Check that transactionId and context exists if ( transactionId == proxyId && KErrNone == ret ) @@ -888,7 +928,7 @@ ISI_HEADER_SIZE + GPDS_CONTEXT_CONFIGURE_RESP_OFFSET_STATUS ) ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextConfigureResp. status: %d", status); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP, "CMmPacketContextMessHandler::GpdsContextConfigureResp;status=%hhu", status ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP_TD, "CMmPacketContextMessHandler::GpdsContextConfigureResp;status=%hhu", status ); if ( GPDS_OK == status ) { @@ -899,13 +939,13 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureResp. KTIntNotDefined != configurationType"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP, "CMmPacketContextMessHandler::GpdsContextConfigureResp, KTIntNotDefined != configurationType" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP_TD, "CMmPacketContextMessHandler::GpdsContextConfigureResp, KTIntNotDefined != configurationType" ); if( TPacketDataConfigBase::KConfigGPRS == configurationType ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureResp. configurationType == KConfigGPRS"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP, "CMmPacketContextMessHandler::GpdsContextConfigureResp, configurationType == KConfigGPRS" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTCONFIGURERESP_TD, "CMmPacketContextMessHandler::GpdsContextConfigureResp, configurationType == KConfigGPRS" ); // authentication info included in setconfig. Send auth reg RPacketContext::TContextConfigGPRS* config = @@ -1059,7 +1099,7 @@ { TFLOGSTRING3("TSY: CMmPacketContextMessHandler::GpdsContextActivateReq. TransId: %d ContextId: %d", aTransactionId, aContextId ); -OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEREQ, "CMmPacketContextMessHandler::GpdsContextActivateReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId ); +OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEREQ_TD, "CMmPacketContextMessHandler::GpdsContextActivateReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId ); TInt ret(iContextList->SetActivationTraId( aContextId, aTransactionId )); @@ -1105,9 +1145,11 @@ if ( KErrNone == ret ) { + // Use channel id as transaction id + TUint8 channelId( iContextList->ProxyIdByContextId( aContextId ) ); // Send Isi message via Phonet ret = iPhoNetSender->Send( PN_GPDS, - aTransactionId, GPDS_CONTEXT_ACTIVATE_REQ, gpdsActivateReq ); + channelId, GPDS_CONTEXT_ACTIVATE_REQ, gpdsActivateReq ); } // no else @@ -1134,7 +1176,7 @@ iContextList->GetAndResetActivationTraId( contextId ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivatingInd. ContextId: %d", contextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextActivatingInd;contextId=%hhu", contextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextActivatingInd;contextId=%hhu", contextId ); CMmDataPackage data; TInt dialUpContext( KTIntNotDefined ); @@ -1145,7 +1187,7 @@ ret = iContextList->GetContextNameByContextId( contextId, contextName ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivatingInd. GetContextNameByContextId returns: %d", ret ); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextActivatingInd;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextActivatingInd;ret=%d", ret ); // context not found, check dial-up context if ( KErrArgument == ret ) @@ -1165,7 +1207,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivatingInd. KConfigGPRS"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextActivatingInd, KConfigGPRS" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextActivatingInd, KConfigGPRS" ); RPacketContext::TContextConfigGPRS* config = reinterpret_cast( @@ -1202,7 +1244,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivatingInd. apn is not null"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextActivatingInd, apn is not null" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextActivatingInd, apn is not null" ); config->iAccessPointName.Copy( apn ); } @@ -1222,7 +1264,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivatingInd. KConfigRel99Rel4"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextActivatingInd, KConfigRel99Rel4" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextActivatingInd, KConfigRel99Rel4" ); RPacketContext::TContextConfigR99_R4* config = reinterpret_cast( @@ -1259,7 +1301,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivatingInd. accesspointname is not null"); -OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextActivatingInd, accesspointname is not null" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextActivatingInd, accesspointname is not null" ); config->iAccessPointName.Copy( apn ); } @@ -1348,7 +1390,7 @@ ISI_HEADER_SIZE + GPDS_CONTEXT_ACTIVATE_IND_OFFSET_CID ) ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. ContextId: %d", contextId); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;contextId=%hhu", contextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;contextId=%hhu", contextId ); TUint sbStartOffSet( 0 ); @@ -1357,7 +1399,7 @@ GetContextNameByContextId( contextId, contextName ) ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. GetContextNameByContextId returns:%d", ret ); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;ret=%d", ret ); if( KErrArgument == ret ) { @@ -1401,7 +1443,7 @@ // no else TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. pdpAddress length:%d", pdpAddress.Length() ); -OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL; pdpAddress length=%d", pdpAddress.Length() ); +OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL; pdpAddress length=%d", pdpAddress.Length() ); // Get PDP address if ( 0 < pdpAddress.Length() ) @@ -1419,7 +1461,7 @@ sbStartOffSet ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. find sub block. retValue:%d", retValue ); -OstTrace1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;retValue=%d", retValue ); +OstTrace1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;retValue=%d", retValue ); if ( KErrNone == retValue ) { @@ -1437,7 +1479,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. apn.Ptr is not null"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL, apn.Ptr is not null" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL, apn.Ptr is not null" ); config.iAccessPointName.Copy( apn ); } @@ -1478,7 +1520,7 @@ // no else TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. primary DNS address length:%d", pDnsAddress.Length() ); -OstTrace1( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;primary DNS address length=%d", pDnsAddress.Length() ); +OstTrace1( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;primary DNS address length=%d", pDnsAddress.Length() ); // Get Primary DNS address. if ( 0 < pDnsAddress.Length() ) @@ -1508,7 +1550,7 @@ // no else TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. secondary DNS address length:%d", sDnsAddress.Length()); -OstTrace1( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;secondary DNS address length=%d", sDnsAddress.Length() ); +OstTrace1( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;secondary DNS address length=%d", sDnsAddress.Length() ); // Get Secondary DNS address. if ( 0 < sDnsAddress.Length() ) @@ -1539,13 +1581,13 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. GPDS_PDP_DCOMP_DEFAULT != dataCompression"); -OstTrace0( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL, GPDS_PDP_DCOMP_DEFAULT != dataCompression" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL, GPDS_PDP_DCOMP_DEFAULT != dataCompression" ); if ( GPDS_PDP_DCOMP_ON == dataCompression ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. GPDS_PDP_DCOMP_ON == dataCompression"); -OstTrace0( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL, GPDS_PDP_DCOMP_ON == dataCompression" ); +OstTrace0( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL, GPDS_PDP_DCOMP_ON == dataCompression" ); if ( !( config.iPdpCompression & RPacketContext::KPdpDataCompression ) ) @@ -1572,13 +1614,13 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. GPDS_PDP_DCOMP_DEFAULT != headerCompression"); -OstTrace0( TRACE_NORMAL, DUP9_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateInd, GPDS_PDP_DCOMP_DEFAULT != headerCompressionL" ); +OstTrace0( TRACE_NORMAL, DUP9_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateInd, GPDS_PDP_DCOMP_DEFAULT != headerCompressionL" ); if ( GPDS_PDP_DCOMP_ON == headerCompression ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. GPDS_PDP_DCOMP_ON == headerCompression"); -OstTrace0( TRACE_NORMAL, DUP10_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL, GPDS_PDP_DCOMP_ON == headerCompression" ); +OstTrace0( TRACE_NORMAL, DUP10_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL, GPDS_PDP_DCOMP_ON == headerCompression" ); if ( !( config.iPdpCompression & RPacketContext::KPdpHeaderCompression ) ) @@ -1618,7 +1660,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. add to TLV struct"); -OstTrace0( TRACE_NORMAL, DUP11_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL, add to TLV struct" ); +OstTrace0( TRACE_NORMAL, DUP11_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL, add to TLV struct" ); // Type is always ipv6 if ( KIpv6AddressLen == pDnsAddress.Length() ) @@ -1640,7 +1682,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. add secondary DNS"); -OstTrace0( TRACE_NORMAL, DUP12_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL, add secondary DNS" ); +OstTrace0( TRACE_NORMAL, DUP12_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL, add secondary DNS" ); // Type is allways ipv6 if ( KIpv6AddressLen == sDnsAddress.Length() ) @@ -1667,7 +1709,7 @@ sbStartOffSet ); TFLOGSTRING2("TSY: GPDS_SHARED_PCSCF_ADDRESS_INFO sub-block, retValue %d.", retValue ); -OstTrace1( TRACE_NORMAL, DUP13_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;GPDS_SHARED_PCSCF_ADDRESS_INFO sub-block retValue=%d", retValue ); +OstTrace1( TRACE_NORMAL, DUP13_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;GPDS_SHARED_PCSCF_ADDRESS_INFO sub-block retValue=%d", retValue ); if( KErrNone == retValue ) { @@ -1683,7 +1725,7 @@ // no else TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. PCSCF address length:%d", pcScfAddress.Length() ); -OstTrace1( TRACE_NORMAL, DUP14_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;PCSCF address length=%d", pcScfAddress.Length() ); +OstTrace1( TRACE_NORMAL, DUP14_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;PCSCF address length=%d", pcScfAddress.Length() ); // PCSCF address types IPv6 and IPv4 are valid // The length of IPv4 address is 4 @@ -1731,7 +1773,7 @@ // no else TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. tlv length:%d", tlvLen ); -OstTrace1( TRACE_NORMAL, DUP15_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;tlvLen=%d", tlvLen ); +OstTrace1( TRACE_NORMAL, DUP15_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;tlvLen=%d", tlvLen ); // Initialise buffer if( 0 < tlvLen ) @@ -1760,7 +1802,7 @@ ret = smallTLV.AppendItemL( pcoId, pDnsBufferPtr ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd.EEtelPcktDNSServerAddressRequest, Prim. DNS, AppendItemL ret=%d ",ret ); -OstTrace1( TRACE_NORMAL, DUP16_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;Prim. DNS, AppendItemL ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP16_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;Prim. DNS, AppendItemL ret=%d", ret ); } // no else @@ -1775,7 +1817,7 @@ ret = smallTLV.AppendItemL( pcoId, sDnsBufferPtr ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd.EEtelPcktDNSServerAddressRequest, Sec. DNS, AppendItemL ret=%d ",ret ); -OstTrace1( TRACE_NORMAL, DUP17_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL; Sec. DNS, AppendItemL ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP17_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL; Sec. DNS, AppendItemL ret=%d", ret ); } // no else @@ -1792,7 +1834,7 @@ ret = smallTLV.AppendItemL( pcoId, pCSCFBufferPtr ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd.EEtelPcktPCSCFAddressRequest AppendItemL ret=%d ",ret ); -OstTrace1( TRACE_NORMAL, DUP18_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;EEtelPcktPCSCFAddressRequest AppendItemL ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP18_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;EEtelPcktPCSCFAddressRequest AppendItemL ret=%d", ret ); } // no else @@ -1807,7 +1849,7 @@ ret = smallTLV.AppendItemL( pcoId, signallingFlagBufferPtr ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd.EEtelPcktIMCNMSSubsystemSignallingFlag AppendItemL ret=%d ",ret ); -OstTrace1( TRACE_NORMAL, DUP19_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL;EEtelPcktIMCNMSSubsystemSignallingFlag AppendItemL ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP19_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL;EEtelPcktIMCNMSSubsystemSignallingFlag AppendItemL ret=%d", ret ); } // no else } @@ -1829,7 +1871,7 @@ // no else TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateInd. End point."); -OstTrace0( TRACE_NORMAL, DUP20_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL, "CMmPacketContextMessHandler::GpdsContextActivateIndL, End point" ); +OstTrace0( TRACE_NORMAL, DUP20_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEINDL_TD, "CMmPacketContextMessHandler::GpdsContextActivateIndL, End point" ); } // ----------------------------------------------------------------------------- @@ -1843,7 +1885,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextActivateFailInd."); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEFAILIND, "CMmPacketContextMessHandler::GpdsContextActivateFailInd" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTACTIVATEFAILIND_TD, "CMmPacketContextMessHandler::GpdsContextActivateFailInd" ); // initialise struct for completion #if (NCP_COMMON_S60_VERSION_SUPPORT==S60_VERSION_32) @@ -1862,6 +1904,11 @@ TInt ret( iContextList-> GetContextNameByContextId( contextId, contextName ) ); + if ( KErrNone != ret ) + { + ret = iContextList->DialUpContextName( contextId, contextName ); + } + if ( KErrNone == ret ) { TUint8 cause( aIsiMessage.Get8bit( ISI_HEADER_SIZE + @@ -1948,7 +1995,7 @@ GetContextNameByContextId( contextId, contextName ) ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextModifyInd. ContextId:%d", contextId); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYIND, "CMmPacketContextMessHandler::GpdsContextModifyInd;contextId=%hhu", contextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYIND_TD, "CMmPacketContextMessHandler::GpdsContextModifyInd;contextId=%hhu", contextId ); if( KErrArgument == ret ) { @@ -2014,7 +2061,7 @@ { TUint8 transactionId( GenerateTraId( contextId ) ); TFLOGSTRING3("TSY: CMmPacketContextMessHandler::GpdsContextDeactivateReq. TransId: %d ContextId: %d", transactionId, contextId ); -OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATEREQ, "CMmPacketContextMessHandler::GpdsContextDeactivateReq;transactionId=%hhu;contextId=%hhu", transactionId, contextId ); +OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATEREQ_TD, "CMmPacketContextMessHandler::GpdsContextDeactivateReq;transactionId=%hhu;contextId=%hhu", transactionId, contextId ); // Set the message data that consists of one parameter TBuf8 messageData; messageData.Append( contextId ); @@ -2026,7 +2073,7 @@ else { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextDeactivateReq. Context ID not found, return KErrNotFound" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATEREQ, "CMmPacketContextMessHandler::GpdsContextDeactivateReq. Context ID not found, return KErrNotFound" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATEREQ_TD, "CMmPacketContextMessHandler::GpdsContextDeactivateReq. Context ID not found, return KErrNotFound" ); ret = KErrNotFound; } return ret; @@ -2042,7 +2089,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextDeactivateRespL."); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATERESPL, "CMmPacketContextMessHandler::GpdsContextDeactivateRespL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATERESPL_TD, "CMmPacketContextMessHandler::GpdsContextDeactivateRespL" ); // Get transaction id TUint8 transactionId( aIsiMessage.Get8bit( @@ -2080,7 +2127,7 @@ { TFLOGSTRING( "TSY: CMmPacketContextMessHandler::GpdsContextDeactivateRespL. SetPipeResetTraId failed " ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATERESPL, "CMmPacketContextMessHandler::GpdsContextDeactivateRespL, SetPipeResetTraId failed" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATERESPL_TD, "CMmPacketContextMessHandler::GpdsContextDeactivateRespL, SetPipeResetTraId failed" ); } // no else } @@ -2113,7 +2160,7 @@ // no else TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextDeactivateRespL. Error(0=OK): %d ", found ); -OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATERESPL, "CMmPacketContextMessHandler::GpdsContextDeactivateRespL;Error(0=OK)=%d", found ); +OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATERESPL_TD, "CMmPacketContextMessHandler::GpdsContextDeactivateRespL;Error(0=OK)=%d", found ); // check if incoming call allowation is requested // (for allow incoming call feature) @@ -2162,7 +2209,7 @@ ISI_HEADER_SIZE + GPDS_CONTEXT_DEACTIVATING_IND_OFFSET_CID ) ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextDeactivatingInd. Context id: %d", contextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextDeactivatingInd;contextId=%hhu", contextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextDeactivatingInd;contextId=%hhu", contextId ); TInfoName contextName; TInt ret( iContextList-> @@ -2198,7 +2245,7 @@ TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextDeactivatingInd. Error(0=OK): %d ", ret ); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATINGIND, "CMmPacketContextMessHandler::GpdsContextDeactivatingInd;Error(0=OK)=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATINGIND_TD, "CMmPacketContextMessHandler::GpdsContextDeactivatingInd;Error(0=OK)=%d", ret ); } // ----------------------------------------------------------------------------- @@ -2212,7 +2259,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextDeactivateInd."); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATEIND, "CMmPacketContextMessHandler::GpdsContextDeactivateInd" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTDEACTIVATEIND_TD, "CMmPacketContextMessHandler::GpdsContextDeactivateInd" ); TUint8 contextId( aIsiMessage.Get8bit( ISI_HEADER_SIZE + GPDS_CONTEXT_DEACTIVATE_IND_OFFSET_CID ) ); @@ -2285,7 +2332,7 @@ TUint8 transactionId( GenerateTraId( contextId ) ); TFLOGSTRING3("TSY: CMmPacketContextMessHandler::GpdsContextStatusReq. TransId: %d ContextId: %d", transactionId, contextId ); -OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTSTATUSREQ, "CMmPacketContextMessHandler::GpdsContextStatusReq;transactionId=%hhu;contextId=%hhu", transactionId, contextId ); +OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTSTATUSREQ_TD, "CMmPacketContextMessHandler::GpdsContextStatusReq;transactionId=%hhu;contextId=%hhu", transactionId, contextId ); if( GPDS_CID_VOID != contextId ) { @@ -2312,7 +2359,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextStatusResp."); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTSTATUSRESP, "CMmPacketContextMessHandler::GpdsContextStatusResp" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTSTATUSRESP_TD, "CMmPacketContextMessHandler::GpdsContextStatusResp" ); // Get context id TUint8 contextId( aIsiMessage.Get8bit( @@ -2371,7 +2418,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextStatusInd."); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTSTATUSIND, "CMmPacketContextMessHandler::GpdsContextStatusInd" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTSTATUSIND_TD, "CMmPacketContextMessHandler::GpdsContextStatusInd" ); // Get context id TUint8 contextId( aIsiMessage.Get8bit( @@ -2421,7 +2468,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextIdDeleteInd."); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDDELETEIND, "CMmPacketContextMessHandler::GpdsContextIdDeleteInd" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDDELETEIND_TD, "CMmPacketContextMessHandler::GpdsContextIdDeleteInd" ); TUint8 contextId( aIsiMessage.Get8bit( ISI_HEADER_SIZE + GPDS_CONTEXT_ID_DELETE_IND_OFFSET_CID ) ); @@ -2443,7 +2490,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextIdDeleteInd. Context name found."); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDDELETEIND, "CMmPacketContextMessHandler::GpdsContextIdDeleteInd, Context name found" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTIDDELETEIND_TD, "CMmPacketContextMessHandler::GpdsContextIdDeleteInd, Context name found" ); // initialise struct for completion #if (NCP_COMMON_S60_VERSION_SUPPORT==S60_VERSION_32) @@ -2503,7 +2550,7 @@ contextName = configuration.iContextName; TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextModifyReq. Context:%s", &contextName ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYREQ, "CMmPacketContextMessHandler::GpdsContextModifyReq;contextName=%S", contextName ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYREQ_TD, "CMmPacketContextMessHandler::GpdsContextModifyReq;contextName=%S", contextName ); TUint8 contextId(iContextList->GetContextIdByContextName( &contextName )); @@ -2515,7 +2562,7 @@ TUint8 modifyTraId( GenerateTraId( contextId ) ); TFLOGSTRING3("TSY: CMmPacketContextMessHandler::GpdsContextModifyReq. TransId: %d ContextId: %d", modifyTraId, contextId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYREQ, "CMmPacketContextMessHandler::GpdsContextModifyReq;modifyTraId=%hhu;contextId=%hhu", modifyTraId, contextId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYREQ_TD, "CMmPacketContextMessHandler::GpdsContextModifyReq;modifyTraId=%hhu;contextId=%hhu", modifyTraId, contextId ); TUint8 tftOperation( 0 ); @@ -2763,7 +2810,7 @@ ISI_HEADER_SIZE + GPDS_CONTEXT_MODIFY_RESP_OFFSET_CID ) ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::GpdsContextModifyResp. Context id:%d", contextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYRESP, "CMmPacketContextMessHandler::GpdsContextModifyResp;contextId=%hhu", contextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYRESP_TD, "CMmPacketContextMessHandler::GpdsContextModifyResp;contextId=%hhu", contextId ); sbStartOffSet = 0; @@ -2771,7 +2818,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextModifyResp. Context != GPDS_CID_VOID"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYRESP, "CMmPacketContextMessHandler::GpdsContextModifyResp, Context != GPDS_CID_VOID" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYRESP_TD, "CMmPacketContextMessHandler::GpdsContextModifyResp, Context != GPDS_CID_VOID" ); // Get transaction id TUint8 transactionId( aIsiMessage.Get8bit( @@ -2822,7 +2869,7 @@ rejectionCauseBuf.Append( rejectionCause ); TFLOGSTRING4("TSY: CMmPacketContextMessHandler::GpdsContextModifyResp. status:%d, errorValue:%d, rejCause:%d", status, errorValue, rejectionCause); -OstTraceExt3( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYRESP, "CMmPacketContextMessHandler::GpdsContextModifyResp;status=%hhu;errorValue=%d;rejectionCause=%hhu", status, errorValue, rejectionCause ); +OstTraceExt3( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_GPDSCONTEXTMODIFYRESP_TD, "CMmPacketContextMessHandler::GpdsContextModifyResp;status=%hhu;errorValue=%d;rejectionCause=%hhu", status, errorValue, rejectionCause ); // Make sure that buffer is empty if rejection code is not there if( KErrNone == rejectionCause ) @@ -2862,7 +2909,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo" ); // Initialize variable which indicates number of components // in PacketFilter @@ -2891,7 +2938,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. GPDS_PDP_TYPE_IPV6"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, GPDS_PDP_TYPE_IPV6" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, GPDS_PDP_TYPE_IPV6" ); AppendGpdsFilterFlowLabelInfo( *aFilter, tftFilterInfo, numberOfSubSubBlocks ); @@ -2903,7 +2950,7 @@ if ( 0 < aFilter->iTOSorTrafficClass ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. TOSorTrafficClass have valid value"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, TOSorTrafficClass have valid value" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, TOSorTrafficClass have valid value" ); AppendGpdsFilterTosInfo( *aFilter, tftFilterInfo, numberOfSubSubBlocks ); } @@ -2914,7 +2961,7 @@ if ( 0 < aFilter->iIPSecSPI ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. IPSecSPI have valid value"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, IPSecSPI have valid value" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, IPSecSPI have valid value" ); AppendGpdsFilterSpiInfo( *aFilter, tftFilterInfo, numberOfSubSubBlocks ); } @@ -2926,7 +2973,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. SrcPortMin and SrcPortMax both have valid value"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, SrcPortMin and SrcPortMax both have valid value" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, SrcPortMin and SrcPortMax both have valid value" ); AppendGpdsFilterSrcPortRangeInfo( *aFilter, tftFilterInfo, numberOfSubSubBlocks ); @@ -2938,7 +2985,7 @@ if ( ( 0 < aFilter->iDestPortMin ) && ( 0 < aFilter->iDestPortMax ) ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. DestPortMin and DestPortMax both have valid value"); -OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, DestPortMin and DestPortMax both have valid value" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, DestPortMin and DestPortMax both have valid value" ); AppendGpdsFilterDstPortRangeInfo( *aFilter, tftFilterInfo, numberOfSubSubBlocks ); @@ -2950,7 +2997,7 @@ if ( 0 < aFilter->iProtocolNumberOrNextHeader ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. ProtocolNumberOrNextHeader have valid value"); -OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, ProtocolNumberOrNextHeader have valid value" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, ProtocolNumberOrNextHeader have valid value" ); AppendGpdsFilterProtocolInfo( *aFilter, tftFilterInfo, numberOfSubSubBlocks ); @@ -2961,7 +3008,7 @@ if ( GPDS_PDP_TYPE_IPV4 == aPdpType ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. aPdpType == GPDS_PDP_TYPE_IPV4"); -OstTrace0( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, aPdpType == GPDS_PDP_TYPE_IPV4" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, aPdpType == GPDS_PDP_TYPE_IPV4" ); AppendGpdsFilterSrcIPv4AddressInfo( *aFilter, tftFilterInfo, numberOfSubSubBlocks ); @@ -2970,7 +3017,7 @@ else if ( GPDS_PDP_TYPE_IPV6 == aPdpType ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. aPdpType == GPDS_PDP_TYPE_IPV6"); -OstTrace0( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo, aPdpType == GPDS_PDP_TYPE_IPV6" ); +OstTrace0( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo, aPdpType == GPDS_PDP_TYPE_IPV6" ); AppendGpdsFilterSrcIPv6AddressInfo( *aFilter, tftFilterInfo, numberOfSubSubBlocks ); @@ -2986,7 +3033,7 @@ aBuffer.Append( tftFilterInfoSubBlock.CompleteSubBlock() ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::AddPacketFilterInfo. Return tftFilterInfo length: %d", tftFilterInfo.Length() ); -OstTrace1( TRACE_NORMAL, DUP9_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO, "CMmPacketContextMessHandler::AddPacketFilterInfo;Return tftFilterInfo length=%d", tftFilterInfo.Length() ); +OstTrace1( TRACE_NORMAL, DUP9_CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTERINFO_TD, "CMmPacketContextMessHandler::AddPacketFilterInfo;Return tftFilterInfo length=%d", tftFilterInfo.Length() ); return static_cast( tftFilterInfo.Length() ); } @@ -3006,7 +3053,7 @@ { TFLOGSTRING3("TSY: CMmPacketContextMessHandler::SetAuthenticationConfigReq. TransId: %d ContextId: %d", aTransactionId, aContextId ); -OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ, "CMmPacketContextMessHandler::SetAuthenticationConfigReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId ); +OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ_TD, "CMmPacketContextMessHandler::SetAuthenticationConfigReq;aTransactionId=%hhu;aContextId=%hhu", aTransactionId, aContextId ); TInt ret( KErrNone ); @@ -3033,7 +3080,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetAuthenticationConfigReq. aAuthInfo.iUsername.Length: %d", aAuthInfo.iUsername.Length()); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ, "CMmPacketContextMessHandler::SetAuthenticationConfigReq;aAuthInfo.iUsername.Length=%d", aAuthInfo.iUsername.Length() ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ_TD, "CMmPacketContextMessHandler::SetAuthenticationConfigReq;aAuthInfo.iUsername.Length=%d", aAuthInfo.iUsername.Length() ); // Add GPDS_USERNAME_INFO subblock // Set the Username info @@ -3073,7 +3120,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetAuthenticationConfigReq. Protocol EProtocolPAP"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ, "CMmPacketContextMessHandler::SetAuthenticationConfigReq, Protocol EProtocolPAP" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ_TD, "CMmPacketContextMessHandler::SetAuthenticationConfigReq, Protocol EProtocolPAP" ); // Add GPDS_PASSWORD_INFO subblock // Set the Password info @@ -3109,7 +3156,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetAuthenticationConfigReq. Protocol EProtocolCHAP"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ, "CMmPacketContextMessHandler::SetAuthenticationConfigReq, Protocol EProtocolCHAP" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ_TD, "CMmPacketContextMessHandler::SetAuthenticationConfigReq, Protocol EProtocolCHAP" ); // Add GPDS_CHALLENGE_INFO subblock // Set the Challenge info @@ -3170,7 +3217,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetAuthenticationConfigReq. return KErrTooBig"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ, "CMmPacketContextMessHandler::SetAuthenticationConfigReq,return KErrTooBig" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ_TD, "CMmPacketContextMessHandler::SetAuthenticationConfigReq,return KErrTooBig" ); ret = KErrTooBig; } @@ -3183,7 +3230,7 @@ numOfSbInMessage ); TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetAuthenticationConfigReq. Send GPDS_CONTEXT_AUTH_REQ message"); -OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ, "CMmPacketContextMessHandler::SetAuthenticationConfigReq, Send GPDS_CONTEXT_AUTH_REQ message" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_SETAUTHENTICATIONCONFIGREQ_TD, "CMmPacketContextMessHandler::SetAuthenticationConfigReq, Send GPDS_CONTEXT_AUTH_REQ message" ); // Send GPDS_CONTEXT_AUTH_REQ message ret = iPhoNetSender->Send( gpdsContextAuthReq.Complete() ); @@ -3204,7 +3251,7 @@ { TFLOGSTRING2( "TSY: CMmPacketContextMessHandler::ExtFuncL. IPC: %d", aIpc ); -OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_EXTFUNCL, "CMmPacketContextMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_EXTFUNCL_TD, "CMmPacketContextMessHandler::ExtFuncL;aIpc=%d", aIpc ); // add the usage of ASSERT MACRO for aDataPackage when it's available TInt ret( KErrNotSupported ); @@ -3233,7 +3280,8 @@ } case EPacketContextActivate: { - ret = iMmPipeController->PnsPipeEnableReq( *aDataPackage ); + // Call ActivatePhase2L + ret = ActivatePhase2( *aDataPackage ); break; } case EPacketContextDeactivate: @@ -3282,11 +3330,12 @@ TFLOGSTRING2("TSY: CMmPacketContextMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_EXTFUNCL, "CMmPacketContextMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_EXTFUNCL_TD, "CMmPacketContextMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc ); break; } } - + TFLOGSTRING2("TSY: CMmPacketContextMessHandler::ExtFuncL exit: 0x%x", ret); + OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_EXTFUNCL_TD, "CMmPacketContextMessHandler::ExtFuncL;ret=%x", ret ); return ret; } @@ -3300,7 +3349,7 @@ { TFLOGSTRING( "TSY: CMmPacketContextMessHandler::InitialiseContext"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXT, "CMmPacketContextMessHandler::InitialiseContext" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXT_TD, "CMmPacketContextMessHandler::InitialiseContext" ); TInt channelId( KTUint8NotDefined ); TInfoName* contextName = NULL; @@ -3429,7 +3478,7 @@ { TFLOGSTRING("TSY: CMmPacketContextGsmWcdmaExt::InitialiseContextPhase2."); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE2, "CMmPacketContextMessHandler::InitialiseContextPhase2" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE2_TD, "CMmPacketContextMessHandler::InitialiseContextPhase2" ); TInt ret( KErrNone ); TUint8 createContextIdTransId( iContextList-> @@ -3455,7 +3504,7 @@ TFLOGSTRING2("TSY: CMmPacketContextGsmWcdmaExt::InitialiseContextPhase2. Error(0=OK) %d", ret ); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE2, "CMmPacketContextMessHandler::InitialiseContextPhase2;Error(0=OK) %d", ret ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE2_TD, "CMmPacketContextMessHandler::InitialiseContextPhase2;Error(0=OK) %d", ret ); } // no else } @@ -3470,12 +3519,13 @@ // ----------------------------------------------------------------------------- // void CMmPacketContextMessHandler::InitialiseContextPhase3( - const TUint8 aStatus, - const TUint8 aContextId ) + TUint8 aStatus, + TUint8 aContextId, + TUint8 aTrId ) { TFLOGSTRING3("TSY: CMmPacketContextGsmWcdmaExt::InitialiseContextPhase3. ContextId:%d aStatus:%d", aContextId, aStatus ); -OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE3, "CMmPacketContextMessHandler::InitialiseContextPhase3;aContextId=%d;aStatus=%d", aContextId, aStatus ); +OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE3_TD, "CMmPacketContextMessHandler::InitialiseContextPhase3;aContextId=%d;aStatus=%d", aContextId, aStatus ); TInt ret( KErrGeneral ); @@ -3517,7 +3567,7 @@ GetContextNameByContextId( aContextId, contextname ) ); TFLOGSTRING2("TSY: CMmPacketContextGsmWcdmaExt::InitialiseContextPhase3. Error:%d", ret ); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE3, "CMmPacketContextMessHandler::InitialiseContextPhase3;Error=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_INITIALISECONTEXTPHASE3_TD, "CMmPacketContextMessHandler::InitialiseContextPhase3;Error=%d", ret ); iInitialiseError = ret; // Remove the pipe @@ -3561,18 +3611,17 @@ // If GPDS_STATUS in GPDS_CONTEXT_ID_CREATE_RESP is // GPDS_ERROR, max number of contexts already in use // (~=ALL_PIPES_IN_USE). => remove pipe if created - TUint8 pipeRemoveTraId( GenerateTraId( aContextId ) ); TUint8 pipeHandle( iContextList-> PipeHandleByContextName( &contextname ) ); ret = iMmPipeController->PnsPipeRemoveReq( - pipeRemoveTraId, pipeHandle ); + aTrId, pipeHandle ); if ( KErrNone == ret ) { // Store the trans id ret = iContextList-> - SetRemovePipeTraId( pipeRemoveTraId, pipeHandle ); + SetRemovePipeTraId( aTrId, pipeHandle ); } ret = CMmStaticUtility::EpocErrorCode( KErrOverflow, KErrUmtsMaxNumOfContextExceededByPhone ); @@ -3604,9 +3653,9 @@ { TFLOGSTRING3("TSY: CMmPacketContextMessHandler::CompletePipeOperation. MessageId:%d Pipe handle:%d", aMessageId, aPipeHandle ); -OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation;aMessageId=%d;aPipeHandle=%hhu", aMessageId, aPipeHandle ); +OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation;aMessageId=%d;aPipeHandle=%hhu", aMessageId, aPipeHandle ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CompletePipeOperation. Error cause:%d", aErrorCause ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation;aErrorCause=%hhu", aErrorCause ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation;aErrorCause=%hhu", aErrorCause ); TInt errorCause( KErrNone ); @@ -3632,6 +3681,8 @@ { case PNS_PIPE_CREATE_RESP: { + TFLOGSTRING("TSY: CMmPacketContextMessHandler::CompletePipeOperation - PNS_PIPE_CREATE_RESP" ); + OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation - PNS_PIPE_CREATE_RESP" ); if ( PN_PIPE_NO_ERROR == aErrorCause ) { // Store the pipe handle @@ -3671,7 +3722,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::CompletePipeOperation. Cannot Complete Initialisation"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete Initialisation" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete Initialisation" ); } // no else } @@ -3709,7 +3760,7 @@ { TFLOGSTRING("LTSY: CMmPacketContextMessHandler::CompletePipeOperationL. Cannot Complete failed initialisation" ); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete failed initialisation" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete failed initialisation" ); } // no else } @@ -3726,7 +3777,7 @@ TFLOGSTRING2("LTSY: CMmPacketContextMessHandler::CompletePipeOperationL.Complete context initialisation with %d", errorCause ); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation;Complete context initialisation with=%hhu", aErrorCause ); +OstTraceExt1( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation;Complete context initialisation with=%hhu", aErrorCause ); //Completion because of some error in PIPE CMmDataPackage data; data.PackData( &contextname ); @@ -3743,7 +3794,7 @@ { TFLOGSTRING("LTSY: CMmPacketContextMessHandler::CompletePipeOperationL. Cannot Complete failed initialisation"); -OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete failed initialisation" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete failed initialisation" ); } // no else } @@ -3776,7 +3827,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::CompletePipeOperation. Cannot Complete Initialisation"); -OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete Initialisation" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation, Cannot Complete Initialisation" ); } // no else } @@ -3787,15 +3838,38 @@ } case PNS_PIPE_ENABLE_RESP: { - + TFLOGSTRING("TSY: CMmPacketContextMessHandler::CompletePipeOperation - PNS_PIPE_ENABLE_RESP"); + OstTrace0( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation - PNS_PIPE_ENABLE_RESP" ); + + // Pipe status is enabled + iContextList->SetPipeStatus( aPipeHandle, PN_PIPE_ENABLE ); + + TUint8 proxyId( iContextList->ProxyIdByPipeHandle( aPipeHandle ) ); + TUint8 devId( 0 ); + TUint8 objId( 0 ); + iContextList->GetExternalDevice( proxyId, devId, objId ); if ( PN_PIPE_NO_ERROR == aErrorCause ) { - // Pipe status is enabled - iContextList->SetPipeStatus( aPipeHandle, PN_PIPE_ENABLE ); - // Call ActivatePhase2L - ActivatePhase2( aPipeHandle, aTransactionId ); + iMmPipeController->PnsPepCtrlReq( + devId, + objId, + aTransactionId, + aPipeHandle, + PEP_CTRL_ID_LOAN, + PEP_BCA_OK, + proxyId ); } - // no else + else + { + iMmPipeController->PnsPepCtrlReq( + devId, + objId, + aTransactionId, + aPipeHandle, + PEP_CTRL_ID_LOAN, + PEP_BCA_FAIL, + proxyId ); + } // This is executed in special case when user has cancelled // activation, NIF's pep is desctructed and due that pipe server @@ -3804,27 +3878,9 @@ { TUint8 contextId( iContextList-> ContextIdByPipeHandle( aPipeHandle ) ); - TInfoName contextname; TInt ret( iContextList-> GetContextNameByContextId( contextId, contextname ) ); - - if ( ret == KErrNone ) - { - - TFLOGSTRING("LTSY: CMmPacketContextMessHandler::CompletePipeOperationL.Complete ACTIVATION with KErrGeneral"); -OstTrace0( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation, Complete ACTIVATION with KErrGeneral" ); - - CMmDataPackage data; - TAny* ptr = NULL; - data.PackData( &contextname, ptr ); - iMessageRouter->Complete( - EPacketContextActivate, - &data, - KErrGeneral ); - } - // no else - TUint8 pipeHandle( iContextList-> PipeHandleByContextName( &contextname ) ); @@ -3850,7 +3906,7 @@ { TUint8 channelId( iContextList->ProxyIdByPipeHandle( aPipeHandle ) ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CompletePipeOperation;closing channelId=%d", channelId); - OstTraceExt1( TRACE_NORMAL, DUP9_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation;closing channelId=%hhu", channelId ); + OstTraceExt1( TRACE_NORMAL, DUP9_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation;closing channelId=%hhu", channelId ); iContextList->CloseChannel( channelId ); TUint8 contextId( iContextList-> ContextIdByPipeHandle( aPipeHandle ) ); @@ -3901,13 +3957,77 @@ iContextList->ResetPipeHandleAndStatus( aPipeHandle ); TFLOGSTRING("TSY: CMmPacketContextMessHandler::CompletePipeOperation."); -OstTrace0( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION, "CMmPacketContextMessHandler::CompletePipeOperation" ); +OstTrace0( TRACE_NORMAL, DUP10_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation" ); iContextList->RemoveObject( contextId ); } // no else break; } + case PNS_PIPE_REDIRECT_RESP: + { + TUint8 channelId( iContextList->ProxyIdByPipeHandle( aPipeHandle ) ); + TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CompletePipeOperation - PNS_PIPE_REDIRECT_RESP;channelId=0x%x", channelId); + OstTrace1( TRACE_NORMAL, DUP11_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation - PNS_PIPE_REDIRECT_RESP;channelId=%x", channelId ); + + TBool isLoan( !iContextList->IsLoanReturning( aPipeHandle ) ); + TUint8 controlId( 0 ); + TUint8 devId( 0 ); + TUint8 objId( 0 ); + iContextList->GetExternalDevice( channelId, devId, objId ); + + if ( isLoan ) + { + controlId = PEP_CTRL_ID_LOAN; + } + else + { + controlId = PEP_CTRL_ID_RETURNLOAN; + } + + if ( aErrorCause == KErrNone ) + { + if ( isLoan ) + { + iMmPipeController->PnsPipeEnableReq( aPipeHandle, aTransactionId ); + } + else + { + iMmPipeController->PnsPepCtrlReq( + devId, + objId, + aTransactionId, + aPipeHandle, + controlId, + PEP_BCA_OK, + channelId ); + } + } + else + { + iMmPipeController->PnsPepCtrlReq( + devId, + objId, + aTransactionId, + aPipeHandle, + controlId, + PEP_BCA_FAIL, + channelId ); + } + break; + } + case PNS_PEP_CTRL_RESP: + { + TUint8 channelId( iContextList->ProxyIdByPipeHandle( aPipeHandle ) ); + TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CompletePipeOperation - PNS_PEP_CTRL_RESP;channelId=0x%x", channelId); + OstTrace1( TRACE_NORMAL, DUP12_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation - PNS_PEP_CTRL_RESP;channelId=%x", channelId ); + if ( KErrNone != aErrorCause ) + { + TFLOGSTRING("TSY: CMmPacketContextMessHandler::CompletePipeOperation - PNS_PEP_CTRL_RESP - Error!"); + OstTrace0( TRACE_NORMAL, DUP13_CMMPACKETCONTEXTMESSHANDLER_COMPLETEPIPEOPERATION_TD, "CMmPacketContextMessHandler::CompletePipeOperation - - PNS_PEP_CTRL_RESP - Error!" ); + } + break; + } default: { break; @@ -3925,7 +4045,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::Delete"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_DELETE, "CMmPacketContextMessHandler::Delete" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_DELETE_TD, "CMmPacketContextMessHandler::Delete" ); TInt ret( KErrNone ); TInfoName* contextName = NULL; @@ -3964,7 +4084,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetConfigL"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL" ); TInt ret( KErrNone ); TInfoName* contextName = NULL; @@ -3981,7 +4101,7 @@ if ( GPDS_CID_VOID != contextId ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetConfig -> Rel97"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL -> Rel97" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL -> Rel97" ); iContextList->SetInitialiseMember( contextId, ETrue ); @@ -3992,9 +4112,9 @@ TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConfig IP.Length() = %d", configGPRS.iPdpAddress.Length()); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConfig iPrimaryDns.Length() = %d", configGPRS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length() ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConfig iSecondaryDns.Length() = %d", configGPRS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length()); -OstTrace1( TRACE_NORMAL, DUP10_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iPdpAddress.Length()=%d", configGPRS.iPdpAddress.Length() ); -OstTrace1( TRACE_NORMAL, DUP11_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length()=%d", configGPRS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length() ); -OstTrace1( TRACE_NORMAL, DUP12_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length()=%d", configGPRS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length() ); +OstTrace1( TRACE_NORMAL, DUP10_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iPdpAddress.Length()=%d", configGPRS.iPdpAddress.Length() ); +OstTrace1( TRACE_NORMAL, DUP11_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length()=%d", configGPRS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length() ); +OstTrace1( TRACE_NORMAL, DUP12_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length()=%d", configGPRS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length() ); iContextList->SetContextConfigurationType( contextId, TPacketDataConfigBase::KConfigGPRS ); @@ -4134,12 +4254,12 @@ if ( TPacketDataConfigBase::KConfigRel5 == config->ExtensionId() ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetConfig -> R5"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL -> R5" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL -> R5" ); } else { TFLOGSTRING("TSY: CMmPacketContextMessHandler::SetConfig -> R99"); -OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL -> R99" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL -> R99" ); } RPacketContext::TContextConfigR99_R4& configR99_R4 = @@ -4150,9 +4270,9 @@ TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConfig IP.Length() = %d", configR99_R4.iPdpAddress.Length()); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConfig iPrimaryDns.Length() = %d", configR99_R4.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length() ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConfig iSecondaryDns.Length() = %d", configR99_R4.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length()); -OstTrace1( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iPdpAddress.Length()=%d", configR99_R4.iPdpAddress.Length() ); -OstTrace1( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length()=%d", configR99_R4.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length() ); -OstTrace1( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length()=%d", configR99_R4.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length() ); +OstTrace1( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iPdpAddress.Length()=%d", configR99_R4.iPdpAddress.Length() ); +OstTrace1( TRACE_NORMAL, DUP7_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length()=%d", configR99_R4.iProtocolConfigOption.iDnsAddresses.iPrimaryDns.Length() ); +OstTrace1( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_SETCONFIGL_TD, "CMmPacketContextMessHandler::SetConfigL;configGPRS.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length()=%d", configR99_R4.iProtocolConfigOption.iDnsAddresses.iSecondaryDns.Length() ); iContextList->SetContextConfigurationType( contextId, TPacketDataConfigBase::KConfigRel99Rel4 ); @@ -4305,7 +4425,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddPacketFilter" ); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTER, "CMmPacketContextMessHandler::AddPacketFilter" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ADDPACKETFILTER_TD, "CMmPacketContextMessHandler::AddPacketFilter" ); // includes context configuration information TInt contextConfigurationType; @@ -4392,18 +4512,19 @@ // This function starts the second phase of the context activation. // ----------------------------------------------------------------------------- // -void CMmPacketContextMessHandler::ActivatePhase2( - const TUint8 aPipeHandle, - const TUint8 aTransactionId ) +TInt CMmPacketContextMessHandler::ActivatePhase2( + const CMmDataPackage& aDataPackage ) { - TFLOGSTRING("TSY: CMmPacketContextMessHandler::ActivatePhase2."); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ACTIVATEPHASE2, "CMmPacketContextMessHandler::ActivatePhase2" ); + OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ACTIVATEPHASE2_TD, "CMmPacketContextMessHandler::ActivatePhase2" ); + + TInfoName* contextName = NULL; + aDataPackage.UnPackData( &contextName ); + TUint8 contextId( iContextList->GetContextIdByContextName( contextName ) ); + TUint8 transId = iContextList->GetActivationTraId( contextId ); TUint8 pdpType( 0 ); TInt ret( KErrNone ); - TUint8 contextId( iContextList-> - ContextIdByPipeHandle( aPipeHandle ) ); TInt configurationType( iContextList-> GetContextConfigurationType( contextId ) ); @@ -4420,7 +4541,7 @@ configBase ); MapPdpType( pdpType, config->iPdpType ); ret = GpdsContextActivateReq( - aTransactionId, contextId, config->iPdpAddress, pdpType ); + transId, contextId, config->iPdpAddress, pdpType ); } else if( TPacketDataConfigBase::KConfigRel99Rel4 == configurationType ) { @@ -4429,16 +4550,14 @@ configBase ); MapPdpType( pdpType, config99->iPdpType ); ret = GpdsContextActivateReq( - aTransactionId, contextId, config99->iPdpAddress, pdpType ); + transId, contextId, config99->iPdpAddress, pdpType ); } // no else if ( KErrNone != ret ) { - TFLOGSTRING2("TSY: CMmPacketContextGsmWcdmaExt::ActivatePhase2. Error: %d", ret ); - -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_ACTIVATEPHASE2, "CMmPacketContextMessHandler::ActivatePhase2;Error=%d", ret ); + OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_ACTIVATEPHASE2_TD, "CMmPacketContextMessHandler::ActivatePhase2;Error=%d", ret ); TInfoName contextname; // Context name found if( KErrNone == iContextList-> @@ -4457,30 +4576,13 @@ EPacketContextNotifyConfigChanged, &data, ret ); - TUint8 transId( GenerateTraId( contextId ) ); - - // Reset the pipe - ret = iMmPipeController->PnsPipeResetReq( - transId, aPipeHandle, PN_PIPE_DISABLE ); - - if ( KErrNone == ret ) - { - // Store the trans id - iContextList->SetPipeResetTraId( contextId, transId ); - } - else if( KErrNotFound == ret) - { - - TFLOGSTRING("TSY: CMmPacketContextMessHandler::ActivatePhase2. SetPipeResetTraId failed"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_ACTIVATEPHASE2, "CMmPacketContextMessHandler::ActivatePhase2, SetPipeResetTraId failed" ); - } - // no else } // no else } // no else } // no else + return ret; } // ----------------------------------------------------------------------------- @@ -4494,7 +4596,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::MapPdpType"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_MAPPDPTYPE, "CMmPacketContextMessHandler::MapPdpType" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_MAPPDPTYPE_TD, "CMmPacketContextMessHandler::MapPdpType" ); TInt ret( KErrNone ); @@ -4521,7 +4623,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::MapPdpType. Switch aPdpTypeClient case - default"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_MAPPDPTYPE, "CMmPacketContextMessHandler::MapPdpType,Switch aPdpTypeClient case - default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_MAPPDPTYPE_TD, "CMmPacketContextMessHandler::MapPdpType,Switch aPdpTypeClient case - default" ); ret = KErrArgument; break; @@ -4541,7 +4643,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::MapConnectionSpeed"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_MAPCONNECTIONSPEED, "CMmPacketContextMessHandler::MapConnectionSpeed" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_MAPCONNECTIONSPEED_TD, "CMmPacketContextMessHandler::MapConnectionSpeed" ); switch ( aConnectionSpeedServer ) { @@ -4596,7 +4698,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::MapConnectionSpeed. Switch aConnectionSpeedServer case - default"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_MAPCONNECTIONSPEED, "CMmPacketContextMessHandler::MapConnectionSpeed, Switch aConnectionSpeedServer case - default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_MAPCONNECTIONSPEED_TD, "CMmPacketContextMessHandler::MapConnectionSpeed, Switch aConnectionSpeedServer case - default" ); aConnectionSpeedClient = KClientSpeeed0; break; @@ -4605,7 +4707,7 @@ TFLOGSTRING2("TSY: CMmPacketContextMessHandler::SetConnectionSpeed. Connection Speed: %d bps", aConnectionSpeedClient ); -OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_MAPCONNECTIONSPEED, "CMmPacketContextMessHandler::MapConnectionSpeed;Connection Speed=%d bps", aConnectionSpeedClient ); +OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_MAPCONNECTIONSPEED_TD, "CMmPacketContextMessHandler::MapConnectionSpeed;Connection Speed=%d bps", aConnectionSpeedClient ); } // ----------------------------------------------------------------------------- @@ -4618,7 +4720,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GenerateTraId"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GENERATETRAID, "CMmPacketContextMessHandler::GenerateTraId" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GENERATETRAID_TD, "CMmPacketContextMessHandler::GenerateTraId" ); TUint8 proxyId( iContextList-> ProxyIdByContextId( aContextId ) ); @@ -4646,7 +4748,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::MapTftOperation"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_MAPTFTOPERATION, "CMmPacketContextMessHandler::MapTftOperation" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_MAPTFTOPERATION_TD, "CMmPacketContextMessHandler::MapTftOperation" ); switch( aClientTypeOperation ) { @@ -4684,7 +4786,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::MapTftOperation. Switch aClientTypeOperation case - default"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_MAPTFTOPERATION, "CMmPacketContextMessHandler::MapTftOperation,Switch aClientTypeOperation case - default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_MAPTFTOPERATION_TD, "CMmPacketContextMessHandler::MapTftOperation,Switch aClientTypeOperation case - default" ); aTftOperation = GPDS_TFT_DELETE_EXISTING; break; @@ -4702,7 +4804,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddMediaAuthorizationL."); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ADDMEDIAAUTHORIZATIONL, "CMmPacketContextMessHandler::AddMediaAuthorizationL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ADDMEDIAAUTHORIZATIONL_TD, "CMmPacketContextMessHandler::AddMediaAuthorizationL" ); const CMmPacketDataPackage* data = reinterpret_cast( aDataPackage ); @@ -4773,7 +4875,7 @@ TInt arrayIndex( 0 ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::AddMediaAuthorizationInfo. aMediaAuthorizationArray count: %d", count); -OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ADDMEDIAAUTHORIZATIONINFO, "CMmPacketContextMessHandler::AddMediaAuthorizationInfo;aMediaAuthorizationArray count=%d", count ); +OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ADDMEDIAAUTHORIZATIONINFO_TD, "CMmPacketContextMessHandler::AddMediaAuthorizationInfo;aMediaAuthorizationArray count=%d", count ); while ( KErrNone == ret && count > 0 ) { @@ -4798,7 +4900,7 @@ TUint8& aNumOfSbs ) const { TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendMediaAuthorizationUnit"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT_TD, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit" ); //Add GPDS_SHARED_TFT_PARAMETER_AUTH_TOKEN_INFO sub block TInt ret = AppendGpdsSharedTFTParameterAuthTokenInfo( aMediaAuthorization.iAuthorizationToken, aBuffer, aNumOfSbs ); @@ -4815,7 +4917,7 @@ if ( KErrNone == ret ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddMediaAuthorizationUnit. Make sub block for (2 and 3)"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit, Make sub block for (2 and 3)" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT_TD, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit, Make sub block for (2 and 3)" ); ret = AppendGpdsSharedTFTParameterAuthTokenInfo( aMediaAuthorization.iAuthorizationToken, aBuffer, aNumOfSbs ); } @@ -4825,7 +4927,7 @@ if ( KErrNone == ret && KGdpsSharedTftParamIPFlowInfo2 <= flowIdsArrayCount ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AddMediaAuthorizationUnit. make sure that there is more than one class in Array"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit, Make sure that there is more than one class in Array" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT_TD, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit, Make sure that there is more than one class in Array" ); for (TInt flowIdsArrayIndex = KFlowIdsArrayIndex1; flowIdsArrayIndex < flowIdsArrayCount && KErrNone == ret; flowIdsArrayIndex++) @@ -4836,7 +4938,7 @@ } } TFLOGSTRING2("TSY:CMmPacketContextMessHandler::AppendMediaAuthorizationUnit;ret=%d", ret); -OstTrace1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_APPENDMEDIAAUTHORIZATIONUNIT_TD, "CMmPacketContextMessHandler::AppendMediaAuthorizationUnit;ret=%d", ret ); return ret; } @@ -4850,7 +4952,7 @@ void CMmPacketContextMessHandler::AllowIncomingCallActivationL() { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AllowIncomingCallActivationL"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL, "CMmPacketContextMessHandler::AllowIncomingCallActivationL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL_TD, "CMmPacketContextMessHandler::AllowIncomingCallActivationL" ); if ( CALL_MODEM_ID_NONE != iCallModemResourceCallId && NULL == iDeactivateContextList ) @@ -4864,7 +4966,7 @@ iDeactivateContextList->Reset(); TFLOGSTRING("TSY: CMmPacketContextMessHandler::AllowIncomingCallActivationL, Find secondary context"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL, "CMmPacketContextMessHandler::AllowIncomingCallActivationL, Find secondary context" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL_TD, "CMmPacketContextMessHandler::AllowIncomingCallActivationL, Find secondary context" ); // check if there is contexts created if ( 1 < contextCount ) { @@ -4881,7 +4983,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMessHandler::AllowIncomingCallActivationL, Secondary context found, List index: %d", i ); -OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL, "CMmPacketContextMessHandler::AllowIncomingCallActivationL;, Secondary context found, List index=%d", i ); +OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL_TD, "CMmPacketContextMessHandler::AllowIncomingCallActivationL;, Secondary context found, List index=%d", i ); // secondary context found iDeactivateContextList->AppendL( contextId ); // break the loop @@ -4899,7 +5001,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AllowIncomingCallActivationL, Secondary dial-up context found"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL, "CMmPacketContextMessHandler::AllowIncomingCallActivationL, Secondary dial-up context found" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL_TD, "CMmPacketContextMessHandler::AllowIncomingCallActivationL, Secondary dial-up context found" ); // secondary context found iDeactivateContextList->AppendL( contextId ); } @@ -4918,7 +5020,7 @@ TFLOGSTRING2("TSY: CMmPacketContextMessHandler::AllowIncomingCallActivationL, Deactivating context, ContextId: %d", iDeactivateContextList->At( 0 ) ); -OstTrace1( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL, "CMmPacketContextMessHandler::AllowIncomingCallActivationL;ContextId=%d", iDeactivateContextList->At( 0 ) ); +OstTrace1( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_ALLOWINCOMINGCALLACTIVATIONL_TD, "CMmPacketContextMessHandler::AllowIncomingCallActivationL;ContextId=%d", iDeactivateContextList->At( 0 ) ); // Set the message data that consists of one parameter TBuf8<1> messageData; // deactivate first context from the list @@ -4941,7 +5043,7 @@ _LIT8(KDetailedCause, "\xc0\x95\x82\x02"); CallModemResourceReqDenied( CALL_MODEM_CAUSE_TYPE_CLIENT, - CALL_MODEM_CAUSE_RELEASE_BY_USER, + CALL_MODEM_CAUSE_RELEASE_BY_USER, KDetailedCause ); } //no else @@ -4970,7 +5072,7 @@ TUint8& aNumOfSbs ) const { TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERAUTHTOKENINFO, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERAUTHTOKENINFO_TD, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo" ); TInt ret( KErrTooBig ); TInt authTokenLength( aAuthorizationToken.Length() ); @@ -4978,7 +5080,7 @@ KAuthTokenInfoChecking ) ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo. Add GPDS_SHARED_TFT_PARAMETER_AUTH_TOKEN_INFO sub block"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERAUTHTOKENINFO, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo, Add GPDS_SHARED_TFT_PARAMETER_AUTH_TOKEN_INFO sub block" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERAUTHTOKENINFO_TD, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo, Add GPDS_SHARED_TFT_PARAMETER_AUTH_TOKEN_INFO sub block" ); ret = KErrNone; TBuf tempAuthorizationTokenInfo; tempAuthorizationTokenInfo.Copy( aAuthorizationToken ); @@ -4999,7 +5101,7 @@ aNumOfSbs++; } TFLOGSTRING2("TSY:CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo;ret=%d", ret); -OstTrace1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERAUTHTOKENINFO, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERAUTHTOKENINFO_TD, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterAuthTokenInfo;ret=%d", ret ); return ret; } @@ -5016,7 +5118,7 @@ TUint8& aNumOfSbs ) const { TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterIPFlowInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERIPFLOWINFO, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterIPFlowInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSSHAREDTFTPARAMETERIPFLOWINFO_TD, "CMmPacketContextMessHandler::AppendGpdsSharedTFTParameterIPFlowInfo" ); TBuf8 tempIPFlowInfo; TIsiSubBlock ipFlowInfoSubBlock( tempIPFlowInfo, GPDS_SHARED_TFT_PARAMETER_IP_FLOW_INFO, @@ -5055,7 +5157,7 @@ TDes8& aBuffer ) const { TFLOGSTRING("TSY:CMmPacketContextMessHandler::FillGpdsTFTInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_FILLGPDSTFTINFO, "CMmPacketContextMessHandler::FillGpdsTFTInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_FILLGPDSTFTINFO_TD, "CMmPacketContextMessHandler::FillGpdsTFTInfo" ); TInt ret( KErrNone ); TUint8 numOfSbsInsideSb( 0 ); @@ -5068,7 +5170,7 @@ if ( aMediaAuthorization ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::AppendGpdsTFTInfo. MediaAuthorization"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSTFTINFO, "CMmPacketContextMessHandler::FillGpdsTFTInfo, MediaAuthorization" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSTFTINFO_TD, "CMmPacketContextMessHandler::FillGpdsTFTInfo, MediaAuthorization" ); ret = AppendMediaAuthorizationUnit( *aMediaAuthorization, aBuffer, numOfSbsInsideSb ); } @@ -5119,7 +5221,7 @@ sbCountbuf.Append( numOfSbsInsideSb ); aBuffer.Insert( GPDS_TFT_INFO_OFFSET_NUMBEROFSUBBLOCKS, sbCountbuf ); TFLOGSTRING2("TSY:CMmPacketContextMessHandler::FillGpdsTFTInfo;ret=%d", ret); -OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSTFTINFO, "CMmPacketContextMessHandler::FillGpdsTFTInfo;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSTFTINFO_TD, "CMmPacketContextMessHandler::FillGpdsTFTInfo;ret=%d", ret ); return ret; } @@ -5133,7 +5235,7 @@ TDes8& aBuffer) { TFLOGSTRING("TSY:CMmPacketContextMessHandler::FillGpdsQos99ReqInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOS99REQINFO, "CMmPacketContextMessHandler::FillGpdsQos99ReqInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOS99REQINFO_TD, "CMmPacketContextMessHandler::FillGpdsQos99ReqInfo" ); TInt ret( KErrNone ); CMmPacketQoSMessHandler::TQoS99Info qoS99ReqInfoServer; @@ -5201,7 +5303,7 @@ qoS99ReqInfoServer.iGuaranteedDownlinkRate ) ); } TFLOGSTRING2("TSY:CMmPacketContextMessHandler::FillGpdsQos99ReqInfo;ret=%d", ret); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOS99REQINFO, "CMmPacketContextMessHandler::FillGpdsQos99ReqInfo;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOS99REQINFO_TD, "CMmPacketContextMessHandler::FillGpdsQos99ReqInfo;ret=%d", ret ); return ret; } @@ -5215,7 +5317,7 @@ TDes8& aBuffer ) { TFLOGSTRING("TSY:CMmPacketContextMessHandler::FillGpdsQosReqInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOSREQINFO, "CMmPacketContextMessHandler::FillGpdsQosReqInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOSREQINFO_TD, "CMmPacketContextMessHandler::FillGpdsQosReqInfo" ); TInt ret( KErrNone ); // Map QoS R97/98 requested parameter values to server @@ -5240,7 +5342,7 @@ aBuffer.Append( KGpdsPadding ); } TFLOGSTRING2("TSY:CMmPacketContextMessHandler::FillGpdsQosReqInfo;ret=%d", ret); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOSREQINFO, "CMmPacketContextMessHandler::FillGpdsQosReqInfo;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_FILLGPDSQOSREQINFO_TD, "CMmPacketContextMessHandler::FillGpdsQosReqInfo;ret=%d", ret ); return ret; } @@ -5255,7 +5357,7 @@ TUint8& aNumOfSbs ) const { TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterFlowLabelInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERFLOWLABELINFO, "CMmPacketContextMessHandler::AppendGpdsFilterFlowLabelInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERFLOWLABELINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterFlowLabelInfo" ); // Create flowlabelInfo buffer for parameters TBuf8 flowLabelInfo; TIsiSubBlock flowLabelInfoSubBlock( @@ -5295,7 +5397,7 @@ TUint8& aNumOfSbs ) const { TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterTosInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERTOSINFO, "CMmPacketContextMessHandler::AppendGpdsFilterTosInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERTOSINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterTosInfo" ); // Create tosInfo buffer for parameters TBuf8 tosInfo; TIsiSubBlock tosInfoSubBlock( @@ -5329,7 +5431,7 @@ TUint8& aNumOfSbs ) const { TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterSpiInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSPIINFO, "CMmPacketContextMessHandler::AppendGpdsFilterSpiInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSPIINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterSpiInfo" ); // Create spiInfo buffer for parameters TBuf8 spiInfo; TIsiSubBlock spiInfoSubBlock( @@ -5370,7 +5472,7 @@ TUint8& aNumOfSbs ) const { TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterSrcPortRangeInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSRCPORTRANGEINFO, "CMmPacketContextMessHandler::AppendGpdsFilterSrcPortRangeInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSRCPORTRANGEINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterSrcPortRangeInfo" ); // Create srcPortRangeInfo buffer for parameters TBuf8 srcPortRangeInfo; TIsiSubBlock srcPortRangeSubBlock( @@ -5414,7 +5516,7 @@ TDes8& aBuffer, TUint8& aNumOfSbs ) const { TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterDstPortRangeInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERDSTPORTRANGEINFO, "CMmPacketContextMessHandler::AppendGpdsFilterDstPortRangeInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERDSTPORTRANGEINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterDstPortRangeInfo" ); // Create destPortRangeInfo buffer for parameters TBuf8 destPortRangeInfo; TIsiSubBlock destPortRangeSubBlock( @@ -5459,7 +5561,7 @@ TUint8& aNumOfSbs ) const { TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterProtocolInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERPROTOCOLINFO, "CMmPacketContextMessHandler::AppendGpdsFilterProtocolInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERPROTOCOLINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterProtocolInfo" ); // Create protocolInfo buffer for parameter, length 1 byte TBuf8 protocolInfo; TIsiSubBlock protocolInfoSubBlock( @@ -5492,7 +5594,7 @@ TUint8& aNumOfSbs ) const { TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterSrcIPv4AddressInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSRCIPV4ADDRESSINFO, "CMmPacketContextMessHandler::AppendGpdsFilterSrcIPv4AddressInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSRCIPV4ADDRESSINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterSrcIPv4AddressInfo" ); // Create ipv4AddrInfo buffer for parameters TBuf8 ipv4AddrInfo; TIsiSubBlock ipv4AddrInfoSubBlock( @@ -5526,7 +5628,7 @@ TUint8& aNumOfSbs ) const { TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsFilterSrcIPv6AddressInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSRCIPV6ADDRESSINFO, "CMmPacketContextMessHandler::AppendGpdsFilterSrcIPv6AddressInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSFILTERSRCIPV6ADDRESSINFO_TD, "CMmPacketContextMessHandler::AppendGpdsFilterSrcIPv6AddressInfo" ); // Create ipv6AddrInfo buffer for parameters TBuf8 ipv6AddrInfo; TIsiSubBlock ipv6AddrInfoSubBlock( @@ -5560,7 +5662,7 @@ TDes8& aBuffer ) const { TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendIpAddressInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDIPADDRESSINFO, "CMmPacketContextMessHandler::AppendIpAddressInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDIPADDRESSINFO_TD, "CMmPacketContextMessHandler::AppendIpAddressInfo" ); TInt ret( KErrArgument ); // check that address 0.0.0.0 is not used. @@ -5616,7 +5718,7 @@ aBuffer.Append( aInputIpAddress ); } TFLOGSTRING2("TSY:CMmPacketContextMessHandler::AppendIpAddressInfo;ret=%d", ret); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_APPENDIPADDRESSINFO, "CMmPacketContextMessHandler::AppendIpAddressInfo;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_APPENDIPADDRESSINFO_TD, "CMmPacketContextMessHandler::AppendIpAddressInfo;ret=%d", ret ); return ret; } @@ -5631,7 +5733,7 @@ TUint8& aNumOfSbs ) const { TFLOGSTRING("TSY:CMmPacketContextMessHandler::AppendGpdsTftFilterInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSTFTFILTERINFO, "CMmPacketContextMessHandler::AppendGpdsTftFilterInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_APPENDGPDSTFTFILTERINFO_TD, "CMmPacketContextMessHandler::AppendGpdsTftFilterInfo" ); // Add GPDS_TFT_FILTER_INFO subblock TBuf8 filterInfoSbBuffer; TIsiSubBlock gpdsFilterInfoSubBlock( @@ -5666,7 +5768,7 @@ const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING( "TSY: CMmPacketContextMessHandler::CallModemResourceIndL" ); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL, "CMmPacketContextMessHandler::CallModemResourceIndL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL_TD, "CMmPacketContextMessHandler::CallModemResourceIndL" ); TUint sbStartOffset( 0 ); //Default, 0 is unused value @@ -5679,7 +5781,7 @@ *iResourceControlMsg = aIsiMessage.GetBuffer(); TFLOGSTRING("TSY: CMmPacketContextMessHandler::CallModemResourceIndL, messagedata saved"); -OstTrace0( TRACE_NORMAL, DUP9_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL, "CMmPacketContextMessHandler::CallModemResourceIndL, messagedata saved" ); +OstTrace0( TRACE_NORMAL, DUP9_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL_TD, "CMmPacketContextMessHandler::CallModemResourceIndL, messagedata saved" ); TUint8 callId = aIsiMessage.Get8bit( ISI_HEADER_SIZE + CALL_MODEM_RESOURCE_IND_OFFSET_CALLID ); @@ -5711,7 +5813,7 @@ if ( iDriveModeFlag ) { TFLOGSTRING( "TSY: CMmPacketContextMessHandler::CallModemResourceIndL - DCM Drive Mode enabled" ); -OstTrace0( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL, "CMmPacketContextMessHandler::CallModemResourceIndL - DCM Drive Mode enabled" ); +OstTrace0( TRACE_NORMAL, DUP8_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL_TD, "CMmPacketContextMessHandler::CallModemResourceIndL - DCM Drive Mode enabled" ); // Complete DCM specific functionality // Drive mode rejects automatically incoming calls @@ -5722,13 +5824,13 @@ _LIT8(KDetailedCause, "\xc0\x95\x82\x02"); CallModemResourceReqDenied( CALL_MODEM_CAUSE_TYPE_CLIENT, - CALL_MODEM_CAUSE_RELEASE_BY_USER, + CALL_MODEM_CAUSE_RELEASE_BY_USER, KDetailedCause ); } else { TFLOGSTRING( "TSY: CMmPacketContextMessHandler::CallModemResourceIndL - Allow incoming call activation" ); -OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL, "CMmPacketContextMessHandler::CallModemResourceIndL - Allow incoming call activation" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL_TD, "CMmPacketContextMessHandler::CallModemResourceIndL - Allow incoming call activation" ); // allow incoming call activation iCallModemResourceCallId = callId; @@ -5738,7 +5840,7 @@ else { TFLOGSTRING( "TSY: CMmPacketContextMessHandler::CallModemResourceIndL - Call mode missing, resource is denied" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL, "CMmPacketContextMessHandler::CallModemResourceIndL - Call mode missing, resource is denied" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEINDL_TD, "CMmPacketContextMessHandler::CallModemResourceIndL - Call mode missing, resource is denied" ); // detailed cause values. // see 3GPP TS 24.008 V5.16.0 spec @@ -5747,7 +5849,7 @@ // 0xD8 (cause 88) _LIT8(KDetailedCause, "\xe0\xd8"); CallModemResourceReqDenied( - CALL_MODEM_CAUSE_TYPE_NETWORK, + CALL_MODEM_CAUSE_TYPE_NETWORK, CALL_MODEM_NW_CAUSE_INCOMPATIBLE_DEST, KDetailedCause ); } @@ -5768,7 +5870,7 @@ void CMmPacketContextMessHandler::CallModemResourceReqAllowed() { TFLOGSTRING( "TSY: CMmPacketContextMessHandler::CallModemResourceReqAllowed" ); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQALLOWED, "CMmPacketContextMessHandler::CallModemResourceReqAllowed" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQALLOWED_TD, "CMmPacketContextMessHandler::CallModemResourceReqAllowed" ); TIsiSend callModemResourceReq( iPhoNetSender->SendBufferDes() ); @@ -5872,13 +5974,13 @@ const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING( "TSY: CMmPacketContextMessHandler::CallModemResourceResp" ); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCERESP, "CMmPacketContextMessHandler::CallModemResourceResp" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCERESP_TD, "CMmPacketContextMessHandler::CallModemResourceResp" ); TUint8 callId( aIsiMessage.Get8bit( ISI_HEADER_SIZE + CALL_MODEM_RESOURCE_RESP_OFFSET_CALLID ) ); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CallModemResourceResp, CallId %d", callId ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCERESP, "CMmPacketContextMessHandler::CallModemResourceResp - CallId=%hhu", callId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCERESP_TD, "CMmPacketContextMessHandler::CallModemResourceResp - CallId=%hhu", callId ); } @@ -5894,7 +5996,7 @@ const TDesC8& aDetailedCause ) { TFLOGSTRING("TSY: CMmPacketContextMessHandler::CallModemResourceReqDenied"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED, "CMmPacketContextMessHandler::CallModemResourceReqDenied" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED_TD, "CMmPacketContextMessHandler::CallModemResourceReqDenied" ); TIsiSend callModemResourceDenied( iPhoNetSender->SendBufferDes() ); @@ -5933,9 +6035,9 @@ subblockOffset + KSubblockTypeId8Len8LengthOffset ) ); callModemResourceDenied.CopyData( - currentMsgOffset, + currentMsgOffset, isimessage.GetData( - subblockOffset, + subblockOffset, subblockLength ) ); numOfSbInMessage++; currentMsgOffset += subblockLength; @@ -5952,9 +6054,9 @@ subblockOffset + KSubblockTypeId8Len8LengthOffset ) ); callModemResourceDenied.CopyData( - currentMsgOffset, + currentMsgOffset, isimessage.GetData( - subblockOffset, + subblockOffset, subblockLength ) ); numOfSbInMessage++; currentMsgOffset += subblockLength; @@ -5981,7 +6083,7 @@ numOfSbInMessage++; TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CallModemResourceReqDenied - CALL_MODEM_SB_RESOURCE_STATUS - Subblock Count: %d", numOfSbInMessage ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED, "CMmPacketContextMessHandler::CallModemResourceReqDenied- CALL_MODEM_SB_RESOURCE_STATUS - Subblock Count=%hhu", numOfSbInMessage ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED_TD, "CMmPacketContextMessHandler::CallModemResourceReqDenied- CALL_MODEM_SB_RESOURCE_STATUS - Subblock Count=%hhu", numOfSbInMessage ); // buffer for CALL_MODEM_SB_CAUSE subblock TBuf8 modemSbCause; @@ -6004,7 +6106,7 @@ numOfSbInMessage++; TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CallModemResourceReqDenied - CALL_MODEM_SB_CAUSE - Subblock Count: %d", numOfSbInMessage ); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED, "CMmPacketContextMessHandler::CallModemResourceReqDenied- CALL_MODEM_SB_CAUSE - Subblock Count=%hhu", numOfSbInMessage ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED_TD, "CMmPacketContextMessHandler::CallModemResourceReqDenied- CALL_MODEM_SB_CAUSE - Subblock Count=%hhu", numOfSbInMessage ); // buffer for CALL_MODEM_SB_DETAILED_CAUSE subblock TBuf8 detailedCause; @@ -6027,7 +6129,7 @@ numOfSbInMessage++; TFLOGSTRING2("TSY: CMmPacketContextMessHandler::CallModemResourceReqDenied - CALL_MODEM_SB_DETAILED_CAUSE - Subblock Count: %d", numOfSbInMessage ); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED, "CMmPacketContextMessHandler::CallModemResourceReqDenied- CALL_MODEM_SB_DETAILED_CAUSE - Subblock Count=%hhu", numOfSbInMessage ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_CALLMODEMRESOURCEREQDENIED_TD, "CMmPacketContextMessHandler::CallModemResourceReqDenied- CALL_MODEM_SB_DETAILED_CAUSE - Subblock Count=%hhu", numOfSbInMessage ); // Set number of subblokcs in CALL_MODEM_RESOURCE_REQ message callModemResourceDenied.Set8bit( @@ -6052,7 +6154,7 @@ void CMmPacketContextMessHandler::CompleteDCMdrivemodeFunctionalityL() { TFLOGSTRING("TSY: CMmPacketContextMessHandler::CompleteDCMdrivemodeFunctionalityL"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_COMPLETEDCMDRIVEMODEFUNCTIONALITYL, "CMmPacketContextMessHandler::CompleteDCMdrivemodeFunctionalityL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_COMPLETEDCMDRIVEMODEFUNCTIONALITYL_TD, "CMmPacketContextMessHandler::CompleteDCMdrivemodeFunctionalityL" ); TInt result( KErrNone ); @@ -6158,17 +6260,156 @@ { TLex(contextName.Mid(pos+1)).Val(channelId); TFLOGSTRING2("TSY: CMmPacketContextMessHandler::getProxyId channelId = %d", channelId ); -OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GETPROXYID, "CMmPacketContextMessHandler::getProxyId;channelId=%d", channelId ); +OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_GETPROXYID_TD, "CMmPacketContextMessHandler::getProxyId;channelId=%d", channelId ); } else { TFLOGSTRING("TSY: CMmPacketContextMessHandler::getProxyId channelId NOT FOUND !!!" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GETPROXYID, "CMmPacketContextMessHandler::getProxyId: channelId NOT FOUND !!!" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_GETPROXYID_TD, "CMmPacketContextMessHandler::getProxyId: channelId NOT FOUND !!!" ); // FAIL, this should never happen.. } return channelId; } +// ---------------------------------------------------------------------------- +// CMmPacketContextMessHandler::PnsNameAddInd +// Breaks a PNS_NAME_ADD_IND ISI-message +// ---------------------------------------------------------------------------- +// +void CMmPacketContextMessHandler::PnsNameAddInd( + const TIsiReceiveC& aIsiMessage ) + { + TUint16 matchesInThisMsg( aIsiMessage.Get16bit( + ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_MATCHESINMSG ) ); + + TFLOGSTRING2("TSY: CMmPacketContextMessHandler::PnsNameAddInd - matches in this msg: %d", matchesInThisMsg); + OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_PNSNAMEADDIND_TD, "CMmPacketContextMessHandler::PnsNameAddInd;matchesInThisMsg=%hu", matchesInThisMsg ); + + TUint name( 0 ); + for( TInt i = 0; i < matchesInThisMsg; i++ ) + { + name = aIsiMessage.Get32bit( + ISI_HEADER_SIZE + + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + + SIZE_PN_NAME_SRV_ITEM_STR * i + + PN_NAME_SRV_ITEM_STR_OFFSET_NAME ); + TFLOGSTRING3("TSY: CMmPacketContextMessHandler::PnsNameAddInd - name[%d]: 0x%x", i, name ); + OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_PNSNAMEADDIND, "CMmPacketContextMessHandler::PnsNameAddInd;i=%d;name=%x", i, name ); + + if ( PN_PIPE == ( name & KMaskNameByte1 ) && + PN_PEP_TYPE_COMMON == ( ( name & KMaskNameByte2 ) >> 8 ) && + PN_PEP_SUB_TYPE_SYMBIAN_INTERNAL == ( ( name & KMaskNameByte3 ) >> 16 ) ) + { + // Match found. Check also if existing context for channelId. + TFLOGSTRING("TSY: CMmPacketContextMessHandler::PnsNameAddInd - Right kind of name_add_ind. Checking also channelId" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEADDIND, "CMmPacketContextMessHandler::PnsNameAddInd - Right kind of name_add_ind. Checking also channelId" ); + TUint8 channelId( name >> 24 ); + TInfoName contextName; + if ( iContextList->ContextNameByProxyId( channelId, contextName ) == KErrNone ) + { + TFLOGSTRING("TSY: CMmPacketContextMessHandler::PnsNameAddInd - Also channelId was created by us" ); + OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEADDIND, "CMmPacketContextMessHandler::PnsNameAddInd - Also channelId was created by us" ); + TUint8 devId( aIsiMessage.Get8bit( ISI_HEADER_SIZE + + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + + SIZE_PN_NAME_SRV_ITEM_STR * i + + PN_NAME_SRV_ITEM_STR_OFFSET_DEV ) ); + TUint8 objId( aIsiMessage.Get8bit( ISI_HEADER_SIZE + + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + + SIZE_PN_NAME_SRV_ITEM_STR * i + + PN_NAME_SRV_ITEM_STR_OFFSET_OBJ ) ); + + iContextList->SetExternalDevice( channelId, devId, objId ); + TUint8 pipeHandle( iContextList->PipeHandleByContextName( &contextName ) ); + + iContextList->SetLoanReturning( pipeHandle, EFalse ); + + TInt ret( iMmPipeController->PnsPipeRedirectReq( + channelId, pipeHandle, KFirstPepDevice, channelId, devId, objId ) ); + if ( KErrNone != ret ) + { + TFLOGSTRING2("TSY: CMmPacketContextMessHandler::PnsNameAddInd - error! redirect failed: %d", ret ); + OstTrace1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEADDIND, "CMmPacketContextMessHandler::PnsNameAddInd - error! redirect failed:;ret=%d", ret ); + } + } + } + else + { + TFLOGSTRING("TSY: CMmPacketContextMessHandler::PnsNameAddInd - no match" ); + OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEADDIND, "CMmPacketContextMessHandler::PnsNameAddInd - no match" ); + } + } + + } + +// ---------------------------------------------------------------------------- +// CMmPacketContextMessHandler::PnsNameRemoveInd +// Breaks a PNS_NAME_REMOVE_IND ISI-message +// ---------------------------------------------------------------------------- +// +void CMmPacketContextMessHandler::PnsNameRemoveInd( + const TIsiReceiveC& aIsiMessage ) + { + TUint16 matchesInThisMsg( aIsiMessage.Get16bit( + ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_MATCHESINMSG ) ); + + TFLOGSTRING2("TSY: CMmPacketContextMessHandler::PnsNameRemoveInd - matches in this msg: %d", matchesInThisMsg); + OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_PNSNAMEREMOVEIND_TD, "CMmPacketContextMessHandler::PnsNameRemoveInd;matchesInThisMsg=%hu", matchesInThisMsg ); + + TUint name( 0 ); + for( TInt i = 0; i < matchesInThisMsg; i++ ) + { + name = aIsiMessage.Get32bit( + ISI_HEADER_SIZE + + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + + SIZE_PN_NAME_SRV_ITEM_STR * i + + PN_NAME_SRV_ITEM_STR_OFFSET_NAME ); + TFLOGSTRING3("TSY: CMmPacketContextMessHandler::PnsNameRemoveInd - name[%d]: 0x%x", i, name ); + OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLER_PNSNAMEREMOVEIND, "CMmPacketContextMessHandler::PnsNameRemoveInd;i=%d;name=%x", i, name ); + + if ( PN_PIPE == ( name & KMaskNameByte1 ) && + PN_PEP_TYPE_COMMON == ( ( name & KMaskNameByte2 ) >> 8 ) && + PN_PEP_SUB_TYPE_SYMBIAN_INTERNAL == ( ( name & KMaskNameByte3 ) >> 16 ) ) + { + // Match found. Check also if existing context for channelId. + TFLOGSTRING("TSY: CMmPacketContextMessHandler::PnsNameRemoveInd - Right kind of name_add_ind. Checking also channelId" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEREMOVEIND, "CMmPacketContextMessHandler::PnsNameRemoveInd - Right kind of name_remove_ind. Checking also channelId" ); + TUint8 channelId( name >> 24 ); + TInfoName contextName; + if ( iContextList->ContextNameByProxyId( channelId, contextName ) == KErrNone ) + { + TFLOGSTRING("TSY: CMmPacketContextMessHandler::PnsNameRemoveInd - Also channelId was created by us" ); + OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEREMOVEIND, "CMmPacketContextMessHandler::PnsNameRemoveInd - Also channelId was created by us" ); + TUint8 devId( aIsiMessage.Get8bit( ISI_HEADER_SIZE + + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + + SIZE_PN_NAME_SRV_ITEM_STR * i + + PN_NAME_SRV_ITEM_STR_OFFSET_DEV ) ); + TUint8 objId( aIsiMessage.Get8bit( ISI_HEADER_SIZE + + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + + SIZE_PN_NAME_SRV_ITEM_STR * i + + PN_NAME_SRV_ITEM_STR_OFFSET_OBJ ) ); + + TUint8 transId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID ) ); + TUint8 pipeHandle( iContextList->PipeHandleByContextName( &contextName ) ); + + iContextList->SetLoanReturning( pipeHandle, ETrue ); + + TInt ret( iMmPipeController->PnsPipeRedirectReq( + channelId, pipeHandle, devId, objId, KFirstPepDevice, channelId ) ); + if ( ret != KErrNone ) + { + TFLOGSTRING2("TSY: CMmPacketContextMessHandler::PnsNameRemoveInd - error! redirect failed: %d", ret ); + OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEREMOVEIND, "CMmPacketContextMessHandler::PnsNameRemoveInd - error! redirect failed" ); + } + } + } + else + { + TFLOGSTRING("TSY: CMmPacketContextMessHandler::PnsNameRemoveInd - no match" ); + OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETCONTEXTMESSHANDLER_PNSNAMEREMOVEIND, "CMmPacketContextMessHandler::PnsNameRemoveInd - no match" ); + } + } + } + // ========================== OTHER EXPORTED FUNCTIONS ========================= // None diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmpacketmesshandlercontextlist.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmpacketmesshandlercontextlist.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmpacketmesshandlercontextlist.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -11,7 +11,7 @@ * * Contributors: * -* Description: +* Description: * */ @@ -23,6 +23,7 @@ #include "cmmpacketservicemesshandler.h" #include #include "tsylogger.h" + #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #include "cmmpacketmesshandlercontextlistTraces.h" @@ -77,7 +78,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::CMmPacketContextMesshandlerList"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CMMPACKETCONTEXTMESSHANDLERLIST, "CMmPacketContextMesshandlerList::CMmPacketContextMesshandlerList" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CMMPACKETCONTEXTMESSHANDLERLIST_TD, "CMmPacketContextMesshandlerList::CMmPacketContextMesshandlerList" ); //None } @@ -91,7 +92,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::NewL"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_NEWL, "CMmPacketContextMesshandlerList::NewL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_NEWL_TD, "CMmPacketContextMesshandlerList::NewL" ); CMmPacketContextMesshandlerList* const contextList = new ( ELeave ) CMmPacketContextMesshandlerList(); @@ -112,7 +113,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CONSTRUCTL, "CMmPacketContextMesshandlerList::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CONSTRUCTL_TD, "CMmPacketContextMesshandlerList::ConstructL" ); InitAttributesAndLists(); } @@ -126,7 +127,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::InitAttributesAndLists"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_INITATTRIBUTESANDLISTS, "CMmPacketContextMesshandlerList::InitAttributesAndLists" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_INITATTRIBUTESANDLISTS_TD, "CMmPacketContextMesshandlerList::InitAttributesAndLists" ); for ( TInt i = 0; i < KMmMaxNumberOfContexts; i++ ) { @@ -151,7 +152,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::~CMmPacketContextMesshandlerList" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CMMPACKETCONTEXTMESSHANDLERLIST, "CMmPacketContextMesshandlerList::~CMmPacketContextMesshandlerList" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CMMPACKETCONTEXTMESSHANDLERLIST_TD, "CMmPacketContextMesshandlerList::~CMmPacketContextMesshandlerList" ); for ( TInt i = 0; i < KMmMaxNumberOfContexts; i++ ) { if ( iContextInfoArray[i].iChannelOpened ) @@ -175,7 +176,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::AddObject. Object Id: %d", aObjectId ); -OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_ADDOBJECT, "CMmPacketContextMesshandlerList::AddObject;aObjectId=%d", aObjectId ); +OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_ADDOBJECT_TD, "CMmPacketContextMesshandlerList::AddObject;aObjectId=%d", aObjectId ); TInt ret( KErrArgument ); @@ -222,7 +223,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::RemoveObject. Context Id: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_REMOVEOBJECT, "CMmPacketContextMesshandlerList::RemoveObject;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_REMOVEOBJECT_TD, "CMmPacketContextMesshandlerList::RemoveObject;aContextId=%hhu", aContextId ); // Set ret to KErrArgument to check that context is in list TInt ret( KErrArgument ); @@ -233,7 +234,7 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::RemoveObject. Context Name: %S", &iContextInfoArray[i].iContextName ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_REMOVEOBJECT, "CMmPacketContextMesshandlerList::RemoveObject;Context Name=%S", iContextInfoArray[i].iContextName ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_REMOVEOBJECT_TD, "CMmPacketContextMesshandlerList::RemoveObject;Context Name=%S", iContextInfoArray[i].iContextName ); // Reset object information InitializeContextInfoList( i ); @@ -255,7 +256,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::NumberOfContexts, %d", iNumberOfCreatedContexts ); -OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_NUMBEROFCONTEXTS, "CMmPacketContextMesshandlerList::NumberOfContexts;iNumberOfCreatedContexts=%d", iNumberOfCreatedContexts ); +OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_NUMBEROFCONTEXTS_TD, "CMmPacketContextMesshandlerList::NumberOfContexts;iNumberOfCreatedContexts=%d", iNumberOfCreatedContexts ); return iNumberOfCreatedContexts; } @@ -271,7 +272,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetContextId. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETCONTEXTID, "CMmPacketContextMesshandlerList::SetContextId;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETCONTEXTID_TD, "CMmPacketContextMesshandlerList::SetContextId;aContextId=%hhu", aContextId ); TInt ret( KErrNotFound ); @@ -280,8 +281,9 @@ // Find object from the list if ( aTransactionId == iContextInfoArray[i].iCreateContextIdTransId ) { + TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetContextId. ContextName: %S", &iContextInfoArray[i].iContextName ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETCONTEXTID, "CMmPacketContextMesshandlerList::SetContextId;ContextName=%S", iContextInfoArray[i].iContextName ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETCONTEXTID_TD, "CMmPacketContextMesshandlerList::SetContextId;ContextName=%S", iContextInfoArray[i].iContextName ); // Set context id to the context info list iContextInfoArray[i].iContextId = aContextId; // Object found, return KErrNone @@ -304,7 +306,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetContextNameByContextId. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTNAMEBYCONTEXTID, "CMmPacketContextMesshandlerList::GetContextNameByContextId;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTNAMEBYCONTEXTID_TD, "CMmPacketContextMesshandlerList::GetContextNameByContextId;aContextId=%hhu", aContextId ); TInt ret( KErrArgument ); @@ -314,7 +316,7 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetContextNameByContextId. ContextName: %S", &iContextInfoArray[i].iContextName ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTNAMEBYCONTEXTID, "CMmPacketContextMesshandlerList::GetContextNameByContextId;ContextName=%S", iContextInfoArray[i].iContextName ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTNAMEBYCONTEXTID_TD, "CMmPacketContextMesshandlerList::GetContextNameByContextId;ContextName=%S", iContextInfoArray[i].iContextName ); // Set context name to aName aContextName = iContextInfoArray[i].iContextName; // Context id found, return KErrNone @@ -337,7 +339,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::PipeHandleByContextName"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_PIPEHANDLEBYCONTEXTNAME, "CMmPacketContextMesshandlerList::PipeHandleByContextName" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_PIPEHANDLEBYCONTEXTNAME_TD, "CMmPacketContextMesshandlerList::PipeHandleByContextName" ); TUint8 pipeHandle( KInvalidPipeHandle ); @@ -347,7 +349,7 @@ if ( *aContextName == iContextInfoArray[i].iContextName ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::PipeHandleByContextName, PipeHandle: %d", iContextInfoArray[i].iPipeHandle ); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_PIPEHANDLEBYCONTEXTNAME, "CMmPacketContextMesshandlerList::PipeHandleByContextName;PipeHandle=%d", iContextInfoArray[i].iPipeHandle ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_PIPEHANDLEBYCONTEXTNAME_TD, "CMmPacketContextMesshandlerList::PipeHandleByContextName;PipeHandle=%d", iContextInfoArray[i].iPipeHandle ); // Return object from the context info list pipeHandle = iContextInfoArray[i].iPipeHandle; } @@ -367,7 +369,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::ProxyIdByContextName"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_PROXYIDBYCONTEXTNAME, "CMmPacketContextMesshandlerList::ProxyIdByContextName" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_PROXYIDBYCONTEXTNAME_TD, "CMmPacketContextMesshandlerList::ProxyIdByContextName" ); TUint8 proxyId( KTUint8NotDefined ); @@ -377,7 +379,7 @@ if ( *aContextName == iContextInfoArray[i].iContextName ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::ProxyIdByContextName, ProxyId: %d", iContextInfoArray[i].iChannelId ); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_PROXYIDBYCONTEXTNAME, "CMmPacketContextMesshandlerList::ProxyIdByContextName;ProxyId=%d", iContextInfoArray[i].iChannelId ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_PROXYIDBYCONTEXTNAME_TD, "CMmPacketContextMesshandlerList::ProxyIdByContextName;ProxyId=%d", iContextInfoArray[i].iChannelId ); proxyId = iContextInfoArray[i].iChannelId; } @@ -392,7 +394,7 @@ ) { TFLOGSTRING2("TSY CMmPacketContextMesshandlerList::ProxyIdByPipeHandle 0x%x>", aPipeHandle ); - OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_PROXYIDBYPIPEHANDLE, "CMmPacketContextMesshandlerList::ProxyIdByPipeHandle;aPipeHandle=%hhx", aPipeHandle ); + OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_PROXYIDBYPIPEHANDLE_TD, "CMmPacketContextMesshandlerList::ProxyIdByPipeHandle;aPipeHandle=%hhx", aPipeHandle ); TUint8 proxyId( KTUint8NotDefined ); // Find context proxyId from context info list @@ -401,7 +403,7 @@ if ( aPipeHandle == iContextInfoArray[i].iPipeHandle ) { TFLOGSTRING3("TSY CMmPacketContextMesshandlerList::ProxyIdByPipeHandle found 0x%x for pipehandle 0x%x", proxyId, aPipeHandle ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_PROXYIDBYPIPEHANDLE, "CMmPacketContextMesshandlerList::ProxyIdByPipeHandle;proxyId=%hhx;aPipeHandle=%hhx", proxyId, aPipeHandle ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_PROXYIDBYPIPEHANDLE_TD, "CMmPacketContextMesshandlerList::ProxyIdByPipeHandle;proxyId=%hhx;aPipeHandle=%hhx", proxyId, aPipeHandle ); proxyId = iContextInfoArray[i].iChannelId; i = KMmMaxNumberOfContexts; } @@ -420,7 +422,7 @@ TInt CMmPacketContextMesshandlerList::OpenChannel( TUint8 aChannelId ) { TFLOGSTRING2("TSY: MmPacketContextMesshandlerList::OpenChannel;aChannelId=%x", aChannelId); - OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_OPENCHANNEL, "CMmPacketContextMesshandlerList::OpenChannel;aChannelId=%hhu", aChannelId ); + OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_OPENCHANNEL_TD, "CMmPacketContextMesshandlerList::OpenChannel;aChannelId=%hhu", aChannelId ); TInt ret( KErrNotReady ); for ( TInt i = 0; i < KMmMaxNumberOfContexts; i++) @@ -457,7 +459,7 @@ TInt CMmPacketContextMesshandlerList::CloseChannel( TUint8 aChannelId ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::CloseChannel;aChannelId=%x", aChannelId); - OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CLOSECHANNEL, "CMmPacketContextMesshandlerList::CloseChannel;aChannelId=%hhu", aChannelId ); + OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CLOSECHANNEL_TD, "CMmPacketContextMesshandlerList::CloseChannel;aChannelId=%hhu", aChannelId ); TInt ret( KErrNotFound ); for ( TInt i = 0; i < KMmMaxNumberOfContexts; i++ ) @@ -486,7 +488,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::ContextNameByProxyId. ProxyId: %d", aProxyId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CONTEXTNAMEBYPROXYID, "CMmPacketContextMesshandlerList::ContextNameByProxyId;aProxyId=%hhu", aProxyId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CONTEXTNAMEBYPROXYID_TD, "CMmPacketContextMesshandlerList::ContextNameByProxyId;aProxyId=%hhu", aProxyId ); TInt ret( KErrArgument ); @@ -495,7 +497,7 @@ if ( aProxyId == iContextInfoArray[i].iChannelId ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::ContextNameByProxyId. ContextName: %S", &iContextInfoArray[i].iContextName ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CONTEXTNAMEBYPROXYID, "CMmPacketContextMesshandlerList::ContextNameByProxyId;ContextName=%S", iContextInfoArray[i].iContextName ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CONTEXTNAMEBYPROXYID_TD, "CMmPacketContextMesshandlerList::ContextNameByProxyId;ContextName=%S", iContextInfoArray[i].iContextName ); // Set context name to aName aContextName = iContextInfoArray[i].iContextName; // Context id found, return KErrNone @@ -517,7 +519,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::GetContextTypeByName"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTTYPEBYNAME, "CMmPacketContextMesshandlerList::GetContextTypeByName" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTTYPEBYNAME_TD, "CMmPacketContextMesshandlerList::GetContextTypeByName" ); TUint8 ret( GPDS_CONT_TYPE_NORMAL ); @@ -534,7 +536,7 @@ } // no else TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::GetContextTypeByName. ContextName: %S, ContextType: %d", &iContextInfoArray[i].iContextName, ret ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTTYPEBYNAME, "CMmPacketContextMesshandlerList::GetContextTypeByName;ContextName=%S;ContextType=%hhu", iContextInfoArray[i].iContextName, ret ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTTYPEBYNAME_TD, "CMmPacketContextMesshandlerList::GetContextTypeByName;ContextName=%S;ContextType=%hhu", iContextInfoArray[i].iContextName, ret ); } // no else } @@ -553,7 +555,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::SetCreateContextIdTransId"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETCREATECONTEXTIDTRANSID, "CMmPacketContextMesshandlerList::SetCreateContextIdTransId" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETCREATECONTEXTIDTRANSID_TD, "CMmPacketContextMesshandlerList::SetCreateContextIdTransId" ); TInt ret( KErrNotFound ); @@ -563,7 +565,7 @@ if ( *aContextName == iContextInfoArray[i].iContextName ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::SetCreateContextIdTransId. ContextName: %S, IdTransId: %d", &iContextInfoArray[i].iContextName, aTransactionId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETCREATECONTEXTIDTRANSID, "CMmPacketContextMesshandlerList::SetCreateContextIdTransId;ContextName=%S;aTransactionId=%d", iContextInfoArray[i].iContextName, aTransactionId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETCREATECONTEXTIDTRANSID_TD, "CMmPacketContextMesshandlerList::SetCreateContextIdTransId;ContextName=%S;aTransactionId=%d", iContextInfoArray[i].iContextName, aTransactionId ); // Return object from the context info list iContextInfoArray[i].iCreateContextIdTransId = aTransactionId; ret = KErrNone; @@ -586,7 +588,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::SetPipeCreateTransId"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPECREATETRANSID, "CMmPacketContextMesshandlerList::SetPipeCreateTransId" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPECREATETRANSID_TD, "CMmPacketContextMesshandlerList::SetPipeCreateTransId" ); TInt ret( KErrNotFound ); @@ -596,7 +598,7 @@ if ( *aContextName == iContextInfoArray[i].iContextName ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::SetPipeCreateTransId. ContextName: %S, CreateTransId: %d", &iContextInfoArray[i].iContextName, aTransactionId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPECREATETRANSID, "CMmPacketContextMesshandlerList::SetPipeCreateTransId;ContextName=%S;aTransactionId=%hhu", iContextInfoArray[i].iContextName, aTransactionId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPECREATETRANSID_TD, "CMmPacketContextMesshandlerList::SetPipeCreateTransId;ContextName=%S;aTransactionId=%hhu", iContextInfoArray[i].iContextName, aTransactionId ); // Return object from the context info list iContextInfoArray[i].iPipeCreateTransId = aTransactionId; ret = KErrNone; @@ -619,7 +621,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetGpdsLlConfigureTraId. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETGPDSLLCONFIGURETRAID, "CMmPacketContextMesshandlerList::SetGpdsLlConfigureTraId;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETGPDSLLCONFIGURETRAID_TD, "CMmPacketContextMesshandlerList::SetGpdsLlConfigureTraId;aContextId=%hhu", aContextId ); TInt ret( KErrNotFound ); @@ -629,7 +631,7 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::SetGpdsLlConfigureTraId. ContextName: %S, L1ConfigureTransId: %d", &iContextInfoArray[i].iContextName, aTransactionId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETGPDSLLCONFIGURETRAID, "CMmPacketContextMesshandlerList::SetGpdsLlConfigureTraId;ContextName=%S;aTransactionId=%hhu", iContextInfoArray[i].iContextName, aTransactionId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETGPDSLLCONFIGURETRAID_TD, "CMmPacketContextMesshandlerList::SetGpdsLlConfigureTraId;ContextName=%S;aTransactionId=%hhu", iContextInfoArray[i].iContextName, aTransactionId ); // Return object from the context info list iContextInfoArray[i].iGpdsLlConfigureTraId = aTransactionId; @@ -653,7 +655,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetRemovePipeTraId. PipeHandle: %d", aPipeHandle ); -OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETREMOVEPIPETRAID, "CMmPacketContextMesshandlerList::SetRemovePipeTraId;aPipeHandle=%d", aPipeHandle ); +OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETREMOVEPIPETRAID_TD, "CMmPacketContextMesshandlerList::SetRemovePipeTraId;aPipeHandle=%d", aPipeHandle ); TInt ret( KErrNotFound ); @@ -663,7 +665,7 @@ if ( aPipeHandle == iContextInfoArray[i].iPipeHandle ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::SetRemovePipeTraId. ContextName: %S, RemovePipeTraId: %d", &iContextInfoArray[i].iContextName, aTransactionId ); -OstTraceExt2( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLERLIST_SETREMOVEPIPETRAID, "CMmPacketContextMesshandlerList::SetRemovePipeTraId;ContextName=%S;aTransactionId=%hhu", iContextInfoArray[i].iContextName, aTransactionId ); +OstTraceExt2( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLERLIST_SETREMOVEPIPETRAID_TD, "CMmPacketContextMesshandlerList::SetRemovePipeTraId;ContextName=%S;aTransactionId=%hhu", iContextInfoArray[i].iContextName, aTransactionId ); // Return object from the context info list iContextInfoArray[i].iRemovePipeTraId = aTransactionId; @@ -687,7 +689,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetActivationTraId. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETACTIVATIONTRAID, "CMmPacketContextMesshandlerList::SetActivationTraId;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETACTIVATIONTRAID_TD, "CMmPacketContextMesshandlerList::SetActivationTraId;aContextId=%hhu", aContextId ); TInt ret( KErrNotFound ); @@ -697,7 +699,7 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::SetActivationTraId. ContextName: %S, ActivationTraId: %d", &iContextInfoArray[i].iContextName, aTransactionId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETACTIVATIONTRAID, "CMmPacketContextMesshandlerList::SetActivationTraId;ContextName=%S;aTransactionId=%hhu", iContextInfoArray[i].iContextName, aTransactionId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETACTIVATIONTRAID_TD, "CMmPacketContextMesshandlerList::SetActivationTraId;ContextName=%S;aTransactionId=%hhu", iContextInfoArray[i].iContextName, aTransactionId ); // Return object from the context info list iContextInfoArray[i].iActivationTraId = aTransactionId; @@ -711,6 +713,36 @@ } // ----------------------------------------------------------------------------- +// CMmPacketContextMesshandlerList::GetActivationTraId +// Returns saved iActivationTraId +// specified by context Id. +// ----------------------------------------------------------------------------- +// +TUint8 CMmPacketContextMesshandlerList::GetActivationTraId( + TUint8 aContextId ) + { + TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetActivationTraId. ContextId: %d", aContextId ); + OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETACTIVATIONTRAID_TD, "CMmPacketContextMesshandlerList::GetActivationTraId;aContextId=%hhu", aContextId ); + + TUint8 transId( KTUint8NotDefined ); + + for ( TInt i = 0; i < KMmMaxNumberOfContexts; i++ ) + { + if ( aContextId == iContextInfoArray[i].iContextId ) + { + // Return object from the context info list + transId = iContextInfoArray[i].iActivationTraId; + TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::GetActivationTraId. ContextName: %S, ActivationTraId: %d", &iContextInfoArray[i].iContextName, transId ); + +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETACTIVATIONTRAID_TD, "CMmPacketContextMesshandlerList::GetActivationTraId;ContextName=%S;transId=%hhu", iContextInfoArray[i].iContextName, transId ); + } + // no else + } + + return transId; + } + +// ----------------------------------------------------------------------------- // CMmPacketContextMesshandlerList::GetAndResetActivationTraId // Resets the iActivationTraId and returns saved iActivationTraId // specified by context Id. @@ -721,7 +753,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetAndResetActivationTraId. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETANDRESETACTIVATIONTRAID, "CMmPacketContextMesshandlerList::GetAndResetActivationTraId;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETANDRESETACTIVATIONTRAID_TD, "CMmPacketContextMesshandlerList::GetAndResetActivationTraId;aContextId=%hhu", aContextId ); TUint8 transId( KTUint8NotDefined ); @@ -734,7 +766,7 @@ iContextInfoArray[i].iActivationTraId = KTUint8NotDefined; TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::GetAndResetActivationTraId. ContextName: %S, ActivationTraId: %d", &iContextInfoArray[i].iContextName, transId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETANDRESETACTIVATIONTRAID, "CMmPacketContextMesshandlerList::GetAndResetActivationTraId;ContextName=%S;transId=%hhu", iContextInfoArray[i].iContextName, transId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETANDRESETACTIVATIONTRAID_TD, "CMmPacketContextMesshandlerList::GetAndResetActivationTraId;ContextName=%S;transId=%hhu", iContextInfoArray[i].iContextName, transId ); } // no else } @@ -753,7 +785,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetDeletionTraId. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETDELETIONTRAID, "CMmPacketContextMesshandlerList::SetDeletionTraId;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETDELETIONTRAID_TD, "CMmPacketContextMesshandlerList::SetDeletionTraId;aContextId=%hhu", aContextId ); TInt ret( KErrNotFound ); @@ -763,7 +795,7 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::SetDeletionTraId. ContextName: %S, DeleteTraId: %d", &iContextInfoArray[i].iContextName, aTransactionId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETDELETIONTRAID, "CMmPacketContextMesshandlerList::SetDeletionTraId;ContextName=%S;aTransactionId=%hhu", iContextInfoArray[i].iContextName, aTransactionId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETDELETIONTRAID_TD, "CMmPacketContextMesshandlerList::SetDeletionTraId;ContextName=%S;aTransactionId=%hhu", iContextInfoArray[i].iContextName, aTransactionId ); // Return object from the context info list iContextInfoArray[i].iDeleteTraId= aTransactionId; ret = KErrNone; @@ -786,7 +818,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetAndResetDeletionTraId. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETANDRESETDELETIONTRAID, "CMmPacketContextMesshandlerList::GetAndResetDeletionTraId;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETANDRESETDELETIONTRAID_TD, "CMmPacketContextMesshandlerList::GetAndResetDeletionTraId;aContextId=%hhu", aContextId ); TUint8 transId( KTUint8NotDefined ); @@ -799,7 +831,7 @@ iContextInfoArray[i].iDeleteTraId = KTUint8NotDefined; TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::GetAndResetActivationTraId. ContextName: %S, DeleteTraId: %d", &iContextInfoArray[i].iContextName, transId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETANDRESETDELETIONTRAID, "CMmPacketContextMesshandlerList::GetAndResetDeletionTraId;ContextName=%s;transId=%hhu", iContextInfoArray[i].iContextName, transId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETANDRESETDELETIONTRAID_TD, "CMmPacketContextMesshandlerList::GetAndResetDeletionTraId;ContextName=%s;transId=%hhu", iContextInfoArray[i].iContextName, transId ); } // no else } @@ -817,7 +849,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::CreateContextIdTransIdByPipeHandle. PipeHandle: %d", aPipeHandle ); -OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CREATECONTEXTIDTRANSIDBYPIPEHANDLE, "CMmPacketContextMesshandlerList::CreateContextIdTransIdByPipeHandle;aPipeHandle=%d", aPipeHandle ); +OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CREATECONTEXTIDTRANSIDBYPIPEHANDLE_TD, "CMmPacketContextMesshandlerList::CreateContextIdTransIdByPipeHandle;aPipeHandle=%d", aPipeHandle ); TUint8 transId( KTUint8NotDefined ); @@ -829,7 +861,7 @@ // Return object from the context info list transId = iContextInfoArray[i].iCreateContextIdTransId; TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::CreateContextIdTransIdByPipeHandle. ContextName: %S, CreateContextIdTransId: %d", &iContextInfoArray[i].iContextName, transId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CREATECONTEXTIDTRANSIDBYPIPEHANDLE, "CMmPacketContextMesshandlerList::CreateContextIdTransIdByPipeHandle;ContextName=%S;transId=%hhu", iContextInfoArray[i].iContextName, transId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CREATECONTEXTIDTRANSIDBYPIPEHANDLE_TD, "CMmPacketContextMesshandlerList::CreateContextIdTransIdByPipeHandle;ContextName=%S;transId=%hhu", iContextInfoArray[i].iContextName, transId ); } // no else } @@ -848,7 +880,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::CreateContextIdTraIdByContextId. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CREATECONTEXTIDTRAIDBYCONTEXTID, "CMmPacketContextMesshandlerList::CreateContextIdTraIdByContextId;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CREATECONTEXTIDTRAIDBYCONTEXTID_TD, "CMmPacketContextMesshandlerList::CreateContextIdTraIdByContextId;aContextId=%hhu", aContextId ); TUint8 transId( KTUint8NotDefined ); @@ -861,7 +893,7 @@ transId = iContextInfoArray[i].iCreateContextIdTransId; TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::CreateContextIdTraIdByContextId. ContextName: %S, CreateContextIdTransId: %d", &iContextInfoArray[i].iContextName, transId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CREATECONTEXTIDTRAIDBYCONTEXTID, "CMmPacketContextMesshandlerList::CreateContextIdTraIdByContextId;ContextName=%S;transId=%hhu", iContextInfoArray[i].iContextName, transId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CREATECONTEXTIDTRAIDBYCONTEXTID_TD, "CMmPacketContextMesshandlerList::CreateContextIdTraIdByContextId;ContextName=%S;transId=%hhu", iContextInfoArray[i].iContextName, transId ); } // no else } @@ -880,7 +912,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::PipeHandleByContextId. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_PIPEHANDLEBYCONTEXTID, "CMmPacketContextMesshandlerList::PipeHandleByContextId;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_PIPEHANDLEBYCONTEXTID_TD, "CMmPacketContextMesshandlerList::PipeHandleByContextId;aContextId=%hhu", aContextId ); TUint8 pipeHandle( KInvalidPipeHandle ); @@ -892,7 +924,7 @@ // Return object from the context info list pipeHandle = iContextInfoArray[i].iPipeHandle; TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::PipeHandleByContextId. ContextName: %S, PipeHandle: %d", &iContextInfoArray[i].iContextName, pipeHandle ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_PIPEHANDLEBYCONTEXTID, "CMmPacketContextMesshandlerList::PipeHandleByContextId;ContextName=%S;pipeHandle=%hhu", iContextInfoArray[i].iContextName, pipeHandle ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_PIPEHANDLEBYCONTEXTID_TD, "CMmPacketContextMesshandlerList::PipeHandleByContextId;ContextName=%S;pipeHandle=%hhu", iContextInfoArray[i].iContextName, pipeHandle ); } // no else } @@ -911,7 +943,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::PipeCreateTransIdOkByTransId. TransId: %d", aTransId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_PIPECREATETRANSIDOKBYTRANSID, "CMmPacketContextMesshandlerList::PipeCreateTransIdOkByTransId;aTransId=%hhu", aTransId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_PIPECREATETRANSIDOKBYTRANSID_TD, "CMmPacketContextMesshandlerList::PipeCreateTransIdOkByTransId;aTransId=%hhu", aTransId ); TInt ret( KErrNotFound ); @@ -921,7 +953,7 @@ if ( aTransId == iContextInfoArray[i].iPipeCreateTransId ) { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::PipeCreateTransIdOkByTransId. TransId Matched"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_PIPECREATETRANSIDOKBYTRANSID, "CMmPacketContextMesshandlerList::PipeCreateTransIdOkByTransId, TransId Matched" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_PIPECREATETRANSIDOKBYTRANSID_TD, "CMmPacketContextMesshandlerList::PipeCreateTransIdOkByTransId, TransId Matched" ); ret = KErrNone; } // no else @@ -940,7 +972,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::CreateContextIdTraIdOK. TransId: %d", aTransId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CREATECONTEXTIDTRAIDOK, "CMmPacketContextMesshandlerList::CreateContextIdTraIdOK;aTransId=%hhu", aTransId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CREATECONTEXTIDTRAIDOK_TD, "CMmPacketContextMesshandlerList::CreateContextIdTraIdOK;aTransId=%hhu", aTransId ); TInt ret( KErrNotFound ); @@ -950,7 +982,7 @@ if ( aTransId == iContextInfoArray[i].iCreateContextIdTransId ) { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::CreateContextIdTraIdOK. TransId Matched"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CREATECONTEXTIDTRAIDOK, "CMmPacketContextMesshandlerList::CreateContextIdTraIdOK, TransId Matched" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CREATECONTEXTIDTRAIDOK_TD, "CMmPacketContextMesshandlerList::CreateContextIdTraIdOK, TransId Matched" ); ret = KErrNone; } // no else @@ -969,7 +1001,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GpdsLlConfigureTraIdOK. TransId: %d", aTransId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GPDSLLCONFIGURETRAIDOK, "CMmPacketContextMesshandlerList::GpdsLlConfigureTraIdOK;aTransId=%hhu", aTransId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GPDSLLCONFIGURETRAIDOK_TD, "CMmPacketContextMesshandlerList::GpdsLlConfigureTraIdOK;aTransId=%hhu", aTransId ); TInt ret( KErrNotFound ); @@ -979,7 +1011,7 @@ if ( aTransId == iContextInfoArray[i].iGpdsLlConfigureTraId ) { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::GpdsLlConfigureTraIdOK. TransId Matched"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GPDSLLCONFIGURETRAIDOK, "CMmPacketContextMesshandlerList::GpdsLlConfigureTraIdOK, TransId Matched" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GPDSLLCONFIGURETRAIDOK_TD, "CMmPacketContextMesshandlerList::GpdsLlConfigureTraIdOK, TransId Matched" ); ret = KErrNone; i = KMmMaxNumberOfContexts; } @@ -1000,7 +1032,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetPipeHandle. TransId: %d", aTransactionId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPEHANDLE, "CMmPacketContextMesshandlerList::SetPipeHandle;aTransactionId=%hhu", aTransactionId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPEHANDLE_TD, "CMmPacketContextMesshandlerList::SetPipeHandle;aTransactionId=%hhu", aTransactionId ); TInt ret( KErrNotFound ); @@ -1010,7 +1042,7 @@ if ( aTransactionId == iContextInfoArray[i].iPipeCreateTransId ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::SetPipeHandle. ContextName: %S, PipeHandle: %d", &iContextInfoArray[i].iContextName, aPipeHandle ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPEHANDLE, "CMmPacketContextMesshandlerList::SetPipeHandle;ContextName=%S;aPipeHandle=%hhu", iContextInfoArray[i].iContextName, aPipeHandle ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPEHANDLE_TD, "CMmPacketContextMesshandlerList::SetPipeHandle;ContextName=%S;aPipeHandle=%hhu", iContextInfoArray[i].iContextName, aPipeHandle ); iContextInfoArray[i].iPipeHandle = aPipeHandle; ret = KErrNone; } @@ -1031,7 +1063,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetPipeStatus. PipeHandle: %d", aPipeHandle ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPESTATUS, "CMmPacketContextMesshandlerList::SetPipeStatus;aPipeHandle=%hhu", aPipeHandle ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPESTATUS_TD, "CMmPacketContextMesshandlerList::SetPipeStatus;aPipeHandle=%hhu", aPipeHandle ); TBool ret( EFalse ); @@ -1041,7 +1073,7 @@ if ( aPipeHandle == iContextInfoArray[i].iPipeHandle ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::SetPipeStatus. ContextName: %S, PipeStatus: %d", &iContextInfoArray[i].iContextName, aPipeStatus ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPESTATUS, "CMmPacketContextMesshandlerList::SetPipeStatus;ContextName=%S;aPipeStatus=%d", iContextInfoArray[i].iContextName, aPipeStatus ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPESTATUS_TD, "CMmPacketContextMesshandlerList::SetPipeStatus;ContextName=%S;aPipeStatus=%d", iContextInfoArray[i].iContextName, aPipeStatus ); iContextInfoArray[i].iPipeStatus = aPipeStatus ; ret = ETrue; } @@ -1061,7 +1093,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetPipeStatus. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETPIPESTATUS, "CMmPacketContextMesshandlerList::GetPipeStatus;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETPIPESTATUS_TD, "CMmPacketContextMesshandlerList::GetPipeStatus;aContextId=%hhu", aContextId ); TInt pipeStatus( PN_PIPE_DISABLE ); @@ -1072,7 +1104,7 @@ { pipeStatus = iContextInfoArray[i].iPipeStatus; TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::GetPipeStatus. ContextName: %S, PipeStatus: %d", &iContextInfoArray[i].iContextName, pipeStatus ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETPIPESTATUS, "CMmPacketContextMesshandlerList::GetPipeStatus;ContextName=%S;pipeStatus=%d", iContextInfoArray[i].iContextName, pipeStatus ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETPIPESTATUS_TD, "CMmPacketContextMesshandlerList::GetPipeStatus;ContextName=%S;pipeStatus=%d", iContextInfoArray[i].iContextName, pipeStatus ); } // no else } @@ -1090,7 +1122,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::GetContextIdByContextName"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTIDBYCONTEXTNAME, "CMmPacketContextMesshandlerList::GetContextIdByContextName" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTIDBYCONTEXTNAME_TD, "CMmPacketContextMesshandlerList::GetContextIdByContextName" ); TUint contextId( GPDS_CID_VOID ); @@ -1100,7 +1132,7 @@ if ( *aContextName == iContextInfoArray[i].iContextName ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::GetContextIdByContextName. ContextName: %S, ContextId: %d", &iContextInfoArray[i].iContextName, iContextInfoArray[i].iContextId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTIDBYCONTEXTNAME, "CMmPacketContextMesshandlerList::GetContextIdByContextName;ContextName=%S;contextId=%d", iContextInfoArray[i].iContextName, iContextInfoArray[i].iContextId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTIDBYCONTEXTNAME_TD, "CMmPacketContextMesshandlerList::GetContextIdByContextName;ContextName=%S;contextId=%d", iContextInfoArray[i].iContextName, iContextInfoArray[i].iContextId ); // Name found, return object contextId = iContextInfoArray[i].iContextId; @@ -1121,7 +1153,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::GetHostCidName"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETHOSTCIDNAME, "CMmPacketContextMesshandlerList::GetHostCidName" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETHOSTCIDNAME_TD, "CMmPacketContextMesshandlerList::GetHostCidName" ); TInfoName hostName; hostName.Zero(); @@ -1132,7 +1164,7 @@ if ( *aContextName == iContextInfoArray[i].iContextName ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::GetHostCidName. ContextName: %S, HostContextName: %S", &iContextInfoArray[i].iContextName, &iContextInfoArray[i].iHostContextName ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETHOSTCIDNAME, "CMmPacketContextMesshandlerList::GetHostCidName;ContextName=%S;HostContextName=%S", iContextInfoArray[i].iContextName, iContextInfoArray[i].iHostContextName ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETHOSTCIDNAME_TD, "CMmPacketContextMesshandlerList::GetHostCidName;ContextName=%S;HostContextName=%S", iContextInfoArray[i].iContextName, iContextInfoArray[i].iHostContextName ); // Name found hostName.Copy( iContextInfoArray[i].iHostContextName ); } @@ -1152,7 +1184,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::RemoveContextId. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_REMOVECONTEXTID, "CMmPacketContextMesshandlerList::RemoveContextId;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_REMOVECONTEXTID_TD, "CMmPacketContextMesshandlerList::RemoveContextId;aContextId=%hhu", aContextId ); TInt ret( KErrNotFound ); @@ -1162,7 +1194,7 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::RemoveContextId. ContextName: %S, ContextId: %d", &iContextInfoArray[i].iContextName, aContextId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_REMOVECONTEXTID, "CMmPacketContextMesshandlerList::RemoveContextId;ContextName=%S;aContextId=%hhu", iContextInfoArray[i].iContextName, aContextId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_REMOVECONTEXTID_TD, "CMmPacketContextMesshandlerList::RemoveContextId;ContextName=%S;aContextId=%hhu", iContextInfoArray[i].iContextName, aContextId ); // Name found iContextInfoArray[i].iContextId = GPDS_CID_VOID; i = KMmMaxNumberOfContexts; @@ -1177,7 +1209,7 @@ if( aContextId == iDialUpContextId ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::RemoveContextId. Dial-Up Context, ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLERLIST_REMOVECONTEXTID, "CMmPacketContextMesshandlerList::RemoveContextId;Dial-Up Context, ContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLERLIST_REMOVECONTEXTID_TD, "CMmPacketContextMesshandlerList::RemoveContextId;Dial-Up Context, ContextId=%hhu", aContextId ); iDialUpContextId = GPDS_CID_VOID; iDialUpContextName.Zero(); ret = KErrNone; @@ -1187,7 +1219,7 @@ if( aContextId == iSecondaryDialUpContextId ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::RemoveContextId. Secondary Dial-Up Context, ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLERLIST_REMOVECONTEXTID, "CMmPacketContextMesshandlerList::RemoveContextId;Secondary Dial-Up Context, ContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLERLIST_REMOVECONTEXTID_TD, "CMmPacketContextMesshandlerList::RemoveContextId;Secondary Dial-Up Context, ContextId=%hhu", aContextId ); iSecondaryDialUpContextId = GPDS_CID_VOID; iSecondaryDialUpContextName.Zero(); ret = KErrNone; @@ -1209,7 +1241,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::ResetPipeHandleAndStatus. PipeHandle: %d", aPipeHandle ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_RESETPIPEHANDLEANDSTATUS, "CMmPacketContextMesshandlerList::ResetPipeHandleAndStatus;aPipeHandle=%hhu", aPipeHandle ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_RESETPIPEHANDLEANDSTATUS_TD, "CMmPacketContextMesshandlerList::ResetPipeHandleAndStatus;aPipeHandle=%hhu", aPipeHandle ); TInt ret( KErrNotFound ); @@ -1219,7 +1251,7 @@ if ( aPipeHandle == iContextInfoArray[i].iPipeHandle ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::ResetPipeHandleAndStatus. ContextName: %S", &iContextInfoArray[i].iContextName ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_RESETPIPEHANDLEANDSTATUS, "CMmPacketContextMesshandlerList::ResetPipeHandleAndStatus;ContextName=%S", iContextInfoArray[i].iContextName ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_RESETPIPEHANDLEANDSTATUS_TD, "CMmPacketContextMesshandlerList::ResetPipeHandleAndStatus;ContextName=%S", iContextInfoArray[i].iContextName ); // Pipe found iContextInfoArray[i].iPipeHandle = KInvalidPipeHandle; @@ -1244,7 +1276,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetInitialiseMember. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETINITIALISEMEMBER, "CMmPacketContextMesshandlerList::SetInitialiseMember;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETINITIALISEMEMBER_TD, "CMmPacketContextMesshandlerList::SetInitialiseMember;aContextId=%hhu", aContextId ); TBool ret( EFalse ); @@ -1254,7 +1286,7 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::SetInitialiseMember. ContextName: %S, InitialiseStarted: %d", &iContextInfoArray[i].iContextName, aFlag ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETINITIALISEMEMBER, "CMmPacketContextMesshandlerList::SetInitialiseMember;ContextName=%S;aFlag=%hhu", iContextInfoArray[i].iContextName, aFlag ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETINITIALISEMEMBER_TD, "CMmPacketContextMesshandlerList::SetInitialiseMember;ContextName=%S;aFlag=%hhu", iContextInfoArray[i].iContextName, aFlag ); // Return object from the context info list iContextInfoArray[i].iInitialiseStarted = aFlag; ret = ETrue; @@ -1275,7 +1307,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetInitialiseMember. PipeHandle: %d", aPipeHandle ); -OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETINITIALISEMEMBER, "CMmPacketContextMesshandlerList::GetInitialiseMember;aPipeHandle=%d", aPipeHandle ); +OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETINITIALISEMEMBER_TD, "CMmPacketContextMesshandlerList::GetInitialiseMember;aPipeHandle=%d", aPipeHandle ); TBool ret( EFalse ); @@ -1285,7 +1317,7 @@ if ( aPipeHandle == iContextInfoArray[i].iPipeHandle ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::GetInitialiseMember. ContextName: %S, InitialiseStarted: %d", &iContextInfoArray[i].iContextName, iContextInfoArray[i].iInitialiseStarted ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETINITIALISEMEMBER, "CMmPacketContextMesshandlerList::GetInitialiseMember;ContextName=%S;InitialiseStarted=%hhu", iContextInfoArray[i].iContextName, iContextInfoArray[i].iInitialiseStarted ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETINITIALISEMEMBER_TD, "CMmPacketContextMesshandlerList::GetInitialiseMember;ContextName=%S;InitialiseStarted=%hhu", iContextInfoArray[i].iContextName, iContextInfoArray[i].iInitialiseStarted ); ret = iContextInfoArray[i].iInitialiseStarted; } // no else @@ -1304,7 +1336,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::ContextIdByPipeHandle. PipeHandle: %d", aPipeHandle ); -OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CONTEXTIDBYPIPEHANDLE, "CMmPacketContextMesshandlerList::ContextIdByPipeHandle;aPipeHandle=%d", aPipeHandle ); +OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CONTEXTIDBYPIPEHANDLE_TD, "CMmPacketContextMesshandlerList::ContextIdByPipeHandle;aPipeHandle=%d", aPipeHandle ); TUint8 contextId( GPDS_CID_VOID ); @@ -1314,7 +1346,7 @@ if ( aPipeHandle == iContextInfoArray[i].iPipeHandle ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::ContextIdByPipeHandle. ContextId: %d", iContextInfoArray[i].iContextId ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CONTEXTIDBYPIPEHANDLE, "CMmPacketContextMesshandlerList::ContextIdByPipeHandle;ContextId=%hhu", iContextInfoArray[i].iContextId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CONTEXTIDBYPIPEHANDLE_TD, "CMmPacketContextMesshandlerList::ContextIdByPipeHandle;ContextId=%hhu", iContextInfoArray[i].iContextId ); // Return object from the context info list contextId = iContextInfoArray[i].iContextId; @@ -1337,7 +1369,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetContextConfigurationType. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETCONTEXTCONFIGURATIONTYPE, "CMmPacketContextMesshandlerList::SetContextConfigurationType;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETCONTEXTCONFIGURATIONTYPE_TD, "CMmPacketContextMesshandlerList::SetContextConfigurationType;aContextId=%hhu", aContextId ); TBool ret( EFalse ); @@ -1347,7 +1379,7 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::SetContextConfigurationType. ContextName: %S, ConfigType: %d", &iContextInfoArray[i].iContextName, aConfigType ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETCONTEXTCONFIGURATIONTYPE, "CMmPacketContextMesshandlerList::SetContextConfigurationType;ContextName=%S;aConfigType=%d", iContextInfoArray[i].iContextName, aConfigType ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETCONTEXTCONFIGURATIONTYPE_TD, "CMmPacketContextMesshandlerList::SetContextConfigurationType;ContextName=%S;aConfigType=%d", iContextInfoArray[i].iContextName, aConfigType ); // Return object from the context info list iContextInfoArray[i].iContextConfigurationType = aConfigType; @@ -1369,7 +1401,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetContextConfigurationType. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTCONFIGURATIONTYPE, "CMmPacketContextMesshandlerList::GetContextConfigurationType;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTCONFIGURATIONTYPE_TD, "CMmPacketContextMesshandlerList::GetContextConfigurationType;aContextId=%hhu", aContextId ); TInt ret( KTIntNotDefined ); @@ -1381,7 +1413,7 @@ // Return object from the context info list ret = iContextInfoArray[i].iContextConfigurationType; TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::GetContextConfigurationType. ContextName: %S, ConfigType: %d", &iContextInfoArray[i].iContextName, ret ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTCONFIGURATIONTYPE, "CMmPacketContextMesshandlerList::GetContextConfigurationType;ContextName=%S;ret=%d", iContextInfoArray[i].iContextName, ret ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTCONFIGURATIONTYPE_TD, "CMmPacketContextMesshandlerList::GetContextConfigurationType;ContextName=%S;ret=%d", iContextInfoArray[i].iContextName, ret ); } // no else } @@ -1402,7 +1434,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::SaveConfig"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLERLIST_SAVECONFIG, "CMmPacketContextMesshandlerList::SaveConfig" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLERLIST_SAVECONFIG_TD, "CMmPacketContextMesshandlerList::SaveConfig" ); TInt ret( KErrArgument ); @@ -1412,12 +1444,12 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::SaveConfig. ContextName: %S, ContextId: %d", &iContextInfoArray[i].iContextName, aContextId ); -OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SAVECONFIG, "CMmPacketContextMesshandlerList::SaveConfig;ContextName=%S;aContextId=%hhu", iContextInfoArray[i].iContextName, aContextId ); +OstTraceExt2( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SAVECONFIG_TD, "CMmPacketContextMesshandlerList::SaveConfig;ContextName=%S;aContextId=%hhu", iContextInfoArray[i].iContextName, aContextId ); // Return object from the context info list if( TPacketDataConfigBase::KConfigGPRS == aConfigurationType ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SaveConfig. ConfigType: %d", aConfigurationType ); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SAVECONFIG, "CMmPacketContextMesshandlerList::SaveConfig;aConfigurationType=%d", aConfigurationType ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SAVECONFIG_TD, "CMmPacketContextMesshandlerList::SaveConfig;aConfigurationType=%d", aConfigurationType ); iContextInfoArray[i].iConfig = *aConfig; iContextInfoArray[i].iContextConfigurationType = aConfigurationType; @@ -1428,7 +1460,7 @@ aConfigurationType ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SaveConfig. ConfigType: %d", aConfigurationType ); -OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLERLIST_SAVECONFIG, "CMmPacketContextMesshandlerList::SaveConfig;aConfigurationType=%d", aConfigurationType ); +OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLERLIST_SAVECONFIG_TD, "CMmPacketContextMesshandlerList::SaveConfig;aConfigurationType=%d", aConfigurationType ); iContextInfoArray[i].iConfig99 = *aConfig99; iContextInfoArray[i].iContextConfigurationType = @@ -1456,7 +1488,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::GetConfig"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETCONFIG, "CMmPacketContextMesshandlerList::GetConfig" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETCONFIG_TD, "CMmPacketContextMesshandlerList::GetConfig" ); TPacketDataConfigBase* config; config = NULL; @@ -1467,12 +1499,12 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::GetConfig. ContextName: %S, ContextId: %d", &iContextInfoArray[i].iContextName, aContextId ); -OstTraceExt2( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONFIG, "CMmPacketContextMesshandlerList::GetConfig;ContextName=%S;aContextId=%hhu", iContextInfoArray[i].iContextName, aContextId ); +OstTraceExt2( TRACE_NORMAL, DUP3_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONFIG_TD, "CMmPacketContextMesshandlerList::GetConfig;ContextName=%S;aContextId=%hhu", iContextInfoArray[i].iContextName, aContextId ); // Return object from the context info list if( TPacketDataConfigBase::KConfigGPRS == aConfigurationType ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetConfig. ConfigType: %d", aConfigurationType ); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONFIG, "CMmPacketContextMesshandlerList::GetConfig;aConfigurationType=%d", aConfigurationType ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONFIG_TD, "CMmPacketContextMesshandlerList::GetConfig;aConfigurationType=%d", aConfigurationType ); // Return object from the context info list config = &( iContextInfoArray[i].iConfig ); } @@ -1480,7 +1512,7 @@ aConfigurationType ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetConfig. ConfigType: %d", aConfigurationType ); -OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONFIG, "CMmPacketContextMesshandlerList::GetConfig;aConfigurationType=%d", aConfigurationType ); +OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONFIG_TD, "CMmPacketContextMesshandlerList::GetConfig;aConfigurationType=%d", aConfigurationType ); // Return object from the context info list config = &( iContextInfoArray[i].iConfig99 ); } @@ -1503,7 +1535,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetPipeResetTraId. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPERESETTRAID, "CMmPacketContextMesshandlerList::SetPipeResetTraId;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPERESETTRAID_TD, "CMmPacketContextMesshandlerList::SetPipeResetTraId;aContextId=%hhu", aContextId ); TInt ret( KErrNotFound ); @@ -1513,7 +1545,7 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::SetPipeResetTraId. ContextName: %S, PipeResetTraId: %d", &iContextInfoArray[i].iContextName, aTransId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPERESETTRAID, "CMmPacketContextMesshandlerList::SetPipeResetTraId;ContextName=%S;aTransId=%hhu", iContextInfoArray[i].iContextName, aTransId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETPIPERESETTRAID_TD, "CMmPacketContextMesshandlerList::SetPipeResetTraId;ContextName=%S;aTransId=%hhu", iContextInfoArray[i].iContextName, aTransId ); // Return object from the context info list iContextInfoArray[i].iPipeResetTraId = aTransId; i = KMmMaxNumberOfContexts; @@ -1535,7 +1567,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::CheckAndResetPipeResetTraId. TransId: %d", aTransId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CHECKANDRESETPIPERESETTRAID, "CMmPacketContextMesshandlerList::CheckAndResetPipeResetTraId;aTransId=%hhu", aTransId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CHECKANDRESETPIPERESETTRAID_TD, "CMmPacketContextMesshandlerList::CheckAndResetPipeResetTraId;aTransId=%hhu", aTransId ); TInt ret( KErrNotFound ); @@ -1545,10 +1577,10 @@ if ( aTransId == iContextInfoArray[i].iPipeResetTraId ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::CheckAndResetPipeResetTraId. ContextName: %S", &iContextInfoArray[i].iContextName ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CHECKANDRESETPIPERESETTRAID, "CMmPacketContextMesshandlerList::CheckAndResetPipeResetTraId;ContextName=%S", iContextInfoArray[i].iContextName ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CHECKANDRESETPIPERESETTRAID_TD, "CMmPacketContextMesshandlerList::CheckAndResetPipeResetTraId;ContextName=%S", iContextInfoArray[i].iContextName ); ret = KErrNone; + iContextInfoArray[i].iPipeResetTraId = KTUint8NotDefined; i = KMmMaxNumberOfContexts; - iContextInfoArray[i].iPipeResetTraId = KTUint8NotDefined; } // no else } @@ -1566,7 +1598,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::ProxyIdByContextId. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_PROXYIDBYCONTEXTID, "CMmPacketContextMesshandlerList::ProxyIdByContextId;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_PROXYIDBYCONTEXTID_TD, "CMmPacketContextMesshandlerList::ProxyIdByContextId;aContextId=%hhu", aContextId ); TUint channelId( KTUint8NotDefined ); @@ -1576,7 +1608,7 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::ProxyIdByContextId. ContextName: %S, ChannelId: %d", &iContextInfoArray[i].iContextName, iContextInfoArray[i].iChannelId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_PROXYIDBYCONTEXTID, "CMmPacketContextMesshandlerList::ProxyIdByContextId;ContextName=%S;ChannelId=%hhu", iContextInfoArray[i].iContextName, iContextInfoArray[i].iChannelId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_PROXYIDBYCONTEXTID_TD, "CMmPacketContextMesshandlerList::ProxyIdByContextId;ContextName=%S;ChannelId=%hhu", iContextInfoArray[i].iContextName, iContextInfoArray[i].iChannelId ); channelId = iContextInfoArray[i].iChannelId; } // no else @@ -1600,7 +1632,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::SetDialUpContextId iSecondaryDialUpContextName."); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETDIALUPCONTEXTID, "CMmPacketContextMesshandlerList::SetDialUpContextId, iSecondaryDialUpContextName" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETDIALUPCONTEXTID_TD, "CMmPacketContextMesshandlerList::SetDialUpContextId, iSecondaryDialUpContextName" ); iSecondaryDialUpContextName = KStringExternal2; iSecondaryDialUpContextId = aContextId; @@ -1609,7 +1641,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::SetDialUpContextId iDialUpContextId."); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETDIALUPCONTEXTID, "CMmPacketContextMesshandlerList::SetDialUpContextId, iDialUpContextId" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETDIALUPCONTEXTID_TD, "CMmPacketContextMesshandlerList::SetDialUpContextId, iDialUpContextId" ); iDialUpContextId = aContextId; iDialUpContextName = KStringExternal; @@ -1625,7 +1657,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::GetDialUpContextId"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETDIALUPCONTEXTID, "CMmPacketContextMesshandlerList::GetDialUpContextId" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETDIALUPCONTEXTID_TD, "CMmPacketContextMesshandlerList::GetDialUpContextId" ); return iDialUpContextId; } @@ -1641,7 +1673,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::DialUpContextName"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_DIALUPCONTEXTNAME, "CMmPacketContextMesshandlerList::DialUpContextName" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_DIALUPCONTEXTNAME_TD, "CMmPacketContextMesshandlerList::DialUpContextName" ); TInt ret( KErrNotFound ); @@ -1649,7 +1681,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::DialUpContextName. DialUpContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_DIALUPCONTEXTNAME, "CMmPacketContextMesshandlerList::DialUpContextName;DialUpContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_DIALUPCONTEXTNAME_TD, "CMmPacketContextMesshandlerList::DialUpContextName;DialUpContextId=%hhu", aContextId ); aContextName = iDialUpContextName; ret = KErrNone; } @@ -1659,7 +1691,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::DialUpContextName. SecondaryDialUpContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLERLIST_DIALUPCONTEXTNAME, "CMmPacketContextMesshandlerList::DialUpContextName;DialUpContextName=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLERLIST_DIALUPCONTEXTNAME_TD, "CMmPacketContextMesshandlerList::DialUpContextName;DialUpContextName=%hhu", aContextId ); aContextName = iSecondaryDialUpContextName; ret = KErrNone; } @@ -1678,7 +1710,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::GetDialUpContextIdByName"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETDIALUPCONTEXTIDBYNAME, "CMmPacketContextMesshandlerList::GetDialUpContextIdByName" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETDIALUPCONTEXTIDBYNAME_TD, "CMmPacketContextMesshandlerList::GetDialUpContextIdByName" ); TUint8 contextId( GPDS_CID_VOID ); @@ -1686,7 +1718,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetDialUpContextIdByName. DialUpContextId: %d", iDialUpContextId ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETDIALUPCONTEXTIDBYNAME, "CMmPacketContextMesshandlerList::GetDialUpContextIdByName;DialUpContextId=%hhu", contextId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETDIALUPCONTEXTIDBYNAME_TD, "CMmPacketContextMesshandlerList::GetDialUpContextIdByName;DialUpContextId=%hhu", contextId ); // Name found, return object contextId = iDialUpContextId; } @@ -1699,7 +1731,7 @@ TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetDialUpContextIdByName. SecondaryDialUpContextId: %d", contextId ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLERLIST_GETDIALUPCONTEXTIDBYNAME, "CMmPacketContextMesshandlerList::GetDialUpContextIdByName;SecondaryDialUpContextId=%hhu", contextId ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETCONTEXTMESSHANDLERLIST_GETDIALUPCONTEXTIDBYNAME_TD, "CMmPacketContextMesshandlerList::GetDialUpContextIdByName;SecondaryDialUpContextId=%hhu", contextId ); } // no else @@ -1717,7 +1749,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::RemoveObjectByName"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_REMOVEOBJECTBYNAME, "CMmPacketContextMesshandlerList::RemoveObjectByName" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_REMOVEOBJECTBYNAME_TD, "CMmPacketContextMesshandlerList::RemoveObjectByName" ); // Set ret to KErrArgument to check that context is in list for ( TInt i = 0; i < KMmMaxNumberOfContexts; i++ ) @@ -1726,8 +1758,11 @@ if ( *aContextName == iContextInfoArray[i].iContextName ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::RemoveObjectByName. Context Name: %S", &iContextInfoArray[i].iContextName ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_REMOVEOBJECTBYNAME, "CMmPacketContextMesshandlerList::RemoveObjectByName;ContextName=%S", iContextInfoArray[i].iContextName ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_REMOVEOBJECTBYNAME_TD, "CMmPacketContextMesshandlerList::RemoveObjectByName;ContextName=%S", iContextInfoArray[i].iContextName ); + // Close channel and mark it closed + iContextInfoArray[i].iIscApi.Close(); + iContextInfoArray[i].iChannelOpened = EFalse; // Reset object information InitializeContextInfoList( i ); // Decrease number of created contexts @@ -1748,7 +1783,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::SetDNSAddressInfoToContextInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETDNSADDRESSINFOTOCONTEXTINFO, "CMmPacketContextMesshandlerList::SetDNSAddressInfoToContextInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETDNSADDRESSINFOTOCONTEXTINFO_TD, "CMmPacketContextMesshandlerList::SetDNSAddressInfoToContextInfo" ); TInt ret( KErrNotFound ); @@ -1758,7 +1793,7 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetDNSAddressInfoToContextInfo. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETDNSADDRESSINFOTOCONTEXTINFO, "CMmPacketContextMesshandlerList::SetDNSAddressInfoToContextInfo;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETDNSADDRESSINFOTOCONTEXTINFO_TD, "CMmPacketContextMesshandlerList::SetDNSAddressInfoToContextInfo;aContextId=%hhu", aContextId ); iContextInfoArray[i].iAddDNSAddress = ETrue; ret = KErrNone; } @@ -1778,7 +1813,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::GetDNSAddressInfoToContextInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETDNSADDRESSINFOTOCONTEXTINFO, "CMmPacketContextMesshandlerList::GetDNSAddressInfoToContextInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETDNSADDRESSINFOTOCONTEXTINFO_TD, "CMmPacketContextMesshandlerList::GetDNSAddressInfoToContextInfo" ); TBool addDNSAddress( EFalse ); @@ -1788,7 +1823,7 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::GetDNSAddressInfoToContextInfo. ContextId: %d, AddDNSAddress: %d", aContextId, iContextInfoArray[i].iAddDNSAddress ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETDNSADDRESSINFOTOCONTEXTINFO, "CMmPacketContextMesshandlerList::GetDNSAddressInfoToContextInfo;aContextId=%hhu;AddDNSAddress=%hhu", aContextId, iContextInfoArray[i].iAddDNSAddress ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETDNSADDRESSINFOTOCONTEXTINFO_TD, "CMmPacketContextMesshandlerList::GetDNSAddressInfoToContextInfo;aContextId=%hhu;AddDNSAddress=%hhu", aContextId, iContextInfoArray[i].iAddDNSAddress ); addDNSAddress = iContextInfoArray[i].iAddDNSAddress; } // no else @@ -1807,7 +1842,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::SetPCSCFAddressInfoToContextInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETPCSCFADDRESSINFOTOCONTEXTINFO, "CMmPacketContextMesshandlerList::SetPCSCFAddressInfoToContextInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETPCSCFADDRESSINFOTOCONTEXTINFO_TD, "CMmPacketContextMesshandlerList::SetPCSCFAddressInfoToContextInfo" ); TInt ret( KErrNotFound ); @@ -1817,7 +1852,7 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetPCSCFAddressInfoToContextInfo. ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETPCSCFADDRESSINFOTOCONTEXTINFO, "CMmPacketContextMesshandlerList::SetPCSCFAddressInfoToContextInfo;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETPCSCFADDRESSINFOTOCONTEXTINFO_TD, "CMmPacketContextMesshandlerList::SetPCSCFAddressInfoToContextInfo;aContextId=%hhu", aContextId ); iContextInfoArray[i].iAddPCSCFAddress = ETrue; ret = KErrNone; } @@ -1837,7 +1872,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::GetPCSCFAddressInfoToContextInfo"); -OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETPCSCFADDRESSINFOTOCONTEXTINFO, "CMmPacketContextMesshandlerList::GetPCSCFAddressInfoToContextInfo" ); +OstTrace0( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETPCSCFADDRESSINFOTOCONTEXTINFO_TD, "CMmPacketContextMesshandlerList::GetPCSCFAddressInfoToContextInfo" ); TBool addPCSCFAddress( EFalse ); @@ -1847,7 +1882,7 @@ if ( aContextId == iContextInfoArray[i].iContextId ) { TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::GetPCSCFAddressInfoToContextInfo. ContextId: %d, AddPCSCFAddress: %d", aContextId, iContextInfoArray[i].iAddPCSCFAddress ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETPCSCFADDRESSINFOTOCONTEXTINFO, "CMmPacketContextMesshandlerList::GetPCSCFAddressInfoToContextInfo;aContextId=%hhu;AddPCSCFAddress=%hhu", aContextId, iContextInfoArray[i].iAddPCSCFAddress ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETPCSCFADDRESSINFOTOCONTEXTINFO_TD, "CMmPacketContextMesshandlerList::GetPCSCFAddressInfoToContextInfo;aContextId=%hhu;AddPCSCFAddress=%hhu", aContextId, iContextInfoArray[i].iAddPCSCFAddress ); addPCSCFAddress = iContextInfoArray[i].iAddPCSCFAddress; } // no else @@ -1866,7 +1901,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::ContextIdByListIndex, Index: %d", aListIndex ); -OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CONTEXTIDBYLISTINDEX, "CMmPacketContextMesshandlerList::ContextIdByListIndex;aListIndex=%d", aListIndex ); +OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_CONTEXTIDBYLISTINDEX_TD, "CMmPacketContextMesshandlerList::ContextIdByListIndex;aListIndex=%d", aListIndex ); TUint8 contextId( GPDS_CID_VOID ); @@ -1875,7 +1910,7 @@ // Return context id from the context info list contextId = iContextInfoArray[aListIndex].iContextId; TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::ContextIdByListIndex. ContextId: %d", contextId ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CONTEXTIDBYLISTINDEX, "CMmPacketContextMesshandlerList::ContextIdByListIndex;contextId=%hhu", contextId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_CONTEXTIDBYLISTINDEX_TD, "CMmPacketContextMesshandlerList::ContextIdByListIndex;contextId=%hhu", contextId ); } // no else @@ -1892,7 +1927,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetContextTypeByName, ContextId: %d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTTYPEBYID, "CMmPacketContextMesshandlerList::GetContextTypeById;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTTYPEBYID_TD, "CMmPacketContextMesshandlerList::GetContextTypeById;aContextId=%hhu", aContextId ); TUint8 ret( GPDS_CONT_TYPE_NORMAL ); @@ -1908,7 +1943,40 @@ } // no else TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetContextTypeById, ContextType: %d", ret ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTTYPEBYID, "CMmPacketContextMesshandlerList::GetContextTypeById;ContextType=%hhu", ret ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTTYPEBYID_TD, "CMmPacketContextMesshandlerList::GetContextTypeById;ContextType=%hhu", ret ); + } + // no else + } + + return ret; + } + +// ----------------------------------------------------------------------------- +// CMmPacketContextMesshandlerList::SetLoanReturning +// Gets initialisation member for specific context identified by pipehandle. +// ----------------------------------------------------------------------------- +// +TBool CMmPacketContextMesshandlerList::SetLoanReturning( + TUint8 aPipeHandle, + TBool aFlag ) + { + + TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetLoanReturning. PipeHandle: %d", aPipeHandle ); + OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETLOANRETURNING_TD, "CMmPacketContextMesshandlerList::SetLoanReturning;aPipeHandle=%d", aPipeHandle ); + + TBool ret( EFalse ); + + // Find name from context info list + for ( TInt i = 0; i < KMmMaxNumberOfContexts; i++ ) + { + if ( aPipeHandle == iContextInfoArray[i].iPipeHandle ) + { + TFLOGSTRING("TSY: CMmPacketContextMesshandlerList::SetLoanReturning - match found" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETLOANRETURNING_TD, "CMmPacketContextMesshandlerList::SetLoanReturning - match found" ); + + iContextInfoArray[i].iLoanReturning = aFlag; + ret = ETrue; + break; } // no else } @@ -1917,6 +1985,97 @@ } // ----------------------------------------------------------------------------- +// CMmPacketContextMesshandlerList::IsLoanReturning +// ----------------------------------------------------------------------------- +// +TBool CMmPacketContextMesshandlerList::IsLoanReturning( + TUint8 aPipeHandle ) const + { + + TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::IsLoanReturning. PipeHandle: %d", aPipeHandle ); + OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_ISLOANRETURNING_TD, "CMmPacketContextMesshandlerList::GetInitialiseMember;aPipeHandle=%d", aPipeHandle ); + + TBool ret( EFalse ); + + // Find name from context info list + for ( TInt i = 0; i < KMmMaxNumberOfContexts; i++ ) + { + if ( aPipeHandle == iContextInfoArray[i].iPipeHandle ) + { + + TFLOGSTRING3("TSY: CMmPacketContextMesshandlerList::IsLoanReturning. ContextName: %S, InitialiseStarted: %d", &iContextInfoArray[i].iContextName, iContextInfoArray[i].iInitialiseStarted ); + OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_ISLOANRETURNING_TD, "CMmPacketContextMesshandlerList::IsLoanReturning;ContextName=%S;InitialiseStarted=%hhu", iContextInfoArray[i].iContextName, iContextInfoArray[i].iInitialiseStarted ); + + ret = iContextInfoArray[i].iLoanReturning; + } + // no else + } + + return ret; + } + +// ----------------------------------------------------------------------------- +// CMmPacketContextMesshandlerList::SetExternalDevice +// Set device id and object id of loaning pep +// ----------------------------------------------------------------------------- +// +TInt CMmPacketContextMesshandlerList::SetExternalDevice( + TUint8 aChannelId, + TUint8 aDevId, + TUint8 aObjId ) + { + TInt ret( KErrNotFound ); + TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetExternalDevice. aChannelId: 0x%x", aChannelId ); + OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_SETEXTERNALDEVICE_TD, "CMmPacketContextMesshandlerList::SetExternalDevice;aChannelId=%x", aChannelId ); + + for ( TInt i = 0; i < iNumberOfCreatedContexts; i++ ) + { + if ( aChannelId == iContextInfoArray[i].iChannelId ) + { + TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::SetExternalDevice. ContextName: %S", &iContextInfoArray[i].iContextName ); + OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_SETEXTERNALDEVICE_TD, "CMmPacketContextMesshandlerList::SetExternalDevice;iContextInfoArray[i].iContextName=%S", iContextInfoArray[i].iContextName ); + iContextInfoArray[i].iExtDevId = aDevId; + iContextInfoArray[i].iExtObjId = aObjId; + ret = KErrNone; + break; + } + } + + return ret; + } + +// ----------------------------------------------------------------------------- +// CMmPacketContextMesshandlerList::GetExternalDevice +// Get device id and object id of loaning pep +// ----------------------------------------------------------------------------- +// +TInt CMmPacketContextMesshandlerList::GetExternalDevice( + TUint8 aChannelId, + TUint8& aDevId, + TUint8& aObjId ) + { + TInt ret( KErrNotFound ); + TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetExternalDevice. aChannelId: 0x%x", aChannelId ); + OstTrace1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETEXTERNALDEVICE_TD, "CMmPacketContextMesshandlerList::GetExternalDevice;aChannelId=%x", aChannelId ); + + for ( TInt i = 0; i < iNumberOfCreatedContexts; i++ ) + { + if ( aChannelId == iContextInfoArray[i].iChannelId ) + { + TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::GetExternalDevice. ContextName: %S", &iContextInfoArray[i].iContextName ); + OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETCONTEXTMESSHANDLERLIST_GETEXTERNALDEVICE_TD, "CMmPacketContextMesshandlerList::GetExternalDevice;iContextInfoArray[i].iContextName=%s", iContextInfoArray[i].iContextName ); + aDevId = iContextInfoArray[i].iExtDevId; + aObjId = iContextInfoArray[i].iExtObjId; + ret = KErrNone; + break; + } + } + + return ret; + } + + +// ----------------------------------------------------------------------------- // CMmPacketContextMesshandlerList::InitializeContextInfoList // This function initializes context info // ----------------------------------------------------------------------------- @@ -1926,7 +2085,7 @@ { TFLOGSTRING2("TSY: CMmPacketContextMesshandlerList::InitializeContextInfoList, ContextId: %d", aContextId ); -//OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTTYPEBYID, "CMmPacketContextMesshandlerList::GetContextTypeById;aContextId=%hhu", aContextId ); +//OstTraceExt1( TRACE_NORMAL, CMMPACKETCONTEXTMESSHANDLERLIST_GETCONTEXTTYPEBYID_TD, "CMmPacketContextMesshandlerList::GetContextTypeById;aContextId=%hhu", aContextId ); iContextInfoArray[aContextId].iContextId = GPDS_CID_VOID; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmpacketqosmesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmpacketqosmesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmpacketqosmesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -75,7 +75,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::C++ constructor"); -OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_CMMPACKETQOSMESSHANDLER, "CMmPacketQoSMessHandler::CMmPacketQoSMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_CMMPACKETQOSMESSHANDLER_TD, "CMmPacketQoSMessHandler::CMmPacketQoSMessHandler" ); } // ----------------------------------------------------------------------------- @@ -87,7 +87,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::~CMmPacketQoSMessHandler." ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_CMMPACKETQOSMESSHANDLER, "CMmPacketQoSMessHandler::~CMmPacketQoSMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_CMMPACKETQOSMESSHANDLER_TD, "CMmPacketQoSMessHandler::~CMmPacketQoSMessHandler" ); // if for some reasons, pointers haven't been deleted in SetProfileParamtersL // do it here @@ -129,7 +129,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::NewL."); -OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_NEWL, "CMmPacketQoSMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_NEWL_TD, "CMmPacketQoSMessHandler::NewL" ); CMmPacketQoSMessHandler* packetQoSMessHandler = new ( ELeave ) CMmPacketQoSMessHandler(); @@ -164,7 +164,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::ConstructL."); -OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_CONSTRUCTL, "CMmPacketQoSMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_CONSTRUCTL_TD, "CMmPacketQoSMessHandler::ConstructL" ); // Initialise to NULL iQos.iQoSMinInfo = NULL; @@ -184,7 +184,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::ReceiveMessageL." ); -OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketQoSMessHandler::ReceiveMessageL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketQoSMessHandler::ReceiveMessageL" ); TInt resource( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) ); TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); @@ -197,7 +197,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::GpdsContextConfigureResp." ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketQoSMessHandler::ReceiveMessageL, GpdsContextConfigureResp" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketQoSMessHandler::ReceiveMessageL, GpdsContextConfigureResp" ); GpdsContextConfigureResp( aIsiMessage ); break; } @@ -205,7 +205,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::GpdsContextActivateInd." ); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketQoSMessHandler::ReceiveMessageL, GpdsContextActivateInd" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketQoSMessHandler::ReceiveMessageL, GpdsContextActivateInd" ); GpdsContextActivateOrModifyInd( aIsiMessage ); break; } @@ -213,7 +213,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::GpdsContextModifyInd." ); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketQoSMessHandler::ReceiveMessageL, GpdsContextModifyInd" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketQoSMessHandler::ReceiveMessageL, GpdsContextModifyInd" ); GpdsContextActivateOrModifyInd( aIsiMessage ); break; } @@ -221,7 +221,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::ReceiveMessageL. Default case: Do nothing"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketQoSMessHandler::ReceiveMessageL, Default case: Do nothing" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketQoSMessHandler::ReceiveMessageL, Default case: Do nothing" ); break; } } @@ -245,7 +245,7 @@ { TFLOGSTRING2("TSY: CMmPacketQoSMessHandler::GpdsContextConfigureReq. \t contextId:%d", aContextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketQoSMessHandler::GpdsContextConfigureReq;aContextId=%hhu", aContextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketQoSMessHandler::GpdsContextConfigureReq;aContextId=%hhu", aContextId ); TInt ret( KErrArgument ); @@ -308,7 +308,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::GpdsContextConfigureReq. KConfigGPRS" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketQoSMessHandler::GpdsContextConfigureReq, KConfigGPRS" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketQoSMessHandler::GpdsContextConfigureReq, KConfigGPRS" ); // Add GPDS_DNS_ADDRESS_REQ_INFO sub block if( iMmPacketContextMesshandlerList-> GetDNSAddressInfoToContextInfo(aContextId) ) @@ -404,14 +404,14 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::GpdsContextConfigureReq. KConfigRel99Rel4" ); -OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketQoSMessHandler::GpdsContextConfigureReq, KConfigRel99Rel4" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketQoSMessHandler::GpdsContextConfigureReq, KConfigRel99Rel4" ); // Add GPDS_DNS_ADDRESS_REQ_INFO sub block if( iMmPacketContextMesshandlerList->GetDNSAddressInfoToContextInfo(aContextId) ) { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::GpdsContextConfigureReq. DNS Addresses REQUESTED" ); -OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketQoSMessHandler::GpdsContextConfigureReq, DNS Addresses REQUESTED" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketQoSMessHandler::GpdsContextConfigureReq, DNS Addresses REQUESTED" ); TBuf8 dnsAddrInfoBuf; TIsiSubBlock dnsAddrInfoSubBlock( dnsAddrInfoBuf, @@ -436,7 +436,7 @@ { TFLOGSTRING("TSY: CMmPacketContextMessHandler::GpdsContextConfigureReq. PCSCF Addresses Requested"); -OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketQoSMessHandler::GpdsContextConfigureReq, PCSCF Addresses Requested" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketQoSMessHandler::GpdsContextConfigureReq, PCSCF Addresses Requested" ); TBuf8 tempPscfAddrInfo; TIsiSubBlock reqInfoSubBlock( @@ -604,7 +604,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd." ); -OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_GPDSCONTEXTACTIVATEORMODIFYIND, "CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd" ); +OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_GPDSCONTEXTACTIVATEORMODIFYIND_TD, "CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd" ); TUint8 messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); @@ -629,7 +629,7 @@ } TFLOGSTRING2("TSY: CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd. \t ContextId:%d", contextId ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTACTIVATEORMODIFYIND, "CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd;contextId=%hhu", contextId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTACTIVATEORMODIFYIND_TD, "CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd;contextId=%hhu", contextId ); TUint sbStartOffSet( 0 ); @@ -735,7 +735,7 @@ // Set pointer subblock to GPDS_SHARED_INITIAL_DL_DCH_RATE (0xFC) subblock TFLOGSTRING("TSY: CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd. Flag CASW_INITIAL_DCH_RATE is defined" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTACTIVATEORMODIFYIND, "CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd, Flag CASW_INITIAL_DCH_RATE is defined" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTACTIVATEORMODIFYIND_TD, "CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd, Flag CASW_INITIAL_DCH_RATE is defined" ); ret = aIsiMessage.FindSubBlockOffsetById( subBlockDataOffset, @@ -750,9 +750,9 @@ sbStartOffSet + GPDS_SHARED_INITIAL_DL_DCH_RATE_OFFSET_MAXBITRATEDOWNLINK ); TFLOGSTRING("TSY: CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd. Sub block GPDS_SHARED_INITIAL_DL_DCH_RATE exists." ); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTACTIVATEORMODIFYIND, "CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd, Sub block GPDS_SHARED_INITIAL_DL_DCH_RATE exists" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTACTIVATEORMODIFYIND_TD, "CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd, Sub block GPDS_SHARED_INITIAL_DL_DCH_RATE exists" ); TFLOGSTRING2("TSY: CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd. qoS99Negotiated.iGuaranteedDownlinkRate = %d", qoS99Negotiated.iGuaranteedDownlinkRate ); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTACTIVATEORMODIFYIND, "CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd;qoS99Negotiated.iGuaranteedDownlinkRate=%hhu", qoS99Negotiated.iGuaranteedDownlinkRate ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTACTIVATEORMODIFYIND_TD, "CMmPacketQoSMessHandler::GpdsContextActivateOrModifyInd;qoS99Negotiated.iGuaranteedDownlinkRate=%hhu", qoS99Negotiated.iGuaranteedDownlinkRate ); } #endif // defined ( CASW_INITIAL_DCH_RATE ) || defined ( INTERNAL_CASW_INITIAL_DCH_RATE ) @@ -813,7 +813,7 @@ ISI_HEADER_OFFSET_TRANSID )); TFLOGSTRING3("TSY: CMmPacketQoSMessHandler::GpdsContextConfigureResp.\t contextId: %d, transId: %d", contextId, transId ); -OstTraceExt2( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_GPDSCONTEXTCONFIGURERESP, "CMmPacketQoSMessHandler::GpdsContextConfigureResp;contextId=%hhu;transId=%hhu", contextId, transId ); +OstTraceExt2( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_GPDSCONTEXTCONFIGURERESP_TD, "CMmPacketQoSMessHandler::GpdsContextConfigureResp;contextId=%hhu;transId=%hhu", contextId, transId ); if ( GPDS_CONTEXT_CONFIGURE_REQ == transId ) { @@ -849,7 +849,7 @@ } TFLOGSTRING2("TSY: CMmPacketQoSMessHandler::GpdsContextConfigureResp.\t Status:%d",status); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTCONFIGURERESP, "CMmPacketQoSMessHandler::GpdsContextConfigureResp;status=%hhu", status ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_GPDSCONTEXTCONFIGURERESP_TD, "CMmPacketQoSMessHandler::GpdsContextConfigureResp;status=%hhu", status ); } } @@ -864,7 +864,7 @@ { TFLOGSTRING2("TSY: CMmPacketQoSMessHandler::ExtFuncL. IPC:%d", aIpc); -OstTrace1( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_EXTFUNCL, "CMmPacketQoSMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_EXTFUNCL_TD, "CMmPacketQoSMessHandler::ExtFuncL;aIpc=%d", aIpc ); TInt ret( KErrNotSupported ); @@ -879,7 +879,7 @@ { TFLOGSTRING2("TSY: CMmPacketQoSMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_EXTFUNCL, "CMmPacketQoSMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_EXTFUNCL_TD, "CMmPacketQoSMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc ); break; } } @@ -896,7 +896,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::SetProfileParametersL."); -OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_SETPROFILEPARAMETERSL, "CMmPacketQoSMessHandler::SetProfileParametersL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_SETPROFILEPARAMETERSL_TD, "CMmPacketQoSMessHandler::SetProfileParametersL" ); // error value TInt ret( KErrNone ); @@ -934,7 +934,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::SetProfileParametersL. => Rel97"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_SETPROFILEPARAMETERSL, "CMmPacketQoSMessHandler::SetProfileParametersL => Rel97" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_SETPROFILEPARAMETERSL_TD, "CMmPacketQoSMessHandler::SetProfileParametersL => Rel97" ); supported = ETrue; TPckg* gprsProfilePckg = reinterpret_cast*>( @@ -1011,7 +1011,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::SetProfileParametersL. => Rel99"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_SETPROFILEPARAMETERSL, "CMmPacketQoSMessHandler::SetProfileParametersL => Rel99" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_SETPROFILEPARAMETERSL_TD, "CMmPacketQoSMessHandler::SetProfileParametersL => Rel99" ); supported = ETrue; TPckg* gprsProfilePckg = @@ -1118,7 +1118,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::SetProfileParametersL.=>R5"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_SETPROFILEPARAMETERSL, "CMmPacketQoSMessHandler::SetProfileParametersL => R5" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_SETPROFILEPARAMETERSL_TD, "CMmPacketQoSMessHandler::SetProfileParametersL => R5" ); supported = ETrue; TPckg* gprsProfilePckg = @@ -1209,9 +1209,9 @@ TFLOGSTRING2("TSY: CMmPacketQoSMessHandler::SetProfileParametersL. signallingIndication:%d", signallingIndication ); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_SETPROFILEPARAMETERSL, "CMmPacketQoSMessHandler::SetProfileParametersL;signallingIndication=%hhu", signallingIndication ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_SETPROFILEPARAMETERSL_TD, "CMmPacketQoSMessHandler::SetProfileParametersL;signallingIndication=%hhu", signallingIndication ); TFLOGSTRING2("TSY: CMmPacketQoSMessHandler::SetProfileParametersL. sourceStatisticsDescriptor:%d", sourceStatisticsDescriptor ); -OstTraceExt1( TRACE_NORMAL, DUP5_CMMPACKETQOSMESSHANDLER_SETPROFILEPARAMETERSL, "CMmPacketQoSMessHandler::SetProfileParametersL;sourceStatisticsDescriptor=%hhu", sourceStatisticsDescriptor ); +OstTraceExt1( TRACE_NORMAL, DUP5_CMMPACKETQOSMESSHANDLER_SETPROFILEPARAMETERSL_TD, "CMmPacketQoSMessHandler::SetProfileParametersL;sourceStatisticsDescriptor=%hhu", sourceStatisticsDescriptor ); // Delete QoS R97/98 info structs if ( NULL != iQos.iQoSMinInfo ) @@ -1358,7 +1358,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoSInfoToServer."); -OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOSERVER, "CMmPacketQoSMessHandler::MapQoSInfoToServer" ); +OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOSERVER_TD, "CMmPacketQoSMessHandler::MapQoSInfoToServer" ); TInt ret( KErrNone ); @@ -1388,7 +1388,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoSInfoToServer. aPrecedence -> default"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOSERVER, "CMmPacketQoSMessHandler::MapQoSInfoToServer,aPrecedence -> default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOSERVER_TD, "CMmPacketQoSMessHandler::MapQoSInfoToServer,aPrecedence -> default" ); ret = KErrArgument; break; @@ -1426,7 +1426,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoSInfoToServer. aDelay -> default"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOSERVER, "CMmPacketQoSMessHandler::MapQoSInfoToServer, aDelay -> default" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOSERVER_TD, "CMmPacketQoSMessHandler::MapQoSInfoToServer, aDelay -> default" ); ret = KErrArgument; break; @@ -1469,7 +1469,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoSInfoToServer. aReliability -> default"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOSERVER, "CMmPacketQoSMessHandler::MapQoSInfoToServer, aReliability -> default" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOSERVER_TD, "CMmPacketQoSMessHandler::MapQoSInfoToServer, aReliability -> default" ); ret = KErrArgument; break; @@ -1532,7 +1532,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoSInfoToServer. aPeakThroughput -> default"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOSERVER, "CMmPacketQoSMessHandler::MapQoSInfoToServer, aPeakThroughput -> default" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOSERVER_TD, "CMmPacketQoSMessHandler::MapQoSInfoToServer, aPeakThroughput -> default" ); ret = KErrArgument; break; @@ -1645,7 +1645,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoSInfoToServer. aMeanThroughput -> default"); -OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOSERVER, "CMmPacketQoSMessHandler::MapQoSInfoToServer, aMeanThroughput -> default" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOSERVER_TD, "CMmPacketQoSMessHandler::MapQoSInfoToServer, aMeanThroughput -> default" ); ret = KErrArgument; break; @@ -1671,7 +1671,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToServer."); -OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOSERVER, "CMmPacketQoSMessHandler::MapQoS99InfoToServer" ); +OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOSERVER_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToServer" ); TInt ret( KErrNone ); switch ( aTrafficClass ) @@ -1705,7 +1705,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToServer. aTrafficClass -> default"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOSERVER, "CMmPacketQoSMessHandler::MapQoS99InfoToServer, aTrafficClass -> default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOSERVER_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToServer, aTrafficClass -> default" ); ret = KErrArgument; break; @@ -1733,7 +1733,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToServer. aDeliveryOrderReqd -> default"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOSERVER, "CMmPacketQoSMessHandler::MapQoS99InfoToServer, aDeliveryOrderReqd -> default" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOSERVER_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToServer, aDeliveryOrderReqd -> default" ); ret = KErrArgument; break; @@ -1766,7 +1766,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToServer. aDeliverErroneousSDU -> default"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOSERVER, "CMmPacketQoSMessHandler::MapQoS99InfoToServer, aDeliverErroneousSDU -> default" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOSERVER_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToServer, aDeliverErroneousSDU -> default" ); ret = KErrArgument; break; @@ -1829,7 +1829,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToServer. aBER -> default"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOSERVER, "CMmPacketQoSMessHandler::MapQoS99InfoToServer, aBER -> default" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOSERVER_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToServer, aBER -> default" ); ret = KErrArgument; break; @@ -1882,7 +1882,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToServer. aSDUErrorRatio -> default"); -OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOSERVER, "CMmPacketQoSMessHandler::MapQoS99InfoToServer, aSDUErrorRatio -> default" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOSERVER_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToServer, aSDUErrorRatio -> default" ); ret = KErrArgument; break; @@ -1915,7 +1915,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToServer. aTrafficHandlingPriority -> default"); -OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOSERVER, "CMmPacketQoSMessHandler::MapQoS99InfoToServer, aTrafficHandlingPriority -> default" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOSERVER_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToServer, aTrafficHandlingPriority -> default" ); ret = KErrArgument; break; @@ -1939,7 +1939,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::CopyQoS99ValuesToServer."); -OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_COPYQOS99VALUESTOSERVER, "CMmPacketQoSMessHandler::CopyQoS99ValuesToServer" ); +OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_COPYQOS99VALUESTOSERVER_TD, "CMmPacketQoSMessHandler::CopyQoS99ValuesToServer" ); aQoS99Info.iTransferDelay = static_cast( aMaxTransferDelay ); aQoS99Info.iMaxSDUSize = static_cast( aMaxSDUSize ); @@ -1967,7 +1967,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::ResetRequestedQoS."); -OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_RESETREQUESTEDQOS, "CMmPacketQoSMessHandler::ResetRequestedQoS" ); +OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_RESETREQUESTEDQOS_TD, "CMmPacketQoSMessHandler::ResetRequestedQoS" ); if ( NULL != aQoS.iQoSMinInfo ) { @@ -2008,7 +2008,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::CompleteNotifyProfileChanged."); -OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_COMPLETENOTIFYPROFILECHANGED, "CMmPacketQoSMessHandler::CompleteNotifyProfileChanged" ); +OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_COMPLETENOTIFYPROFILECHANGED_TD, "CMmPacketQoSMessHandler::CompleteNotifyProfileChanged" ); TInt ret( KErrGeneral ); TInfoName mmPacketContextName; @@ -2025,7 +2025,7 @@ iQoSGPRSNegotiated.iMeanThroughput ); TFLOGSTRING("TSY: CMmPacketQoSMessHandler::CompleteNotifyProfileChanged. R97/98 QoS Parameters set in TSY"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_COMPLETENOTIFYPROFILECHANGED, "CMmPacketQoSMessHandler::CompleteNotifyProfileChanged, R97/98 QoS Parameters set in TSY" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_COMPLETENOTIFYPROFILECHANGED_TD, "CMmPacketQoSMessHandler::CompleteNotifyProfileChanged, R97/98 QoS Parameters set in TSY" ); } //no else @@ -2036,7 +2036,7 @@ iQoSR5_Negotiated ); TFLOGSTRING("TSY: CMmPacketQoSMessHandler::CompleteNotifyProfileChanged. R99/R4 QoS Parameters set in TSY"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_COMPLETENOTIFYPROFILECHANGED, "CMmPacketQoSMessHandler::CompleteNotifyProfileChanged, R99/R4 QoS Parameters set in TSY" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_COMPLETENOTIFYPROFILECHANGED_TD, "CMmPacketQoSMessHandler::CompleteNotifyProfileChanged, R99/R4 QoS Parameters set in TSY" ); } //no else @@ -2048,7 +2048,7 @@ GetContextNameByContextId( aContextId, mmPacketContextName ); TFLOGSTRING("TSY: CMmPacketQoSMessHandler::CompleteNotifyProfileChanged. R97/98 QoS Parameters in use"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_COMPLETENOTIFYPROFILECHANGED, "CMmPacketQoSMessHandler::CompleteNotifyProfileChanged, R97/98 QoS Parameters in use" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_COMPLETENOTIFYPROFILECHANGED_TD, "CMmPacketQoSMessHandler::CompleteNotifyProfileChanged, R97/98 QoS Parameters in use" ); } //no else @@ -2062,7 +2062,7 @@ GetContextNameByContextId( aContextId, mmPacketContextName ); TFLOGSTRING("TSY: CMmPacketQoSMessHandler::CompleteNotifyProfileChanged. R99/R4 QoS Parameters in use"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_COMPLETENOTIFYPROFILECHANGED, "CMmPacketQoSMessHandler::CompleteNotifyProfileChanged, R99/R4 QoS Parameters in use" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_COMPLETENOTIFYPROFILECHANGED_TD, "CMmPacketQoSMessHandler::CompleteNotifyProfileChanged, R99/R4 QoS Parameters in use" ); } //no else @@ -2100,7 +2100,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoSInfoToClient."); -OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOCLIENT, "CMmPacketQoSMessHandler::MapQoSInfoToClient" ); +OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOCLIENT_TD, "CMmPacketQoSMessHandler::MapQoSInfoToClient" ); switch ( aQoSInfo.iPrecedence ) { @@ -2125,7 +2125,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoSInfoToClient. Switch Precedence case default"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOCLIENT, "CMmPacketQoSMessHandler::MapQoSInfoToClient, Switch Precedence case default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOCLIENT_TD, "CMmPacketQoSMessHandler::MapQoSInfoToClient, Switch Precedence case default" ); aPrecedence = RPacketQoS::EUnspecifiedPrecedence; break; @@ -2160,7 +2160,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoSInfoToClient. Switch Delay case default"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOCLIENT, "CMmPacketQoSMessHandler::MapQoSInfoToClient, Switch Delay case default" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOCLIENT_TD, "CMmPacketQoSMessHandler::MapQoSInfoToClient, Switch Delay case default" ); aDelay = RPacketQoS::EUnspecifiedDelayClass; break; @@ -2200,7 +2200,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoSInfoToClient. Switch Reliability case default"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOCLIENT, "CMmPacketQoSMessHandler::MapQoSInfoToClient, Switch Reliability case default" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOCLIENT_TD, "CMmPacketQoSMessHandler::MapQoSInfoToClient, Switch Reliability case default" ); aReliability = RPacketQoS::EUnspecifiedReliabilityClass; break; @@ -2260,7 +2260,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoSInfoToClient. Switch PeakThroughput case default"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOCLIENT, "CMmPacketQoSMessHandler::MapQoSInfoToClient, Switch PeakThroughput case default" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOCLIENT_TD, "CMmPacketQoSMessHandler::MapQoSInfoToClient, Switch PeakThroughput case default" ); aPeakThroughput = RPacketQoS::EUnspecifiedPeakThroughput; break; @@ -2370,7 +2370,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoSInfoToClient. Switch MeanThroughput case default"); -OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOCLIENT, "CMmPacketQoSMessHandler::MapQoSInfoToClient, Switch MeanThroughput case default" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETQOSMESSHANDLER_MAPQOSINFOTOCLIENT_TD, "CMmPacketQoSMessHandler::MapQoSInfoToClient, Switch MeanThroughput case default" ); aMeanThroughput = RPacketQoS::EUnspecifiedMeanThroughput; break; @@ -2390,7 +2390,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToClient."); -OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT, "CMmPacketQoSMessHandler::MapQoS99InfoToClient" ); +OstTrace0( TRACE_NORMAL, CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToClient" ); switch ( aQoS99Info.iTrafficClass ) { @@ -2424,7 +2424,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToClient. Switch TrafficClass case default"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT, "CMmPacketQoSMessHandler::MapQoS99InfoToClient, Switch TrafficClass case default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToClient, Switch TrafficClass case default" ); aQoSR5Negotiated.iTrafficClass = RPacketQoS::ETrafficClassUnspecified; @@ -2452,7 +2452,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToClient. Switch DeliveryOrderReqd case default"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT, "CMmPacketQoSMessHandler::MapQoS99InfoToClient, Switch DeliveryOrderReqd case default" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToClient, Switch DeliveryOrderReqd case default" ); aQoSR5Negotiated.iDeliveryOrderReqd = RPacketQoS::EDeliveryOrderUnspecified; @@ -2486,7 +2486,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToClient. Switch DeliverErroneousSDU case default"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT, "CMmPacketQoSMessHandler::MapQoS99InfoToClient, Switch DeliverErroneousSDU case default" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToClient, Switch DeliverErroneousSDU case default" ); aQoSR5Negotiated.iDeliverErroneousSDU = RPacketQoS::EErroneousSDUDeliveryUnspecified; @@ -2556,7 +2556,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToClient. Switch BER case default"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT, "CMmPacketQoSMessHandler::MapQoS99InfoToClient, Switch BER case default" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToClient, Switch BER case default" ); aQoSR5Negotiated.iBER = RPacketQoS::EBERUnspecified; @@ -2614,7 +2614,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToClient. Switch SDUErrorRatio case default"); -OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT, "CMmPacketQoSMessHandler::MapQoS99InfoToClient, Switch SDUErrorRatio case default" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToClient, Switch SDUErrorRatio case default" ); aQoSR5Negotiated.iSDUErrorRatio = RPacketQoS::ESDUErrorRatioUnspecified; @@ -2648,7 +2648,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToClient. Switch TrafficHandlingPriority case default"); -OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT, "CMmPacketQoSMessHandler::MapQoS99InfoToClient, Switch TrafficHandlingPriority case default" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToClient, Switch TrafficHandlingPriority case default" ); aQoSR5Negotiated.iTrafficHandlingPriority = RPacketQoS::ETrafficPriorityUnspecified; @@ -2688,7 +2688,7 @@ { TFLOGSTRING("TSY: CMmPacketQoSMessHandler::MapQoS99InfoToClient. Switch SourceStatisticsDescriptor case default"); -OstTrace0( TRACE_NORMAL, DUP7_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT, "CMmPacketQoSMessHandler::MapQoS99InfoToClient, Switch SourceStatisticsDescriptor case default" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMPACKETQOSMESSHANDLER_MAPQOS99INFOTOCLIENT_TD, "CMmPacketQoSMessHandler::MapQoS99InfoToClient, Switch SourceStatisticsDescriptor case default" ); aQoSR5Negotiated.iSourceStatisticsDescriptor = RPacketQoS::ESourceStatisticsDescriptorUnknown; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmpacketservicemesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmpacketservicemesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmpacketservicemesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -76,7 +76,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::C++ constructor"); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_CMMPACKETSERVICEMESSHANDLER, "CMmPacketServiceMessHandler::CMmPacketServiceMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_CMMPACKETSERVICEMESSHANDLER_TD, "CMmPacketServiceMessHandler::CMmPacketServiceMessHandler" ); } // ----------------------------------------------------------------------------- @@ -88,7 +88,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::~CMmPacketServiceMessHandler.\n" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_CMMPACKETSERVICEMESSHANDLER, "CMmPacketServiceMessHandler::~CMmPacketServiceMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_CMMPACKETSERVICEMESSHANDLER_TD, "CMmPacketServiceMessHandler::~CMmPacketServiceMessHandler" ); // Delete iPacketMesshandlerContextList object if ( iPacketMesshandlerContextList ) @@ -109,7 +109,7 @@ CMmMessageRouter* aMessageRouter ) { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::NewL" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NEWL, "CMmPacketServiceMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NEWL_TD, "CMmPacketServiceMessHandler::NewL" ); CMmPacketServiceMessHandler* packetServiceMessHandler = new( ELeave ) CMmPacketServiceMessHandler(); @@ -158,7 +158,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_CONSTRUCTL, "CMmPacketServiceMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_CONSTRUCTL_TD, "CMmPacketServiceMessHandler::ConstructL" ); iAlwaysOnMode = RMmCustomAPI::EAlwaysModeNeither; @@ -176,7 +176,7 @@ { TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::ExtFuncL. IPC: %d", aIpc ); -OstTrace1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_EXTFUNCL, "CMmPacketServiceMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_EXTFUNCL_TD, "CMmPacketServiceMessHandler::ExtFuncL;aIpc=%d", aIpc ); TInt ret( KErrNotSupported ); CMmDataPackage dataPackage; @@ -259,7 +259,7 @@ { TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_EXTFUNCL, "CMmPacketServiceMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_EXTFUNCL_TD, "CMmPacketServiceMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc ); break; } } @@ -280,7 +280,7 @@ TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); TFLOGSTRING3("TSY: CMmPacketServiceMessHandler::ReceiveMessageL. resource:%d, msgId:%d", resource, messageId); -OstTraceExt2( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketServiceMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); +OstTraceExt2( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketServiceMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); switch ( resource ) { @@ -308,7 +308,7 @@ default: { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::ReceiveMessageL. default in case PN_MODEM_NETWORK"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketServiceMessHandler::ReceiveMessageL, default in case PN_MODEM_NETWORK" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketServiceMessHandler::ReceiveMessageL, default in case PN_MODEM_NETWORK" ); break; } } @@ -386,7 +386,7 @@ default: { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::SpecificPacketServiceMessageReceived: KErrNotFound"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketServiceMessHandler::ReceiveMessageL, KErrNotFound" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketServiceMessHandler::ReceiveMessageL, KErrNotFound" ); break; } } @@ -396,7 +396,7 @@ { // No appropriate handler methods for ISI-message found. TFLOGSTRING("TSY: CMmPacketServiceMessHandler::SpecificPacketServiceMessageReceived no handler for the message id"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketServiceMessHandler::ReceiveMessageL, SpecificPacketServiceMessageReceived no handler for the message id" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketServiceMessHandler::ReceiveMessageL, SpecificPacketServiceMessageReceived no handler for the message id" ); // server not known break; } @@ -412,7 +412,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsStatusReq.\n" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSSTATUSREQ, "CMmPacketServiceMessHandler::GpdsStatusReq" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSSTATUSREQ_TD, "CMmPacketServiceMessHandler::GpdsStatusReq" ); // Append data for ISI message TBuf8 data; @@ -433,7 +433,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsStatusResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSSTATUSRESP, "CMmPacketServiceMessHandler::GpdsStatusResp" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSSTATUSRESP_TD, "CMmPacketServiceMessHandler::GpdsStatusResp" ); const TUint8 attachStatus( aIsiMessage.Get8bit( ISI_HEADER_SIZE + GPDS_STATUS_RESP_OFFSET_ATTACHSTATUS ) ); @@ -441,7 +441,7 @@ ISI_HEADER_SIZE + GPDS_STATUS_RESP_OFFSET_TRANSFERSTATUS ) ); TFLOGSTRING3("TSY: CMmPacketServiceMessHandler::GpdsStatusResp.\n \t Attach Status:%d\n\t Transfer Status:%d\n", attachStatus, transfStatus ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSSTATUSRESP, "CMmPacketServiceMessHandler::GpdsStatusResp;attachStatus=%hhu;transfStatus=%hhu", attachStatus, transfStatus ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSSTATUSRESP_TD, "CMmPacketServiceMessHandler::GpdsStatusResp;attachStatus=%hhu;transfStatus=%hhu", attachStatus, transfStatus ); CompleteGpdsStatusRequest( attachStatus, transfStatus ); } @@ -455,7 +455,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsAttachReq.\n" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSATTACHREQ, "CMmPacketServiceMessHandler::GpdsAttachReq" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSATTACHREQ_TD, "CMmPacketServiceMessHandler::GpdsAttachReq" ); // Append data for ISI message TBuf8<1> data; @@ -476,7 +476,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsAttachResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSATTACHRESP, "CMmPacketServiceMessHandler::GpdsAttachResp" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSATTACHRESP_TD, "CMmPacketServiceMessHandler::GpdsAttachResp" ); if ( GPDS_ATTACH_REQ == aIsiMessage.Get8bit( ISI_HEADER_SIZE + GPDS_ATTACH_RESP_OFFSET_UTID ) ) @@ -496,7 +496,7 @@ //no else TFLOGSTRING3("TSY: CMmPacketServiceMessHandler::GpdsAttachResp.\n \t Status:%d\n\t Cause:%d\n", status, cause ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSATTACHRESP, "CMmPacketServiceMessHandler::GpdsAttachResp;status=%hhu;cause=%hhu", status, cause ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSATTACHRESP_TD, "CMmPacketServiceMessHandler::GpdsAttachResp;status=%hhu;cause=%hhu", status, cause ); //Complete Attach iMessageRouter->Complete( @@ -515,7 +515,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsAttachInd.\n" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSATTACHIND, "CMmPacketServiceMessHandler::GpdsAttachInd" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSATTACHIND_TD, "CMmPacketServiceMessHandler::GpdsAttachInd" ); RPacketService::TStatus status( RPacketService::EStatusAttached ); TBool isResumed( EFalse ); @@ -540,7 +540,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsDetachReq.\n" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSDETACHREQ, "CMmPacketServiceMessHandler::GpdsDetachReq" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSDETACHREQ_TD, "CMmPacketServiceMessHandler::GpdsDetachReq" ); // Create isi message TBuf8 @@ -579,7 +579,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsDetachResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSDETACHRESP, "CMmPacketServiceMessHandler::GpdsDetachResp" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSDETACHRESP_TD, "CMmPacketServiceMessHandler::GpdsDetachResp" ); if ( GPDS_DETACH_REQ == aIsiMessage.Get8bit( ISI_HEADER_SIZE + GPDS_DETACH_RESP_OFFSET_UTID ) ) @@ -596,7 +596,7 @@ } TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsDetachResp.\n\t Status:%d\n", status ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSDETACHRESP, "CMmPacketServiceMessHandler::GpdsDetachResp;status=%hhu", status ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSDETACHRESP_TD, "CMmPacketServiceMessHandler::GpdsDetachResp;status=%hhu", status ); //Complete iMessageRouter->Complete( @@ -624,7 +624,7 @@ TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsDetachInd. Complete\n\t status:%d\n", status ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSDETACHIND, "CMmPacketServiceMessHandler::GpdsDetachInd;status=%hhu", status ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSDETACHIND_TD, "CMmPacketServiceMessHandler::GpdsDetachInd;status=%hhu", status ); iMessageRouter->Complete( EPacketNotifyStatusChange, &data, @@ -639,7 +639,7 @@ TInt CMmPacketServiceMessHandler::NetModemRegStatusGetReq() const { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::NetModemRegStatusGetReq" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETREQ, "CMmPacketServiceMessHandler::NetModemRegStatusGetReq" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETREQ_TD, "CMmPacketServiceMessHandler::NetModemRegStatusGetReq" ); // Data buffer for transactionId and Message Id. TBuf8<2> data; @@ -662,7 +662,7 @@ const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd"); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND_TD, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd" ); TUint sbStartOffSet( 0 ); TInt ret( 0 ); @@ -685,7 +685,7 @@ NET_MODEM_REG_STATUS_GET_RESP_OFFSET_SUCCESSCODE ) ); TFLOGSTRING3("TSY: CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - NetModemRegStatusGetResp, Registration Status:%d Success Code:%d", regStatus, successCode); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - NetModemRegStatusGetResp, Registration Status=%hhu Success Code=%hhu", regStatus, successCode ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND_TD, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - NetModemRegStatusGetResp, Registration Status=%hhu Success Code=%hhu", regStatus, successCode ); // Map registration status mapping RPacketService::TRegistrationStatus regStatusClient( @@ -702,7 +702,7 @@ else { TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - NetModemRegStatusInd, Registration Status:%d", regStatus); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - NetModemRegStatusInd, Registration Status=%hhu", regStatus ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND_TD, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - NetModemRegStatusInd, Registration Status=%hhu", regStatus ); CMmDataPackage data; @@ -768,9 +768,9 @@ TFLOGSTRING3("TSY: CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - CS Services:%d GPRS support in cell:%d", csServices, gprsSupported); TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - EdgeGprsSupport:%d", edgeGprsSupport); TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - DtmSupport:%d", dtmSupportInCell); -OstTraceExt2( TRACE_NORMAL, DUP3_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - CS Services=%hhu GPRS support in cell=%hhu", csServices, gprsSupported ); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - EdgeGprsSupport=%hhu", edgeGprsSupport ); -OstTraceExt1( TRACE_NORMAL, DUP5_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - DtmSupport=%hhu", dtmSupportInCell ); +OstTraceExt2( TRACE_NORMAL, DUP3_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND_TD, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - CS Services=%hhu GPRS support in cell=%hhu", csServices, gprsSupported ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND_TD, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - EdgeGprsSupport=%hhu", edgeGprsSupport ); +OstTraceExt1( TRACE_NORMAL, DUP5_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND_TD, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - DtmSupport=%hhu", dtmSupportInCell ); // Complete notification to the active extension CompleteGsmRegistrationInfo( @@ -808,13 +808,13 @@ { TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsConfigureReq.\n\t Attach Mode:%d\n", aAttachMode ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGUREREQ, "CMmPacketServiceMessHandler::GpdsConfigureReq;aAttachMode=%hhu", aAttachMode ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGUREREQ_TD, "CMmPacketServiceMessHandler::GpdsConfigureReq;aAttachMode=%hhu", aAttachMode ); TUint8 aAolContext = GPDS_AOL_CTX_NOT_ACTIVE; iAlwaysOnMode = alwaysOnMode; TFLOGSTRING3("TSY: CMmPacketServiceMessHandler::GpdsConfigureReq.\n \t Mt Context Activation Mode:%d\n\t Class C Mode:%d\n", aMtContextActivationMode, aClassCMode ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGUREREQ, "CMmPacketServiceMessHandler::GpdsConfigureReq;aMtContextActivationMode=%hhu;aClassCMode=%hhu", aMtContextActivationMode, aClassCMode ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGUREREQ_TD, "CMmPacketServiceMessHandler::GpdsConfigureReq;aMtContextActivationMode=%hhu;aClassCMode=%hhu", aMtContextActivationMode, aClassCMode ); switch ( iAlwaysOnMode ) { @@ -842,7 +842,7 @@ { TFLOGSTRING2("CMmPacketServiceMessHandler::GpdsConfigureReq.\n\t AOL Context Mode:%d\n", aAolContext); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGUREREQ, "CMmPacketServiceMessHandler::GpdsConfigureReq;aAolContext=%hhu", aAolContext ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGUREREQ_TD, "CMmPacketServiceMessHandler::GpdsConfigureReq;aAolContext=%hhu", aAolContext ); break; } @@ -886,7 +886,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsConfigureResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURERESP, "CMmPacketServiceMessHandler::GpdsConfigureResp" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURERESP_TD, "CMmPacketServiceMessHandler::GpdsConfigureResp" ); TInt errorValue( KErrNone ); TBool called( EFalse ); @@ -911,7 +911,7 @@ ISI_HEADER_SIZE + GPDS_CONFIGURE_RESP_OFFSET_STATUS ) ); TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsConfigureResp.\n\t Status:%d\n", status ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURERESP, "CMmPacketServiceMessHandler::GpdsConfigureResp;status=%hhu", status ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURERESP_TD, "CMmPacketServiceMessHandler::GpdsConfigureResp;status=%hhu", status ); if ( GPDS_CONFIGURE_REQ == transactionId ) { @@ -971,7 +971,7 @@ ISI_HEADER_SIZE + GPDS_TRANSFER_STATUS_IND_OFFSET_TRANSFERCAUSE) ); TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsTransferStatusInd.\n \t Transfer cause:%d\n", transferCause ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSTRANSFERSTATUSIND, "CMmPacketServiceMessHandler::GpdsTransferStatusInd;transferCause=%hhu", transferCause ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSTRANSFERSTATUSIND_TD, "CMmPacketServiceMessHandler::GpdsTransferStatusInd;transferCause=%hhu", transferCause ); CompleteTransferStatusIndication( transferCause ); } @@ -989,7 +989,7 @@ ISI_HEADER_SIZE + GPDS_CONTEXT_ID_CREATE_IND_OFFSET_CID ) ); TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsContextIdCreateInd.\n\t Context Id:%d\n", contextId ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTIDCREATEIND, "CMmPacketServiceMessHandler::GpdsContextIdCreateInd;contextId=%hhu", contextId ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTIDCREATEIND_TD, "CMmPacketServiceMessHandler::GpdsContextIdCreateInd;contextId=%hhu", contextId ); // initial variables CMmDataPackage data; @@ -1031,7 +1031,7 @@ ISI_HEADER_SIZE + GPDS_CONFIGURATION_INFO_IND_OFFSET_CLASSCMODE) ); TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsConfigurationInfoInd.\n\t Class C Mode:%d\n", classC ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFOIND, "CMmPacketServiceMessHandler::GpdsConfigurationInfoInd;classC=%hhu", classC ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFOIND_TD, "CMmPacketServiceMessHandler::GpdsConfigurationInfoInd;classC=%hhu", classC ); RPacketService::TPreferredBearer bearer( RPacketService::EBearerPacketSwitched ); @@ -1061,7 +1061,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsContextNwiActRejectReq.\n" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREJECTREQ, "CMmPacketServiceMessHandler::GpdsContextNwiActRejectReq" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREJECTREQ_TD, "CMmPacketServiceMessHandler::GpdsContextNwiActRejectReq" ); // Introduce data buffer for needed GpdsContextNwiActRejectReq data // Needed length is 1 @@ -1086,7 +1086,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsContextNwiActRejectResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREJECTRESP, "CMmPacketServiceMessHandler::GpdsContextNwiActRejectResp" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREJECTRESP_TD, "CMmPacketServiceMessHandler::GpdsContextNwiActRejectResp" ); iMessageRouter->Complete( EPacketRejectActivationRequest, @@ -1111,7 +1111,7 @@ ISI_HEADER_SIZE + GPDS_CONTEXT_NWI_ACT_REQUEST_IND_OFFSET_PDPTYPE ) ); TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsContextNwiActRequestInd. PdpType:%d", pdpType ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREQUESTIND, "CMmPacketServiceMessHandler::GpdsContextNwiActRequestInd;pdpType=%hhu", pdpType ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREQUESTIND_TD, "CMmPacketServiceMessHandler::GpdsContextNwiActRequestInd;pdpType=%hhu", pdpType ); TPtrC8 pdpAddress; TPtrC8 accessPointName; @@ -1161,7 +1161,7 @@ //no else TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsContextNwiActRequestInd.\n \t Pdp Type:%d\n", pdpType ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREQUESTIND, "CMmPacketServiceMessHandler::GpdsContextNwiActRequestInd;pdpType=%hhu", pdpType ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREQUESTIND_TD, "CMmPacketServiceMessHandler::GpdsContextNwiActRequestInd;pdpType=%hhu", pdpType ); // Map server pdp type to client pdp type CMmStaticUtility::MapPdpTypeToClient( @@ -1191,7 +1191,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsConfigurationInfoReq.\n\t" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFOREQ, "CMmPacketServiceMessHandler::GpdsConfigurationInfoReq" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFOREQ_TD, "CMmPacketServiceMessHandler::GpdsConfigurationInfoReq" ); TBuf8<1> data; TUint8 transactionId( 0 ); @@ -1222,7 +1222,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsConfigurationInfoResp.\n\t" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFORESP, "CMmPacketServiceMessHandler::GpdsConfigurationInfoResp" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFORESP_TD, "CMmPacketServiceMessHandler::GpdsConfigurationInfoResp" ); CMmDataPackage data; TBool ret( EFalse ); @@ -1242,7 +1242,7 @@ ISI_HEADER_SIZE + GPDS_CONFIGURATION_INFO_RESP_OFFSET_ATTACHMODE ) ); TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsConfigurationInfoResp.\n\t Attach mode:%d\n", attachMode ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFORESP, "CMmPacketServiceMessHandler::GpdsConfigurationInfoResp;attachMode=%hhu", attachMode ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFORESP_TD, "CMmPacketServiceMessHandler::GpdsConfigurationInfoResp;attachMode=%hhu", attachMode ); RPacketService::TAttachMode attachModeForCompletion( RPacketService::EAttachWhenNeeded ); @@ -1298,7 +1298,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsContextConfigureResp.\n" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTCONFIGURERESP, "CMmPacketServiceMessHandler::GpdsContextConfigureResp" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTCONFIGURERESP_TD, "CMmPacketServiceMessHandler::GpdsContextConfigureResp" ); TBool called( EFalse ); @@ -1341,7 +1341,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsContextConfigureReq.\n" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketServiceMessHandler::GpdsContextConfigureReq" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketServiceMessHandler::GpdsContextConfigureReq" ); // Append data for ISI message TBuf8( aconfig ); @@ -1775,7 +1775,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::SetDefaultContextParams. ExtensionId: KConfigRel99Rel4"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_SETDEFAULTCONTEXTPARAMS, "CMmPacketServiceMessHandler::SetDefaultContextParams, ExtensionId: KConfigRel99Rel4" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_SETDEFAULTCONTEXTPARAMS_TD, "CMmPacketServiceMessHandler::SetDefaultContextParams, ExtensionId: KConfigRel99Rel4" ); RPacketContext::TContextConfigR99_R4& configR99_R4 = *reinterpret_cast( @@ -1829,7 +1829,7 @@ const TUint8 aTransferCause ) { TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::CompleteTransferStatusIndication.\n \t Transfer Cause:%d\n", aTransferCause ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication;aTransferCause=%hhu", aTransferCause ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION_TD, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication;aTransferCause=%hhu", aTransferCause ); RPacketService::TStatus packetStatus( RPacketService::EStatusAttached ); RMmCustomAPI::TRauEventStatus rauindication( RMmCustomAPI::ERauEventActive ); @@ -1849,7 +1849,7 @@ data.PackData( &rauindication ); iMessageRouter->Complete( ECustomNotifyRauEventIPC, &data, error ); TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::CompleteTransferStatusIndicationResumed.\n \t Rau indication:%d\n", rauindication ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication;rauindication=%hhu", rauindication ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION_TD, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication;rauindication=%hhu", rauindication ); break; } case GPDS_TRANSFER_CAUSE_ATTACHED: @@ -1872,7 +1872,7 @@ case GPDS_TRANSFER_CAUSE_SUSPENDED_RAU : { TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::CompleteTransferStatusIndicationActivated.\n \t Rau indication:%d\n", rauindication ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication;rauindication=%hhu", rauindication ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION_TD, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication;rauindication=%hhu", rauindication ); // rauindication is 'RMmCustomAPI::ERauEventActive' by default, no need to set here data.PackData( &rauindication ); iMessageRouter->Complete( ECustomNotifyRauEventIPC, &data, error ); @@ -1888,7 +1888,7 @@ case GPDS_TRANSFER_CAUSE_DSAC_RESTRICTION: { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::CompleteTransferStatusIndication. DSAC: connection failed because of barred PS \n"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication, DSAC: connection failed because of barred PS \n" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION_TD, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication, DSAC: connection failed because of barred PS \n" ); // Core error and extended error are completed to CTSY error = ( KErrGeneral & 0x0000FFFF ) | ( KErrGsmPSConnectionBarred << 16 ); @@ -1899,7 +1899,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::CompleteTransferStatusIndication.Default case: DO NOTHING\n"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication, Default case: DO NOTHING" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION_TD, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication, Default case: DO NOTHING" ); break; } } @@ -1927,7 +1927,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::CompleteNotifyMSClassChange"); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_COMPLETENOTIFYMSCLASSCHANGE, "CMmPacketServiceMessHandler::CompleteNotifyMSClassChange" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_COMPLETENOTIFYMSCLASSCHANGE_TD, "CMmPacketServiceMessHandler::CompleteNotifyMSClassChange" ); CMmDataPackage data; RPacketService::TMSClass msClass( RPacketService::EMSClassUnknown ); @@ -1988,7 +1988,7 @@ { TFLOGSTRING3("TSY: CMmPacketService::CompleteGpdsStatusRequest.\n\t Attach Status:%d\n\t Transfer Status:%d\n", aAttachStatus, aTransferStatus ); -OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_COMPLETEGPDSSTATUSREQUEST, "CMmPacketServiceMessHandler::CompleteGpdsStatusRequest;aAttachStatus=%hhu", aAttachStatus ); +OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_COMPLETEGPDSSTATUSREQUEST_TD, "CMmPacketServiceMessHandler::CompleteGpdsStatusRequest;aAttachStatus=%hhu", aAttachStatus ); // Initiate EStatusAttached to packet status RPacketService::TStatus packetStatus( RPacketService::EStatusAttached ); @@ -2024,7 +2024,7 @@ TInt CMmPacketServiceMessHandler::NetRatReq() { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::NetRatReq"); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETRATREQ, "CMmPacketServiceMessHandler::NetRatReq" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETRATREQ_TD, "CMmPacketServiceMessHandler::NetRatReq" ); // Set the message data that consists of one parameters TBuf8 messageData; @@ -2049,7 +2049,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::NetRatIndOrResp"); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETRATINDORRESP, "CMmPacketServiceMessHandler::NetRatIndOrResp" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETRATINDORRESP_TD, "CMmPacketServiceMessHandler::NetRatIndOrResp" ); TBool readSubBlock( ETrue ); TBool isNetRatResp( NET_RAT_RESP == aIsiMessage. @@ -2102,14 +2102,14 @@ TFLOGSTRING("TSY: CMmPacketServiceMessHandler::NetRatIndOrResp. RMobilePhone::ENetworkModeGsm"); ntwkMode = RMobilePhone::ENetworkModeGsm; -OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_NETRATINDORRESP, "CMmPacketServiceMessHandler::NetRatIndOrResp, RMobilePhone::ENetworkModeGsm" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_NETRATINDORRESP_TD, "CMmPacketServiceMessHandler::NetRatIndOrResp, RMobilePhone::ENetworkModeGsm" ); } // Else if Wcdma Rat is supported else if ( NET_UMTS_RAT == ratName ) { // WCDMA currently not supported. TFLOGSTRING("TSY: CMmPacketServiceMessHandler::NetRatIndOrResp. RMobilePhone::ENetworkModeWcdma"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_NETRATINDORRESP, "CMmPacketServiceMessHandler::NetRatIndOrResp, RMobilePhone::ENetworkModeWcdma" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_NETRATINDORRESP_TD, "CMmPacketServiceMessHandler::NetRatIndOrResp, RMobilePhone::ENetworkModeWcdma" ); ntwkMode = RMobilePhone::ENetworkModeWcdma; } @@ -2142,7 +2142,7 @@ { TFLOGSTRING("TSY: CMmPacketServiceMessHandler::HandleError DO NOTHING"); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_HANDLEERROR, "CMmPacketServiceMessHandler::HandleError DO NOTHING" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_HANDLEERROR_TD, "CMmPacketServiceMessHandler::HandleError DO NOTHING" ); //none } @@ -2157,7 +2157,7 @@ { TFLOGSTRING( "TSY: CMmPacketServiceMessHandler::NetRadioInfoInd" ); -OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND, "CMmPacketServiceMessHandler::NetRadioInfoInd" ); +OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND_TD, "CMmPacketServiceMessHandler::NetRadioInfoInd" ); TDynamicTransferCapsFlags transferCaps ( 0 ); TBool hsdpaAllocated ( EFalse ); @@ -2178,7 +2178,7 @@ iLastHsdpaAllocationStatus = hsdpaAllocated; TFLOGSTRING2( "TSY: CMmPacketServiceMessHandler::NetRadioInfoInd, HSDPA Allocated = %d.", hsdpaAllocated ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND, "CMmPacketServiceMessHandler::NetRadioInfoInd;hsdpaAllocated=%hhu", hsdpaAllocated ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND_TD, "CMmPacketServiceMessHandler::NetRadioInfoInd;hsdpaAllocated=%hhu", hsdpaAllocated ); } // Dynamic transfer caps @@ -2187,7 +2187,7 @@ transferCaps |= KCapsHSDPA; TFLOGSTRING2( "TSY: CMmPacketServiceMessHandler::NetRadioInfoInd, Transfer Caps = %d.", transferCaps ); -OstTrace1( TRACE_NORMAL, DUP3_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND, "CMmPacketServiceMessHandler::NetRadioInfoInd;transferCaps=%d", transferCaps ); +OstTrace1( TRACE_NORMAL, DUP3_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND_TD, "CMmPacketServiceMessHandler::NetRadioInfoInd;transferCaps=%d", transferCaps ); } // This is done for SUB 403-7200: NokiaTSY: HSUPA Cell Indicator for S60 (S60 3.2.2 / S_CPR8.1). @@ -2204,7 +2204,7 @@ NET_UTRAN_RADIO_INFO_OFFSET_HSUPAALLOCATED ); TFLOGSTRING2( "TSY: CMmPacketServiceMessHandler::NetRadioInfoInd, HSUPA Allocated = %d.", hsupaAllocated ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND, "CMmPacketServiceMessHandler::NetRadioInfoInd;hsupaAllocated=%hhu", hsupaAllocated ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND_TD, "CMmPacketServiceMessHandler::NetRadioInfoInd;hsupaAllocated=%hhu", hsupaAllocated ); } if ( hsdpaAllocated || hsupaAllocated ) @@ -2215,7 +2215,7 @@ iLastHsdpaAllocationStatus = ETrue; TFLOGSTRING2( "TSY: CMmPacketServiceMessHandler::NetRadioInfoInd, Transfer Caps (HSDPA or HSUPA) = %d.", transferCaps ); -OstTrace1( TRACE_NORMAL, DUP4_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND, "CMmPacketServiceMessHandler::NetRadioInfoInd;transferCaps=%d", transferCaps ); +OstTrace1( TRACE_NORMAL, DUP4_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND_TD, "CMmPacketServiceMessHandler::NetRadioInfoInd;transferCaps=%d", transferCaps ); } #endif // defined ( CASW_HSXPA_INDICATOR_SUPPORTED ) || defined ( INTERNAL_TESTING_CASW_HSXPA_INDICATOR_SUPPORT ) @@ -2225,7 +2225,7 @@ transferCaps |= KCapsEGPRS; TFLOGSTRING2( "TSY: CMmPacketServiceMessHandler::NetRadioInfoInd, Transfer Caps = %d.", transferCaps ); -OstTrace1( TRACE_NORMAL, DUP5_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND, "CMmPacketServiceMessHandler::NetRadioInfoInd;transferCaps=%d", transferCaps ); +OstTrace1( TRACE_NORMAL, DUP5_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND_TD, "CMmPacketServiceMessHandler::NetRadioInfoInd;transferCaps=%d", transferCaps ); } // Pack the data diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationcache.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationcache.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationcache.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -71,7 +71,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationCache::CMmPhoneBookOperationCache"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_CMMPHONEBOOKOPERATIONCACHE, "CMmPhoneBookOperationCache::CMmPhoneBookOperationCache" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_CMMPHONEBOOKOPERATIONCACHE_TD, "CMmPhoneBookOperationCache::CMmPhoneBookOperationCache" ); } // ----------------------------------------------------------------------------- @@ -85,7 +85,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationCache::~CMmPhoneBookOperationCache"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONCACHE_CMMPHONEBOOKOPERATIONCACHE, "CMmPhoneBookOperationCache::~CMmPhoneBookOperationCache" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONCACHE_CMMPHONEBOOKOPERATIONCACHE_TD, "CMmPhoneBookOperationCache::~CMmPhoneBookOperationCache" ); } // ----------------------------------------------------------------------------- @@ -103,7 +103,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationCache::NewL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_NEWL, "CMmPhoneBookOperationCache::NewL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_NEWL_TD, "CMmPhoneBookOperationCache::NewL" ); TName phonebookTypeName ; @@ -138,7 +138,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationCache::CreateReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_CREATEREQ, "CMmPhoneBookOperationCache::CreateReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_CREATEREQ_TD, "CMmPhoneBookOperationCache::CreateReq" ); TInt ret( KErrNotSupported ); @@ -150,12 +150,14 @@ { case EMmTsyPhoneBookStoreGetInfoIPC: { +TFLOGSTRING("TSY: CMmPhoneBookOperationCache::CreateReq EMmTsyPhoneBookStoreGetInfoIPC"); iNumOfUsedSDNEntries = 0; iNumOfUsedVMBXEntries = 0; break; } case EMmTsyONStoreGetInfoIPC: { +TFLOGSTRING("TSY: CMmPhoneBookOperationCache::CreateReq EMmTsyONStoreGetInfoIPC"); iFileId = PB_MSISDN_FID; iExtFileId = PB_EXT1_FID; iArrayIndex = EPhonebookTypeMSISDN; @@ -171,6 +173,7 @@ } case EMmTsyPhoneBookStoreCacheIPC: { +TFLOGSTRING("TSY: CMmPhoneBookOperationCache::CreateReq EMmTsyPhoneBookStoreCacheIPC"); // Convert Phone Book name to file id iExtFileId = UICC_ILLEGAL_FILE_ID; iFileId = ConvertToPBfileId( iPhoneBookTypeName, @@ -181,19 +184,25 @@ const CPhoneBookDataPackage* phoneBookData( static_cast( aDataPackage ) ); - CArrayPtrSeg* prtToCacheArray; - phoneBookData->UnPackData( prtToCacheArray ); + CArrayPtrSeg* ptrToCacheArray; +TFLOGSTRING2("TSY: CMmPhoneBookOperationCache::CreateReq ptrToCacheArray %X", ptrToCacheArray); +TFLOGSTRING2("TSY: CMmPhoneBookOperationCache::CreateReq aDataPackage %X", aDataPackage); +TFLOGSTRING2("TSY: CMmPhoneBookOperationCache::CreateReq aDataPackage %X", this); + phoneBookData->UnPackData( &ptrToCacheArray ); - if ( prtToCacheArray ) +TFLOGSTRING2("TSY: CMmPhoneBookOperationCache::CreateReq ptrToCacheArray %X", ptrToCacheArray); + if ( ptrToCacheArray ) { - iPhoneBookStoreCacheArray = prtToCacheArray; + iPhoneBookStoreCacheArray = ptrToCacheArray; ret = KErrNone; iIndexToRead = 1 ; // Strat from 1st Record to read // Start Reading records from 1st record +TFLOGSTRING("TSY: CMmPhoneBookOperationCache::CreateReq USimPbReqRead called"); ret = USimPbReqRead( iIndexToRead, aTransId ); } else { +TFLOGSTRING("TSY: CMmPhoneBookOperationCache::CreateReq KErrArgument"); ret = KErrArgument; } @@ -203,7 +212,7 @@ { // Nothing to do here TFLOGSTRING2("TSY: CMmPhoneBookOperationCache::CreateReq - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONCACHE_UICCCREATEREQ, "CMmPhoneBookOperationCache::UICCCreateReq;Unknown aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONCACHE_UICCCREATEREQ_TD, "CMmPhoneBookOperationCache::UICCCreateReq;Unknown aIpc=%d", aIpc ); break; } }//switch-case @@ -234,7 +243,7 @@ if ( ( UICC_STATUS_OK != aStatus ) && ( !iExtensionToRead) ) { TFLOGSTRING("TSY: CMmPhoneBookOperationCache::HandleSimPbResp:Unsuccessfully completed by UICC"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCPBRESPL, "CMmPhoneBookOperationCache::HandleUICCPbRespL - Unsuceesfully completed by UICC" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationCache::HandleUICCPbRespL - Unsuceesfully completed by UICC" ); ret = CMmStaticUtility::UICCCSCauseToEpocError( aStatus ); } @@ -307,7 +316,7 @@ CleanupStack::Pop( phoneBookStoreMsg ); iNumOfEntriesFilled++; TFLOGSTRING2("TSY: CMmPhoneBookOperationCache::HandleUICCPbRespL - Append entries into array %d",iNumOfEntriesFilled); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCPBRESPL, "CMmPhoneBookOperationCache::HandleUICCPbRespL; - Append entries into array iNumOfEntriesFilled=%hhu", iNumOfEntriesFilled ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationCache::HandleUICCPbRespL; - Append entries into array iNumOfEntriesFilled=%hhu", iNumOfEntriesFilled ); } // End of if Ext Data is not Present else @@ -402,7 +411,7 @@ CleanupStack::Pop( phoneBookStoreMsg ); iNumOfEntriesFilled++; TFLOGSTRING2("TSY: CMmPhoneBookOperationCache::HandleUSimPbRespL - Append entries into array %d",iNumOfEntriesFilled); -OstTraceExt1( TRACE_NORMAL, DUP5_CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCPBRESPL, "CMmPhoneBookOperationCache::HandleUICCPbRespL; - Append entries into array iNumOfEntriesFilled=%hhu", iNumOfEntriesFilled ); +OstTraceExt1( TRACE_NORMAL, DUP5_CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationCache::HandleUICCPbRespL; - Append entries into array iNumOfEntriesFilled=%hhu", iNumOfEntriesFilled ); } // end for checking Data type in EXT } // end for Entry store } @@ -417,7 +426,7 @@ default: { TFLOGSTRING("TSY: CMmPhoneBookOperationCache::HandleUICCPbRespL. PhoneBook operation not supported "); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCPBRESPL, "CMmPhoneBookOperationCache::HandleUICCPbRespL. PhoneBook Operation not supported" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationCache::HandleUICCPbRespL. PhoneBook Operation not supported" ); break; } } // End of switch case @@ -459,7 +468,7 @@ else if ( EMmTsyONStoreGetInfoIPC == iSavedIPC ) { TFLOGSTRING("TSY: CMmPhoneBookOperationCache::HandleUICCPbRespL: Handle EMmTsyONStoreGetInfoIPC"); -OstTrace0( TRACE_NORMAL, DUP6_CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCPBRESPL, "CMmPhoneBookOperationCache::HandleUICCPbRespL: Handle EMmTsyONStoreGetInfoIPC" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationCache::HandleUICCPbRespL: Handle EMmTsyONStoreGetInfoIPC" ); complete = HandleUiccReadApplFileInfoResp( aTransId, aStatus, aFileData ); @@ -468,7 +477,7 @@ { // Operation has been canceled complete = ETrue; TFLOGSTRING("TSY: CMmPhoneBookOperationCache::HandleUICCPbRespL; operation was canceled"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCPBRESPL, "CMmPhoneBookOperationCache::HandleUICCPbRespL; operation was canceled" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationCache::HandleUICCPbRespL; operation was canceled" ); } return complete; @@ -487,7 +496,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::USimPbReqRead"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_USIMPBREQREAD, "CMmPhoneBookOperationCache::USimPbReqRead" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_USIMPBREQREAD_TD, "CMmPhoneBookOperationCache::USimPbReqRead" ); TInt ret( KErrNone ); @@ -497,16 +506,10 @@ cmdParams.messHandlerPtr = static_cast ( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 )); - cmdParams.filePath.Append( static_cast( MF_FILE )); - cmdParams.filePath.Append( appFileID>>8); - cmdParams.filePath.Append( appFileID); - - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType()) - { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); - } + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + cmdParams.filePath.Append( APPL_FILE_ID >> 8 ); + cmdParams.filePath.Append( APPL_FILE_ID ); switch( iFileId ) { @@ -580,7 +583,7 @@ default: { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::USimPbReqRead - PhoneBook Not supported"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONCACHE_USIMPBREQREAD, "CMmPhoneBookOperationCache::USimPbReqRead - PhoneBook not supported" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONCACHE_USIMPBREQREAD_TD, "CMmPhoneBookOperationCache::USimPbReqRead - PhoneBook not supported" ); break; } } @@ -591,7 +594,7 @@ ret = iMmPhoneBookStoreMessHandler->UiccMessHandler()-> CreateUiccApplCmdReq( cmdParams ); TFLOGSTRING2("TSY: CreateUiccApplCmdReq returns %d", ret); -OstTrace1( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONCACHE_USIMPBREQREAD, "CMmPhoneBookOperationCache::USimPbReqRead;returns ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONCACHE_USIMPBREQREAD_TD, "CMmPhoneBookOperationCache::USimPbReqRead;returns ret=%d", ret ); } return ret; } @@ -606,7 +609,7 @@ void CMmPhoneBookOperationCache::CancelReq( TName& aPhoneBook ) { TFLOGSTRING("TSY: CMmPhoneBookOperationCache::CancelReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_CANCELREQ, "CMmPhoneBookOperationCache::CancelReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_CANCELREQ_TD, "CMmPhoneBookOperationCache::CancelReq" ); if( iPhoneBookTypeName == aPhoneBook ) { iPhoneBookStoreCacheArray = NULL; @@ -625,7 +628,7 @@ const TUint8 aTrId ) { TFLOGSTRING3("TSY: CMmPhoneBookOperationCache::UiccReadApplFileInfo, aTraId: %d, aRecordId: %d", aTrId, aRecordId ); -OstTraceExt2( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_UICCREADAPPLFILEINFO, "CMmPhoneBookOperationCache::UiccReadApplFileInfo;aFileId=%d;aRecordId=%d", aFileId, aRecordId ); +OstTraceExt2( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_UICCREADAPPLFILEINFO_TD, "CMmPhoneBookOperationCache::UiccReadApplFileInfo;aFileId=%d;aRecordId=%d", aFileId, aRecordId ); TInt ret( KErrNone ); @@ -661,7 +664,7 @@ else { TFLOGSTRING("TSY: CMmPhoneBookOperationCache::UiccReadApplFileInfo MSISDN is not activated on SIM" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONCACHE_UICCREADAPPLFILEINFO, "CMmPhoneBookOperationCache::UiccReadApplFileInfo MSISDN is not activated on SIM" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONCACHE_UICCREADAPPLFILEINFO_TD, "CMmPhoneBookOperationCache::UiccReadApplFileInfo MSISDN is not activated on SIM" ); } return ret; } @@ -677,7 +680,7 @@ const TDesC8 &aFileData ) { TFLOGSTRING2("TSY: CMmPhoneBookOperationCache::HandleUiccReadApplFileInfoResp, aStatus: %d", aStatus ); -OstTrace1( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCREADAPPLFILEINFORESP, "CMmPhoneBookOperationCache::HandleUiccReadApplFileInfoResp;aStatus=%d", aStatus ); +OstTrace1( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCREADAPPLFILEINFORESP_TD, "CMmPhoneBookOperationCache::HandleUiccReadApplFileInfoResp;aStatus=%d", aStatus ); TInt ret( KErrNone ); TBool completed( EFalse ); @@ -832,7 +835,7 @@ default: { TFLOGSTRING2("TSY: CMmPhoneBookOperationCache::HandleUiccReadApplFileInfoResp - Unknown iTypeOfReading: %d", iTypeOfReading); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCREADAPPLFILEINFORESP, "CMmPhoneBookOperationCache::HandleUiccReadApplFileInfoResp;Unknown iTypeOfReading=%hhu", iTypeOfReading ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONCACHE_HANDLEUICCREADAPPLFILEINFORESP_TD, "CMmPhoneBookOperationCache::HandleUiccReadApplFileInfoResp;Unknown iTypeOfReading=%hhu", iTypeOfReading ); completed = ETrue; break; } @@ -852,7 +855,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationCache::CheckMSISDNSupport" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_CHECKMSISDNSUPPORT, "CMmPhoneBookOperationCache::CheckMSISDNSupport" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_CHECKMSISDNSUPPORT_TD, "CMmPhoneBookOperationCache::CheckMSISDNSupport" ); TInt ret( KErrNotSupported ); @@ -878,7 +881,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationCache::CompleteThisIPC" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONCACHE_CHECKMSISDNSUPPORT, "CMmPhoneBookOperationCache::CheckMSISDNSupport" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONCACHE_CHECKMSISDNSUPPORT_TD, "CMmPhoneBookOperationCache::CheckMSISDNSupport" ); iMmPhoneBookStoreMessHandler->MessageRouter()->Complete( aIPCToBeCompleted, @@ -897,24 +900,18 @@ const TUint8 aTrId ) { TFLOGSTRING3("TSY: CMmPhoneBookOperationCache::UiccReadApplFileData, aTraId: %d, aRecordId: %d", aTrId, aRecordId ); -OstTraceExt2( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_UICCREADAPPLFILEDATA, "CMmPhoneBookOperationCache::UiccReadApplFileData;aTrId=%d;aRecordId=%d", aTrId, aRecordId ); +OstTraceExt2( TRACE_NORMAL, CMMPHONEBOOKOPERATIONCACHE_UICCREADAPPLFILEDATA_TD, "CMmPhoneBookOperationCache::UiccReadApplFileData;aTrId=%d;aRecordId=%d", aTrId, aRecordId ); TInt ret( KErrNone ); TUiccReadLinearFixed cmdParams; cmdParams.messHandlerPtr = static_cast ( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 )); - cmdParams.filePath.Append( static_cast( MF_FILE )); + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); cmdParams.filePath.Append( APPL_FILE_ID>>8); cmdParams.filePath.Append( APPL_FILE_ID); - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) - { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); - } - cmdParams.trId = static_cast( aTrId ); cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED; cmdParams.record = aRecordId; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationdelete.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationdelete.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationdelete.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -66,7 +66,7 @@ CMmPhoneBookOperationDelete::CMmPhoneBookOperationDelete() { TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::CMmPhoneBookOperationDelete"); -OstTrace0( TRACE_NORMAL, CMmPhoneBookOperationDelete_CMmPhoneBookOperationDelete, "CMmPhoneBookOperationDelete::CMmPhoneBookOperationDelete" ); +OstTrace0( TRACE_NORMAL, CMmPhoneBookOperationDelete_CMmPhoneBookOperationDelete_TD, "CMmPhoneBookOperationDelete::CMmPhoneBookOperationDelete" ); } // --------------------------------------------------------------------------- @@ -77,7 +77,7 @@ CMmPhoneBookOperationDelete::~CMmPhoneBookOperationDelete() { TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::~CMmPhoneBookOperationDelete"); -OstTrace0( TRACE_NORMAL, DUP1_CMmPhoneBookOperationDelete_CMmPhoneBookOperationDelete, "CMmPhoneBookOperationDelete::~CMmPhoneBookOperationDelete" ); +OstTrace0( TRACE_NORMAL, DUP1_CMmPhoneBookOperationDelete_CMmPhoneBookOperationDelete_TD, "CMmPhoneBookOperationDelete::~CMmPhoneBookOperationDelete" ); } // --------------------------------------------------------------------------- @@ -92,7 +92,7 @@ const CMmDataPackage* aDataPackage ) // Data { TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::NewL"); -OstTrace0( TRACE_NORMAL, CMmPhoneBookOperationDelete_NEWL, "CMmPhoneBookOperationDelete::NewL" ); +OstTrace0( TRACE_NORMAL, CMmPhoneBookOperationDelete_NEWL_TD, "CMmPhoneBookOperationDelete::NewL" ); CMmPhoneBookOperationDelete* mmPhoneBookOperationDelete = new( ELeave ) CMmPhoneBookOperationDelete(); @@ -135,7 +135,7 @@ TUint8 aTransId ) { TFLOGSTRING2("TSY: CMmPhoneBookOperationDelete::UICCCreateReq Ipc: %d", aIpc); -OstTraceExt1( TRACE_NORMAL, DUP1_CMmPhoneBookOperationDelete_UICCCREATEREQ, "CMmPhoneBookOperationDelete::UICCCreateReq;aIpc=%hd", aIpc ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMmPhoneBookOperationDelete_UICCCREATEREQ_TD, "CMmPhoneBookOperationDelete::UICCCreateReq;aIpc=%hd", aIpc ); TInt ret( KErrNotSupported ); iIpc = aIpc; @@ -221,7 +221,7 @@ default: { TFLOGSTRING2("TSY: CMmPhoneBookOperationDelete::CreateReq - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONDELETE_CREATEREQ, "CMmPhoneBookOperationDelete::CreateReq;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONDELETE_CREATEREQ_TD, "CMmPhoneBookOperationDelete::CreateReq;aIpc=%d", aIpc ); break; } } @@ -237,7 +237,7 @@ TInt CMmPhoneBookOperationDelete::UiccPbReqDelete() { TFLOGSTRING3("TSY: CMmPhoneBookOperationDelete::UiccPbReqDelete, iTransId:%d,index:%d", iTransId, iIndex); -OstTraceExt2( TRACE_NORMAL, CMmPhoneBookOperationDelete_UICCPBREQWRITEL, "CMmPhoneBookOperationDelete::UiccPbReqDelete;iTransId=%hhu;iIndex=%hd", iTransId, iIndex ); +OstTraceExt2( TRACE_NORMAL, CMmPhoneBookOperationDelete_UICCPBREQWRITEL_TD, "CMmPhoneBookOperationDelete::UiccPbReqDelete;iTransId=%hhu;iIndex=%hd", iTransId, iIndex ); TInt ret( KErrArgument ); @@ -307,20 +307,21 @@ TInt CMmPhoneBookOperationDelete::UiccPbReqDeleteEntry() { TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::UiccPBReqDeleteEntry"); -OstTrace0( TRACE_NORMAL, CMmPhoneBookOperationDelete_UICCPBREQWRITEENTRY, "CMmPhoneBookOperationDelete::UiccPBReqDeleteEntry" ); +OstTrace0( TRACE_NORMAL, CMmPhoneBookOperationDelete_UICCPBREQWRITEENTRY_TD, "CMmPhoneBookOperationDelete::UiccPBReqDeleteEntry" ); TUiccWriteLinearFixed cmdParams; cmdParams.messHandlerPtr = static_cast( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 ) ); - cmdParams.filePath.Append( static_cast( MF_FILE ) ); - cmdParams.filePath.Append( APPL_FILE_ID >> 8 ); - cmdParams.filePath.Append( APPL_FILE_ID ); - if( ( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) && - ( PB_MSISDN_FID != iFileId ) ) + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + if( PB_MBDN_FID == iFileId ) { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); + } + else + { + cmdParams.filePath.Append( APPL_FILE_ID >> 8 ); + cmdParams.filePath.Append( APPL_FILE_ID ); } cmdParams.serviceType = UICC_APPL_UPDATE_LINEAR_FIXED; @@ -351,20 +352,22 @@ TInt CMmPhoneBookOperationDelete::UiccPbReqDeleteExt( TInt aExtRecordNum ) { TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::UiccPbReqDeleteExt"); -OstTrace0( TRACE_NORMAL, CMmPhoneBookOperationDelete_UICCPBWRITEEXT, "CMmPhoneBookOperationDelete::UiccPbReqDeleteExt" ); +OstTrace0( TRACE_NORMAL, CMmPhoneBookOperationDelete_UICCPBWRITEEXT_TD, "CMmPhoneBookOperationDelete::UiccPbReqDeleteExt" ); TUiccWriteLinearFixed cmdParams; cmdParams.messHandlerPtr = static_cast( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 )); - cmdParams.filePath.Append( static_cast( MF_FILE )); - cmdParams.filePath.Append( APPL_FILE_ID >> 8); - cmdParams.filePath.Append( APPL_FILE_ID); - - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + if( ( PB_EXT6_FID == iFileIdExt ) || + ( PB_EXT5_FID == iFileIdExt ) ) { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); + } + else + { + cmdParams.filePath.Append( APPL_FILE_ID >> 8 ); + cmdParams.filePath.Append( APPL_FILE_ID ); } cmdParams.fileId = iFileIdExt; @@ -392,19 +395,21 @@ TInt CMmPhoneBookOperationDelete::UiccPbReqReadEntry() { TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::UiccPBReqDeleteEntry"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_UICCPBREQREADENTRY, "CMmPhoneBookOperationDelete::UiccPbReqReadEntry" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_UICCPBREQREADENTRY_TD, "CMmPhoneBookOperationDelete::UiccPbReqReadEntry" ); TUiccReadLinearFixed cmdParams; cmdParams.messHandlerPtr = static_cast( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 ) ); - cmdParams.filePath.Append( static_cast( MF_FILE ) ); - cmdParams.filePath.Append( APPL_FILE_ID >> 8 ); - cmdParams.filePath.Append( APPL_FILE_ID ); - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + if( PB_MBDN_FID == iFileId ) { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); + } + else + { + cmdParams.filePath.Append( APPL_FILE_ID >> 8 ); + cmdParams.filePath.Append( APPL_FILE_ID ); } cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED; @@ -425,22 +430,15 @@ TInt CMmPhoneBookOperationDelete::UiccPbReqReadMBI( ) { TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::UiccPbReqReadMBI"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_UICCPBREQREADMBI, "CMmPhoneBookOperationDelete::UiccPbReqReadMBI" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_UICCPBREQREADMBI_TD, "CMmPhoneBookOperationDelete::UiccPbReqReadMBI" ); TInt ret ( KErrNone ); TUiccReadLinearFixed cmdParams; cmdParams.messHandlerPtr = static_cast ( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 )); - cmdParams.filePath.Append( static_cast( MF_FILE )); - cmdParams.filePath.Append( APPL_FILE_ID>>8); - cmdParams.filePath.Append( APPL_FILE_ID); - - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) - { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); - } + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); cmdParams.trId = static_cast( iTransId ); cmdParams.fileId = PB_MBI_FID; @@ -467,22 +465,17 @@ TInt CMmPhoneBookOperationDelete::UiccPBReqDeleteMBIProfile() { TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::UiccPBReqWriteMBIProfile"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_UICCPBREQDELETEMBIPROFILE, "CMmPhoneBookOperationDelete::UiccPBReqDeleteMBIProfile" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_UICCPBREQDELETEMBIPROFILE_TD, "CMmPhoneBookOperationDelete::UiccPBReqDeleteMBIProfile" ); TInt ret ( KErrNone ); TUiccWriteLinearFixed cmdParams; cmdParams.messHandlerPtr = static_cast ( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 )); - cmdParams.filePath.Append( static_cast( MF_FILE )); - cmdParams.filePath.Append( APPL_FILE_ID>>8); - cmdParams.filePath.Append( APPL_FILE_ID); - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) - { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); - } + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); + cmdParams.trId = static_cast( iTransId ); cmdParams.fileId = PB_MBI_FID; cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED ; @@ -513,7 +506,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::HandleReadEntryResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEREADENTRYRESP, "CMmPhoneBookOperationDelete::HandleReadEntryResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEREADENTRYRESP_TD, "CMmPhoneBookOperationDelete::HandleReadEntryResp" ); TInt ret( KErrNotFound ); @@ -557,7 +550,7 @@ TInt &aLocation ) { TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::HandleDeleteEntryResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEDELETEENTRYRESP, "CMmPhoneBookOperationDelete::HandleDeleteEntryResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEDELETEENTRYRESP_TD, "CMmPhoneBookOperationDelete::HandleDeleteEntryResp" ); TInt ret ( KErrNone ); @@ -622,7 +615,7 @@ TInt CMmPhoneBookOperationDelete::HandleDeleteExtResp() { TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::HandleDeleteExtResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEDELETEEXTRESP, "CMmPhoneBookOperationDelete::HandleDeleteExtResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEDELETEEXTRESP_TD, "CMmPhoneBookOperationDelete::HandleDeleteExtResp" ); TInt ret ( KErrNone ); @@ -674,19 +667,22 @@ TInt CMmPhoneBookOperationDelete::UiccPbReqReadExt( TUint8 aExtRecordNum ) { TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::UiccPbReqDeleteExt"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_UICCPBREQREADEXT, "CMmPhoneBookOperationDelete::UiccPbReqReadExt" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_UICCPBREQREADEXT_TD, "CMmPhoneBookOperationDelete::UiccPbReqReadExt" ); TUiccReadLinearFixed cmdParams; cmdParams.messHandlerPtr = static_cast( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 )); - cmdParams.filePath.Append( static_cast( MF_FILE )); - cmdParams.filePath.Append( APPL_FILE_ID >> 8); - cmdParams.filePath.Append( APPL_FILE_ID); - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + if( ( PB_EXT6_FID == iFileIdExt ) || + ( PB_EXT5_FID == iFileIdExt ) ) { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); + } + else + { + cmdParams.filePath.Append( APPL_FILE_ID >> 8 ); + cmdParams.filePath.Append( APPL_FILE_ID ); } cmdParams.fileId = iFileIdExt; @@ -708,7 +704,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::HandleReadExtResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEREADEXTRESP, "CMmPhoneBookOperationDelete::HandleReadExtResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEREADEXTRESP_TD, "CMmPhoneBookOperationDelete::HandleReadExtResp" ); TInt ret( KErrNotFound ); @@ -754,7 +750,7 @@ { TInt ret ( KErrNone ); TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::HandleMBIReadResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEMBIREADRESP, "CMmPhoneBookOperationDelete::HandleMBIReadResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEMBIREADRESP_TD, "CMmPhoneBookOperationDelete::HandleMBIReadResp" ); if( UICC_STATUS_OK == aStatus ) { @@ -814,7 +810,7 @@ TInt /*aTransId*/ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationDelete::HandleUICCPbRespL"); -OstTrace0( TRACE_NORMAL, CMmPhoneBookOperationDelete_HANDLEUICCPBRESPL, "CMmPhoneBookOperationDelete::HandleUICCPbRespL" ); +OstTrace0( TRACE_NORMAL, CMmPhoneBookOperationDelete_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationDelete::HandleUICCPbRespL" ); TInt ret( KErrNone ); TBool complete( EFalse ); @@ -893,7 +889,7 @@ default: { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::HandleSimPbRespL - No such delete operation phase supported "); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONDELETE_HANDLEUICCPBRESPL, "CMmPhoneBookOperationDelete::HandleUICCPbRespL- No such delete operation phase supported" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONDELETE_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationDelete::HandleUICCPbRespL- No such delete operation phase supported" ); break; } } // End of switch( iCurrentDeletePhase ) @@ -901,7 +897,7 @@ else // Request failed, complete and remove operation { TFLOGSTRING2("TSY: CMmPhoneBookOperationDelete::HandleUICCPbRespL, Request failed, ret = %d", aStatus ); -OstTrace1( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEUICCPBRESPL, "CMmPhoneBookOperationDelete::HandleUICCPbRespL;aStatus=%d", aStatus ); +OstTrace1( TRACE_NORMAL, CMMPHONEBOOKOPERATIONDELETE_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationDelete::HandleUICCPbRespL;aStatus=%d", aStatus ); complete = ETrue; ret = KErrNotFound; } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationinit.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationinit.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationinit.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -66,7 +66,7 @@ ) { TFLOGSTRING("TSY: CmmPhonebookOperatorInit::CmmPhonebookOperatorInit"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_CMMPHONEBOOKOPERATIONINIT, "CMmPhoneBookOperationInit::CMmPhoneBookOperationInit" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_CMMPHONEBOOKOPERATIONINIT_TD, "CMmPhoneBookOperationInit::CMmPhoneBookOperationInit" ); iTypeOfReading = EBasicEfRead; } @@ -82,7 +82,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::~CMmPhoneBookOperationInit"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT_CMMPHONEBOOKOPERATIONINIT, "CMmPhoneBookOperationInit::~CMmPhoneBookOperationInit" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT_CMMPHONEBOOKOPERATIONINIT_TD, "CMmPhoneBookOperationInit::~CMmPhoneBookOperationInit" ); delete iPBStoreInfoData; } @@ -100,7 +100,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::NewL"); - OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_NEWL, "CMmPhoneBookOperationInit::NewL" ); + OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_NEWL_TD, "CMmPhoneBookOperationInit::NewL" ); TName phonebookTypeName; @@ -149,7 +149,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_CONSTRUCTL, "CMmPhoneBookOperationInit::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_CONSTRUCTL_TD, "CMmPhoneBookOperationInit::ConstructL" ); iPBStoreInfoData = new( ELeave ) CStorageInfoData(); @@ -178,7 +178,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCCreateReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_UICCCREATEREQ, "CMmPhoneBookOperationInit::UICCCreateReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_UICCCREATEREQ_TD, "CMmPhoneBookOperationInit::UICCCreateReq" ); TInt ret( KErrNotSupported ); switch( aIpc ) @@ -219,7 +219,7 @@ // Nothing to do here TFLOGSTRING2("TSY: CMmPhoneBookOperationInit::UICCCreateReq - \ Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT_UICCCREATEREQ, "CMmPhoneBookOperationInit::UICCCreateReq;Unknowns aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT_UICCCREATEREQ_TD, "CMmPhoneBookOperationInit::UICCCreateReq;Unknowns aIpc=%d", aIpc ); break; } } // switch-case ends @@ -235,7 +235,7 @@ TInt CMmPhoneBookOperationInit::UICCInitializeReq( TUint8 aTransId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq"); -OstTrace0( TRACE_FATAL, CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq" ); +OstTrace0( TRACE_FATAL, CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq" ); TInt ret( KErrNone ); TInt appFileID ( APPL_FILE_ID ); // Application File id for DFphonebook @@ -243,26 +243,21 @@ cmdParams.messHandlerPtr = static_cast(iMmPhoneBookStoreMessHandler); cmdParams.trId = static_cast( aTransId ); - cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); cmdParams.filePath.Append(static_cast( MF_FILE )); - cmdParams.filePath.Append(appFileID>>8); - cmdParams.filePath.Append(appFileID); - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) - { - cmdParams.filePath.Append(static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append(static_cast( DF_PHONEBOOK )); - } + switch( iIniPhase ) { case EPBInitPhaseADN: { + cmdParams.filePath.Append(static_cast( APPL_FILE_ID >> 8 ) ); + cmdParams.filePath.Append(static_cast( APPL_FILE_ID ) ); // Create Data for ADN EF read if( EBasicEfRead == iTypeOfReading ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq - ADN Init for Fileinfo OR FileData"); - OstTrace0( TRACE_FATAL, DUP1_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq - ADN Init for Fileinfo OR FileData" ); + OstTrace0( TRACE_FATAL, DUP1_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq - ADN Init for Fileinfo OR FileData" ); // Send Request to read File Info or data from EFadn (depends upon iServiceType) cmdParams.fileId = PB_ADN_FID; cmdParams.serviceType = iServiceType; @@ -271,7 +266,7 @@ else if( EExtensionRead == iTypeOfReading ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq - ADN Phonebook Init Extension request"); - OstTrace0( TRACE_FATAL, DUP2_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq - ADN Phonebook Init Extension request" ); + OstTrace0( TRACE_FATAL, DUP2_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq - ADN Phonebook Init Extension request" ); // Initialization for EXT1 cmdParams.fileId = PB_EXT1_FID; @@ -282,11 +277,13 @@ } case EPBInitPhaseFDN: { + cmdParams.filePath.Append(static_cast( APPL_FILE_ID >> 8 ) ); + cmdParams.filePath.Append(static_cast( APPL_FILE_ID ) ); // Create Data for FDN EF read if( EBasicEfRead == iTypeOfReading ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq - FDN Init FileInfo OR FileData request"); - OstTrace0( TRACE_FATAL, DUP3_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq - FDN Init FileInfo OR FileData request" ); + OstTrace0( TRACE_FATAL, DUP3_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq - FDN Init FileInfo OR FileData request" ); cmdParams.fileId = PB_FDN_FID; cmdParams.serviceType = iServiceType; @@ -295,7 +292,7 @@ else if( EExtensionRead == iTypeOfReading ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq - FDN Init Extension request"); - OstTrace0( TRACE_FATAL, DUP4_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq - FDN Init Extension request" ); + OstTrace0( TRACE_FATAL, DUP4_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq - FDN Init Extension request" ); // Initialization for EXT2 cmdParams.fileId = PB_EXT2_FID; @@ -306,10 +303,12 @@ } case EPBInitPhaseSDN: { + cmdParams.filePath.Append(static_cast( APPL_FILE_ID >> 8 ) ); + cmdParams.filePath.Append(static_cast( APPL_FILE_ID ) ); if( EBasicEfRead == iTypeOfReading ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq - SDN Init FileInfo OR FileData request"); - OstTrace0( TRACE_FATAL, DUP5_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq - SDN Init FileInfo OR FileData request" ); + OstTrace0( TRACE_FATAL, DUP5_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq - SDN Init FileInfo OR FileData request" ); cmdParams.fileId = PB_SDN_FID; cmdParams.serviceType = iServiceType; @@ -318,7 +317,7 @@ else if( EExtensionRead == iTypeOfReading ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq - SDN Init Extension request"); - OstTrace0( TRACE_FATAL, DUP6_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq - SDN Init Extension request" ); + OstTrace0( TRACE_FATAL, DUP6_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq - SDN Init Extension request" ); // Initialization for EXT3 cmdParams.fileId = PB_EXT3_FID; @@ -329,11 +328,12 @@ } case EPBInitPhaseMBDN: { + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); // Start with MBI reading if( EBasicEfRead == iTypeOfReading ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq - MBDN Init FileInfo OR FileData request"); -OstTrace0( TRACE_FATAL, DUP7_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq - MBDN Init FileInfo OR FileData request" ); +OstTrace0( TRACE_FATAL, DUP7_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq - MBDN Init FileInfo OR FileData request" ); cmdParams.fileId = PB_MBDN_FID; cmdParams.serviceType = iServiceType; @@ -342,7 +342,7 @@ else if( EExtensionRead == iTypeOfReading ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq - MBDN Init Extension request"); -OstTrace0( TRACE_FATAL, DUP8_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq - MBDN Init Extension request" ); +OstTrace0( TRACE_FATAL, DUP8_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq - MBDN Init Extension request" ); cmdParams.fileId = PB_EXT6_FID; cmdParams.serviceType = iServiceType; @@ -351,7 +351,7 @@ else if( EMailboxIdRead == iTypeOfReading ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq - MBDN Init MBI request"); -OstTrace0( TRACE_FATAL, DUP14_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq - MBDN Init MBI request" ); +OstTrace0( TRACE_FATAL, DUP14_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq - MBDN Init MBI request" ); cmdParams.fileId = PB_MBI_FID; cmdParams.serviceType = iServiceType; @@ -364,8 +364,10 @@ if( EBasicEfRead == iTypeOfReading ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq - MSISDN Init FileInfo OR FileData request"); -OstTrace0( TRACE_FATAL, DUP9_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq - MSISDN Init FileInfo OR FileData request" ); +OstTrace0( TRACE_FATAL, DUP9_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq - MSISDN Init FileInfo OR FileData request" ); + cmdParams.filePath.Append(static_cast( APPL_FILE_ID >> 8 ) ); + cmdParams.filePath.Append(static_cast( APPL_FILE_ID ) ); cmdParams.fileId = PB_MSISDN_FID; cmdParams.serviceType = iServiceType; cmdParams.record = 0; @@ -373,8 +375,9 @@ else if( EExtensionRead == iTypeOfReading ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq - MSISDN Init Extension request"); -OstTrace0( TRACE_NORMAL, DUP10_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq" ); +OstTrace0( TRACE_NORMAL, DUP10_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq" ); + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); if ( UICC_CARD_TYPE_ICC == iMmUiccMessHandler->GetCardType() ) { @@ -382,7 +385,7 @@ } else if ( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) - { + { cmdParams.fileId = PB_EXT5_FID; } cmdParams.serviceType = iServiceType; @@ -392,10 +395,13 @@ } case EPBInitPhaseVMBX: { + cmdParams.filePath.Append(static_cast( APPL_FILE_ID >> 8 ) ); + cmdParams.filePath.Append(static_cast( APPL_FILE_ID ) ); + if( EBasicEfRead == iTypeOfReading ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq - VMBX Init FileInfo OR FileData request"); -OstTrace0( TRACE_FATAL, DUP11_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq - VMBX Init FileInfo OR FileData request" ); +OstTrace0( TRACE_FATAL, DUP11_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq - VMBX Init FileInfo OR FileData request" ); cmdParams.fileId = PB_VMBX_FID; cmdParams.serviceType = iServiceType; @@ -404,7 +410,7 @@ else if( EExtensionRead == iTypeOfReading ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq - VMBX Init Extension request"); -OstTrace0( TRACE_NORMAL, DUP13_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq - VMBX Init Extension request" ); +OstTrace0( TRACE_NORMAL, DUP13_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq - VMBX Init Extension request" ); cmdParams.fileId = PB_EXT1_FID; cmdParams.serviceType = iServiceType; @@ -415,7 +421,7 @@ default: { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::UICCInitializeReq - PhoneBook not supported "); -OstTrace0( TRACE_NORMAL, DUP12_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ, "CMmPhoneBookOperationInit::UICCInitializeReq - PhoneBook not supported" ); +OstTrace0( TRACE_NORMAL, DUP12_CMMPHONEBOOKOPERATIONINIT_UICCINITIALIZEREQ_TD, "CMmPhoneBookOperationInit::UICCInitializeReq - PhoneBook not supported" ); break; } } @@ -458,7 +464,7 @@ if ( iInternalInit ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleUICCPbRespL. Internal Init->Break"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONINIT_HANDLEUICCPBRESPL, "CMmPhoneBookOperationInit::HandleUICCPbRespL, Internal Init->Break" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONINIT_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationInit::HandleUICCPbRespL, Internal Init->Break" ); iIniPhase = EPBIniPhase_Unknown; @@ -504,7 +510,7 @@ TInt CMmPhoneBookOperationInit::HandlePBRespL(const TDesC8& aFileData, TInt aStatus, TUint8 aTransId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandlePBRespL"); - OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_HANDLEPBRESPL, "CMmPhoneBookOperationInit::HandlePBRespL" ); + OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_HANDLEPBRESPL_TD, "CMmPhoneBookOperationInit::HandlePBRespL" ); TInt ret(KErrNone); @@ -519,7 +525,7 @@ } else { - ret = HandleMBIFileResp( aFileData, aStatus ); + HandleMBIFileResp( aFileData, aStatus ); } if(KErrNone == ret) @@ -540,7 +546,7 @@ TInt CMmPhoneBookOperationInit::HandleFileResp(const TDesC8 &aFileData, TInt aStatus) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleFileResp"); - OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP, "CMmPhoneBookOperationInit::HandleFileResp" ); + OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP_TD, "CMmPhoneBookOperationInit::HandleFileResp" ); TInt ret(KErrNone); @@ -576,7 +582,7 @@ if(UICC_APPL_FILE_INFO == iServiceType) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for ADN Phonebook"); - OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP, "CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for ADN Phonebook" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP_TD, "CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for ADN Phonebook" ); // Check for ADN phone book is incalidated by Fdn phonebook or not TInt status(0); TFci fci( aFileData ); @@ -646,7 +652,7 @@ if(UICC_APPL_FILE_INFO == iServiceType) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for FDN Phonebook"); - OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP, "CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for FDN Phonebook" ); + OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP_TD, "CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for FDN Phonebook" ); iPBStoreInfoData->iFDNNumOfEntries = numOfEntries; iPBStoreInfoData->iFDNNumberLengthMax = numLength; @@ -722,7 +728,7 @@ if(UICC_APPL_FILE_INFO == iServiceType) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for SDN Phonebook"); - OstTrace0( TRACE_NORMAL, DUP5_CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP, "CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for SDN Phonebook" ); + OstTrace0( TRACE_NORMAL, DUP5_CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP_TD, "CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for SDN Phonebook" ); iPBStoreInfoData->iSDNNumOfEntries = numOfEntries; iPBStoreInfoData->iSDNNumberLengthMax = numLength; @@ -792,7 +798,7 @@ if(UICC_APPL_FILE_INFO == iServiceType) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for MBDN Phonebook"); - OstTrace0( TRACE_NORMAL, DUP7_CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP, "CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for MBDN Phonebook" ); + OstTrace0( TRACE_NORMAL, DUP7_CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP_TD, "CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for MBDN Phonebook" ); iPBStoreInfoData->iMBDNNumOfEntries = numOfEntries; iPBStoreInfoData->iMBDNNumberLengthMax = numLength; @@ -815,7 +821,7 @@ if( UICC_STATUS_OK == aStatus ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for MSISDN Phonebook"); - OstTrace0( TRACE_NORMAL, DUP9_CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP, "CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for MSISDN Phonebook" ); + OstTrace0( TRACE_NORMAL, DUP9_CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP_TD, "CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for MSISDN Phonebook" ); if(UICC_APPL_FILE_INFO == iServiceType) { @@ -887,7 +893,7 @@ if(UICC_APPL_FILE_INFO == iServiceType) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for VMBX Phonebook"); - OstTrace0( TRACE_NORMAL, DUP13_CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP, "CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for VMBX Phonebook" ); + OstTrace0( TRACE_NORMAL, DUP13_CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP_TD, "CMmPhoneBookOperationInit::HandleFileResp - Handle File Info for VMBX Phonebook" ); // update Data in CommonTSY buffer iPBStoreInfoData->iVMBXNumOfEntries = numOfEntries; @@ -928,7 +934,7 @@ default: { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleFileResp - PhoneBook not supported"); - OstTrace0( TRACE_NORMAL, DUP12_CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP, "CMmPhoneBookOperationInit::HandleFileResp - PhoneBook not supported" ); + OstTrace0( TRACE_NORMAL, DUP12_CMMPHONEBOOKOPERATIONINIT_HANDLEFILERESP_TD, "CMmPhoneBookOperationInit::HandleFileResp - PhoneBook not supported" ); } break; } @@ -954,7 +960,7 @@ TInt CMmPhoneBookOperationInit::HandleEXTFileResp( const TDesC8 &aFileData , TInt aStatus) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleEXTFileResp"); - OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP, "CMmPhoneBookOperationInit::HandleEXTFileResp" ); + OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP_TD, "CMmPhoneBookOperationInit::HandleEXTFileResp" ); TInt ret(KErrNone); @@ -980,7 +986,7 @@ case EPBInitPhaseADN: { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleEXTFileResp - For ADN Phone book"); - OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP, "CMmPhoneBookOperationInit::HandleEXTFileResp - For ADN Phone book" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP_TD, "CMmPhoneBookOperationInit::HandleEXTFileResp - For ADN Phone book" ); iPBStoreInfoData->iADNNumberLengthMax = numLength; @@ -1002,7 +1008,7 @@ case EPBInitPhaseFDN: { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleEXTFileResp - For FDN PhoneBook"); - OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP, "CMmPhoneBookOperationInit::HandleEXTFileResp -For FDN PhoneBoo" ); + OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP_TD, "CMmPhoneBookOperationInit::HandleEXTFileResp -For FDN PhoneBoo" ); iPBStoreInfoData->iFDNNumberLengthMax = numLength; @@ -1029,7 +1035,7 @@ case EPBInitPhaseSDN: { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleEXTFileResp - For SDN PhoneBook"); - OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP, "CMmPhoneBookOperationInit::HandleEXTFileResp - For SDN PhoneBook" ); + OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP_TD, "CMmPhoneBookOperationInit::HandleEXTFileResp - For SDN PhoneBook" ); iPBStoreInfoData->iSDNNumberLengthMax = numLength; @@ -1057,7 +1063,7 @@ case EPBInitPhaseMBDN: { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleEXTFileResp - for MBDN PhoneBook"); - OstTrace0( TRACE_NORMAL, DUP4_CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP, "CMmPhoneBookOperationInit::HandleEXTFileResp - for MBDN PhoneBook" ); + OstTrace0( TRACE_NORMAL, DUP4_CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP_TD, "CMmPhoneBookOperationInit::HandleEXTFileResp - for MBDN PhoneBook" ); iPBStoreInfoData->iMBDNNumberLengthMax = numLength; @@ -1085,7 +1091,7 @@ case EPBInitPhaseMSISDN: { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleEXTFileResp - for MSISDN Phonebook"); - OstTrace0( TRACE_NORMAL, DUP5_CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP, "CMmPhoneBookOperationInit::HandleEXTFileResp - for MSISDN Phonebook" ); + OstTrace0( TRACE_NORMAL, DUP5_CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP_TD, "CMmPhoneBookOperationInit::HandleEXTFileResp - for MSISDN Phonebook" ); iPBStoreInfoData->iMSISDNNumberLengthMax = numLength; @@ -1113,7 +1119,7 @@ case EPBInitPhaseVMBX: { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleEXTFileResp - For VMBX PhoneBook"); - OstTrace0( TRACE_NORMAL, DUP6_CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP, "CMmPhoneBookOperationInit::HandleEXTFileResp - For VMBX PhoneBook" ); + OstTrace0( TRACE_NORMAL, DUP6_CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP_TD, "CMmPhoneBookOperationInit::HandleEXTFileResp - For VMBX PhoneBook" ); iPBStoreInfoData->iVMBXNumberLengthMax = numLength; @@ -1134,7 +1140,7 @@ default: { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleEXTFileResp - PhoneBook not supported"); - OstTrace0( TRACE_NORMAL, DUP7_CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP, "CMmPhoneBookOperationInit::HandleEXTFileResp - PhoneBook not supported" ); + OstTrace0( TRACE_NORMAL, DUP7_CMMPHONEBOOKOPERATIONINIT_HANDLEEXTFILERESP_TD, "CMmPhoneBookOperationInit::HandleEXTFileResp - PhoneBook not supported" ); } break; } @@ -1156,13 +1162,12 @@ // by index // ----------------------------------------------------------------------------- // -TInt CMmPhoneBookOperationInit::HandleMBIFileResp( const TDesC8 &aFileData , TInt aStatus ) +void CMmPhoneBookOperationInit::HandleMBIFileResp( const TDesC8 &aFileData , TInt aStatus ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::HandleMBIFileResp"); - OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_HANDLEMBIFILERESP, "CMmPhoneBookOperationInit::HandleMBIFileResp" ); - - TInt ret(KErrNone); + OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_HANDLEMBIFILERESP_TD, "CMmPhoneBookOperationInit::HandleMBIFileResp" ); + if(UICC_STATUS_OK == aStatus) { // get the no of records @@ -1170,7 +1175,12 @@ iMbiRecLen = fci.GetRecordLength(); iTypeOfReading = EBasicEfRead; } - return ret ; + else + { + iServiceType = UICC_APPL_FILE_INFO; + GetNextPhoneBookInitPhase(iIniPhase); + } + } // ----------------------------------------------------------------------------- @@ -1183,7 +1193,7 @@ TUint8 CMmPhoneBookOperationInit::GetNextAvailablePbIcc(TUint8 aPBook) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::GetNextAvailablePbIcc"); - OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_GETNEXTAVAILABLEPBICC, "CMmPhoneBookOperationInit::GetNextAvailablePbIcc" ); + OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT_GETNEXTAVAILABLEPBICC_TD, "CMmPhoneBookOperationInit::GetNextAvailablePbIcc" ); switch(aPBook) { @@ -1294,7 +1304,7 @@ default: { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::GetNextAvailablePbIcc - Not Supported"); - OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT_GETNEXTAVAILABLEPBICC, "CMmPhoneBookOperationInit::GetNextAvailablePbIcc - Not Supported" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT_GETNEXTAVAILABLEPBICC_TD, "CMmPhoneBookOperationInit::GetNextAvailablePbIcc - Not Supported" ); } break; } @@ -1319,7 +1329,7 @@ TUint8 CMmPhoneBookOperationInit::GetNextAvailablePbUicc(TUint8 aPBook) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit::GetNextAvailablePbUicc"); - OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT_GETNEXTAVAILABLEPBUICC, "CMmPhoneBookOperationInit::GetNextAvailablePbUicc" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT_GETNEXTAVAILABLEPBUICC_TD, "CMmPhoneBookOperationInit::GetNextAvailablePbUicc" ); switch(aPBook) { diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationinit3g_adn.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationinit3g_adn.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationinit3g_adn.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -70,7 +70,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit3G_adn::CMmPhoneBookOperationInit3G_adn"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CMMPHONEBOOKOPERATIONINIT3G_ADN, "CMmPhoneBookOperationInit3G_adn::CMmPhoneBookOperationInit3G_adn" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CMMPHONEBOOKOPERATIONINIT3G_ADN_TD, "CMmPhoneBookOperationInit3G_adn::CMmPhoneBookOperationInit3G_adn" ); } // ----------------------------------------------------------------------------- @@ -84,7 +84,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit3G_adn::CMmPhoneBookOperationInit3G_adn"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT3G_ADN_CMMPHONEBOOKOPERATIONINIT3G_ADN, "CMmPhoneBookOperationInit3G_adn::~CMmPhoneBookOperationInit3G_adn" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT3G_ADN_CMMPHONEBOOKOPERATIONINIT3G_ADN_TD, "CMmPhoneBookOperationInit3G_adn::~CMmPhoneBookOperationInit3G_adn" ); } // ----------------------------------------------------------------------------- @@ -101,7 +101,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit3G_adn::NewL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_NEWL, "CMmPhoneBookOperationInit3G_adn::NewL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_NEWL_TD, "CMmPhoneBookOperationInit3G_adn::NewL" ); TName phonebookTypeName; @@ -154,7 +154,7 @@ ) { TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::ConstructL" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CONSTRUCTL, "CMmPhoneBookOperationInit3G_adn::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CONSTRUCTL_TD, "CMmPhoneBookOperationInit3G_adn::ConstructL" ); iPBStoreInfoData = new( ELeave ) CStorageInfoData(); @@ -177,7 +177,7 @@ ) { TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::UICCCreateReq" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_UICCCREATEREQ, "CMmPhoneBookOperationInit3G_adn::UICCCreateReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_UICCCREATEREQ_TD, "CMmPhoneBookOperationInit3G_adn::UICCCreateReq" ); TInt ret( KErrNotSupported ); @@ -211,7 +211,7 @@ { // Nothing to do here TFLOGSTRING2( "TSY: CMmPhoneBookOperationInit3G_adn::UICCCreateReq - Unknown IPC: %d", aIpc ); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT3G_ADN_UICCCREATEREQ, "CMmPhoneBookOperationInit3G_adn::UICCCreateReq;Unknown IPC =%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT3G_ADN_UICCCREATEREQ_TD, "CMmPhoneBookOperationInit3G_adn::UICCCreateReq;Unknown IPC =%d", aIpc ); break; } } // switch-case ends @@ -227,7 +227,7 @@ TInt CMmPhoneBookOperationInit3G_adn::UICCInitializeReq3GADN( TUint8 aTransId) { TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::UICCInitializeReq3GADN" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_UICCINITIALIZEREQ3GADN, "CMmPhoneBookOperationInit3G_adn::UICCInitializeReq3GADN" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_UICCINITIALIZEREQ3GADN_TD, "CMmPhoneBookOperationInit3G_adn::UICCInitializeReq3GADN" ); TInt ret(KErrNone); TInt appFileID( APPL_FILE_ID ); @@ -250,7 +250,7 @@ // Send Request to UICC Server to Read file Info of PBR file // No. of records in PBR file TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::UICCInitializeReq3GADN - File Info Read Request for EF-PBR " ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT3G_ADN_UICCINITIALIZEREQ3GADN, "CMmPhoneBookOperationInit3G_adn::UICCInitializeReq3GADN - File Info Read Request for EF-PBR" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT3G_ADN_UICCINITIALIZEREQ3GADN_TD, "CMmPhoneBookOperationInit3G_adn::UICCInitializeReq3GADN - File Info Read Request for EF-PBR" ); cmdParams.fileId = PB_PBR_FID; cmdParams.serviceType = iServiceType; @@ -308,7 +308,7 @@ const TUint8 aFileType ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CREATEREQFETCHTYPEFILE, "CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CREATEREQFETCHTYPEFILE_TD, "CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile" ); TInt ret( KErrNone ); TUint16 fileFID ( 0 ); @@ -319,7 +319,7 @@ case UICC_TYPE1_FILE: { TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile - Create req for Type 1 File " ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT3G_ADN_CREATEREQFETCHTYPEFILE, "CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile - Create req for Type 1 File " ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT3G_ADN_CREATEREQFETCHTYPEFILE_TD, "CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile - Create req for Type 1 File " ); fileFID = iType1FileArray[iCurrentArrayCounter].tagFID; fileSFI = iType1FileArray[iCurrentArrayCounter].tagSFI; @@ -328,7 +328,7 @@ case UICC_TYPE2_FILE: { TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile - Create req for Type 2 File " ); -OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEBOOKOPERATIONINIT3G_ADN_CREATEREQFETCHTYPEFILE, "CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile - Create req for Type 2 File " ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEBOOKOPERATIONINIT3G_ADN_CREATEREQFETCHTYPEFILE_TD, "CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile - Create req for Type 2 File " ); fileFID = iType2FileArray[iCurrentArrayCounter].tagFID; fileSFI = iType2FileArray[iCurrentArrayCounter].tagSFI; @@ -337,7 +337,7 @@ case UICC_TYPE3_FILE: { TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile - Create req for Type 3 File " ); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONINIT3G_ADN_CREATEREQFETCHTYPEFILE, "CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile - Create req for Type 3 File " ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONINIT3G_ADN_CREATEREQFETCHTYPEFILE_TD, "CMmPhoneBookOperationInit3G_adn::CreateReqFetchTypeFile - Create req for Type 3 File " ); fileFID = iType3FileArray[iCurrentArrayCounter].tagFID; fileSFI = iType3FileArray[iCurrentArrayCounter].tagSFI; break; @@ -379,7 +379,7 @@ if ( iInternalInit ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit3G_adn::HandleUICCPbRespL. Internal Init->Break"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLEUICCPBRESPL, "CMmPhoneBookOperationInit3G_adn::HandleUICCPbRespL. Internal Init-> Break" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationInit3G_adn::HandleUICCPbRespL. Internal Init-> Break" ); iIniPhase = EPBIniPhase_Unknown; @@ -396,7 +396,7 @@ case EPBInitPhase_3GADN_Type3: { TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::HandleUICCPbRespL. USIM ADN PhoneBook Init" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLEUICCPBRESPL, "CMmPhoneBookOperationInit3G_adn::HandleUICCPbRespL. USIM ADN Phonebook init" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationInit3G_adn::HandleUICCPbRespL. USIM ADN Phonebook init" ); ret = HandleUICCPbResp3GADN( aFileData, aStatus, aTransId ); break; } @@ -406,7 +406,7 @@ case EPBInitPhaseMSISDN: { TFLOGSTRING( "TSY: CMmPhoneBookOperationInit::HandleUICCPbRespL. Other PhoneBook Init" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLEUICCPBRESPL, "CMmPhoneBookOperationInit3G_adn::HandleUICCPbRespL. Other Phonebook Init" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationInit3G_adn::HandleUICCPbRespL. Other Phonebook Init" ); // For all other phoenbook handling is same as 2g Phonebook ret = HandlePBRespL( aFileData, aStatus, aTransId ); break; @@ -454,7 +454,7 @@ TUint8 aTransId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit3G_adn::HandleUICCPbResp3GADN"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLEUICCPBRESP3GADN, "CMmPhoneBookOperationInit3G_adn::HandleUICCPbResp3GADN" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLEUICCPBRESP3GADN_TD, "CMmPhoneBookOperationInit3G_adn::HandleUICCPbResp3GADN" ); TInt ret( KErrNone ); @@ -578,7 +578,7 @@ TInt aStatus ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit3G_adn::HandleType1FileResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLETYPE1FILERESP, "CMmPhoneBookOperationInit3G_adn::HandleType1FileResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLETYPE1FILERESP_TD, "CMmPhoneBookOperationInit3G_adn::HandleType1FileResp" ); TInt ret( KErrNone ); TInt recordLength( 0 ); @@ -827,7 +827,7 @@ TInt aStatus ) { TFLOGSTRING("TSY: CMmPhoneBookOperationInit3G_adn::HandleType2FileResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLETYPE2FILERESP, "CMmPhoneBookOperationInit3G_adn::HandleType2FileResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLETYPE2FILERESP_TD, "CMmPhoneBookOperationInit3G_adn::HandleType2FileResp" ); TInt ret(KErrNone); TInt recordLength( 0 ); @@ -969,7 +969,7 @@ TInt aStatus) { TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::HandleType3FileResp" ); - OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLETYPE3FILERESP, "CMmPhoneBookOperationInit3G_adn::HandleType3FileResp" ); + OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_HANDLETYPE3FILERESP_TD, "CMmPhoneBookOperationInit3G_adn::HandleType3FileResp" ); TInt ret( KErrNone ); TInt recordLength( 0 ); @@ -1074,7 +1074,7 @@ TInt CMmPhoneBookOperationInit3G_adn::CheckForFileId() { TFLOGSTRING("TSY: CMmPhoneBookOperationInit3G_adn::CheckForFileId"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CHECKFORFILEID, "CMmPhoneBookOperationInit3G_adn::CheckForFileId" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CHECKFORFILEID_TD, "CMmPhoneBookOperationInit3G_adn::CheckForFileId" ); TInt ret( KErrNone ); @@ -1186,7 +1186,7 @@ TInt CMmPhoneBookOperationInit3G_adn::CheckForNoOfRecords( TInt aNoOfRecord ) { TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::CheckForNoOfRecords" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CHECKFORNOOFRECORDS, "CMmPhoneBookOperationInit3G_adn::CheckForNoOfRecords" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CHECKFORNOOFRECORDS_TD, "CMmPhoneBookOperationInit3G_adn::CheckForNoOfRecords" ); TInt ret( KErrNone ); @@ -1212,7 +1212,7 @@ TInt CMmPhoneBookOperationInit3G_adn::CheckForSameType1AndType2Files() { TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::CheckForSameType1AndType2Files" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CHECKFORSAMETYPE1ANDTYPE2FILES, "CMmPhoneBookOperationInit3G_adn::CheckForSameType1AndType2Files" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CHECKFORSAMETYPE1ANDTYPE2FILES_TD, "CMmPhoneBookOperationInit3G_adn::CheckForSameType1AndType2Files" ); TInt ret( KErrNone ); @@ -1252,7 +1252,7 @@ TInt aRecordLength) { TFLOGSTRING( "TSY: CMmPhoneBookOperationInit3G_adn::CheckRecordSizeForFixedLength" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CHECKRECORDSIZEFORFIXEDLENGTH, "CMmPhoneBookOperationInit3G_adn::CheckRecordSizeForFixedLength" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONINIT3G_ADN_CHECKRECORDSIZEFORFIXEDLENGTH_TD, "CMmPhoneBookOperationInit3G_adn::CheckRecordSizeForFixedLength" ); TInt ret( KErrNone ); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationread.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationread.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationread.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -64,7 +64,7 @@ CMmPhoneBookOperationRead::CMmPhoneBookOperationRead() { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::CMmPhoneBookOperationRead"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_CMMPHONEBOOKOPERATIONREAD, "CMmPhoneBookOperationRead::CMmPhoneBookOperationRead" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_CMMPHONEBOOKOPERATIONREAD_TD, "CMmPhoneBookOperationRead::CMmPhoneBookOperationRead" ); iNumOfEntriesToRead = 0; iNumOfEntriesFilled = 0; @@ -83,7 +83,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::~CMmPhoneBookOperationRead"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD_CMMPHONEBOOKOPERATIONREAD, "CMmPhoneBookOperationRead::~CMmPhoneBookOperationRead" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD_CMMPHONEBOOKOPERATIONREAD_TD, "CMmPhoneBookOperationRead::~CMmPhoneBookOperationRead" ); } // ----------------------------------------------------------------------------- @@ -101,7 +101,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::NewL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_NEWL, "CMmPhoneBookOperationRead::NewL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_NEWL_TD, "CMmPhoneBookOperationRead::NewL" ); CMmPhoneBookOperationRead* mmPhoneBookOperationRead = new( ELeave ) CMmPhoneBookOperationRead(); @@ -140,7 +140,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_CONSTRUCTL, "CMmPhoneBookOperationRead::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_CONSTRUCTL_TD, "CMmPhoneBookOperationRead::ConstructL" ); } @@ -159,7 +159,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::UICCCreateReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_UICCCREATEREQ, "CMmPhoneBookOperationRead::UICCCreateReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_UICCCREATEREQ_TD, "CMmPhoneBookOperationRead::UICCCreateReq" ); TInt ret( KErrNotSupported ); @@ -216,7 +216,7 @@ { // Nothing to do here TFLOGSTRING2("TSY: CMmPhoneBookOperationRead::UICCCreateReq - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD_UICCCREATEREQ, "CMmPhoneBookOperationRead::UICCCreateReq;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD_UICCCREATEREQ_TD, "CMmPhoneBookOperationRead::UICCCreateReq;aIpc=%d", aIpc ); break; } } // switch-case @@ -237,7 +237,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::USimPbReqRead"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_USIMPBREQREAD, "CMmPhoneBookOperationRead::USimPbReqRead" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_USIMPBREQREAD_TD, "CMmPhoneBookOperationRead::USimPbReqRead" ); TInt ret( KErrNone ); TUiccReadLinearFixed cmdParams; @@ -245,17 +245,9 @@ cmdParams.messHandlerPtr = static_cast ( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 )); - cmdParams.filePath.Append( static_cast( MF_FILE )); - cmdParams.filePath.Append( APPL_FILE_ID>>8); - cmdParams.filePath.Append( APPL_FILE_ID); - - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) - { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); - } - + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED; cmdParams.trId = static_cast( aTransId ); @@ -263,6 +255,7 @@ if( ( PB_MBDN_FID == iFileId ) && ( EStartRead == iTypeOfReading ) ) { + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); // Check id MBI file index is valid if( ( iIndexToRead <= iMmPhoneBookStoreMessHandler-> iPBStoreConf[iArrayIndex].iMbiRecLen ) && @@ -285,6 +278,18 @@ } else { + if( ( PB_MBDN_FID == iFileId ) || + ( PB_EXT5_FID == iExtFileId ) || + ( PB_EXT6_FID == iExtFileId ) ) + { + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); + } + else + { + cmdParams.filePath.Append( APPL_FILE_ID >> 8 ); + cmdParams.filePath.Append( APPL_FILE_ID ); + } + if( EStartRead == iTypeOfReading ) { iTypeOfReading = EBasicEfRead; @@ -324,7 +329,7 @@ ret = iMmPhoneBookStoreMessHandler->UiccMessHandler()-> CreateUiccApplCmdReq( cmdParams ); TFLOGSTRING2("TSY: CreateUiccApplCmdReq returns %d", ret); -OstTrace1( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONREAD_USIMPBREQREAD, "CMmPhoneBookOperationRead::USimPbReqRead;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONREAD_USIMPBREQREAD_TD, "CMmPhoneBookOperationRead::USimPbReqRead;ret=%d", ret ); } // no else return ret; @@ -341,7 +346,7 @@ TInt CMmPhoneBookOperationRead::USimReadWriteSizeReq( TUint8 aTransId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::USimReadWriteSizeReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_USIMREADWRITESIZEREQ, "CMmPhoneBookOperationRead::USimReadWriteSizeReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_USIMREADWRITESIZEREQ_TD, "CMmPhoneBookOperationRead::USimReadWriteSizeReq" ); TInt ret( KErrNone ); @@ -353,13 +358,7 @@ cmdParams.filePath.Append( static_cast( MF_FILE )); cmdParams.filePath.Append( APPL_FILE_ID>>8); cmdParams.filePath.Append( APPL_FILE_ID); - - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) - { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); - } - + cmdParams.fileId = PB_MSISDN_FID; cmdParams.serviceType = UICC_APPL_FILE_INFO; cmdParams.trId = static_cast( aTransId ); @@ -379,7 +378,7 @@ TInt CMmPhoneBookOperationRead::AddParamToReadReq( TUiccReadLinearFixed& aParams ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::AddParamToReadReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_ADDPARAMTOREADREQ, "CMmPhoneBookOperationRead::AddParamToReadReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_ADDPARAMTOREADREQ_TD, "CMmPhoneBookOperationRead::AddParamToReadReq" ); TInt ret( KErrNone ); // Check for the record Number to be read is valid record number @@ -429,7 +428,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::HandleUICCPbRespL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_HANDLEUICCPBRESPL, "CMmPhoneBookOperationRead::HandleUICCPbRespL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationRead::HandleUICCPbRespL" ); TBool complete( EFalse ); TInt ret(KErrNone); @@ -441,7 +440,7 @@ if ( UICC_STATUS_OK != aStatus ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::HandleUICCPbRespL-Unsuccessfully completed by UICC"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONREAD_HANDLEUICCPBRESPL, "CMmPhoneBookOperationRead::HandleUICCPbRespL. Unsuccessfully completed by UICC" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONREAD_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationRead::HandleUICCPbRespL. Unsuccessfully completed by UICC" ); ret = CMmStaticUtility::UICCCSCauseToEpocError(aStatus ); } @@ -467,7 +466,7 @@ { // Nothing to do here TFLOGSTRING2("TSY: CMmPhoneBookOperationRead::HandleUICCPbRespL - Unknown IPC: %d", iSavedIPCForComplete); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD_HANDLEUICCPBRESPL, "CMmPhoneBookOperationRead::HandleUICCPbRespL - Unknown Ipc : %d", iSavedIPCForComplete ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationRead::HandleUICCPbRespL - Unknown Ipc : %d", iSavedIPCForComplete ); break; } } @@ -489,7 +488,7 @@ const TDesC8 &aFileData ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::USimPbReadRespL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_USIMPBREADRESPL, "CMmPhoneBookOperationRead::USimPbReadRespL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_USIMPBREADRESPL_TD, "CMmPhoneBookOperationRead::USimPbReadRespL" ); TInt ret ( aStatus ); TBool complete( EFalse ); @@ -573,7 +572,7 @@ TBool &aEntryStore ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::HandleReadResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_HANDLEREADRESP, "CMmPhoneBookOperationRead::HandleReadResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_HANDLEREADRESP_TD, "CMmPhoneBookOperationRead::HandleReadResp" ); iStoreEntry = new ( ELeave ) TPBEntry(); // update Entry Data @@ -639,7 +638,7 @@ TBool &aEntryStore ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::HandleEntryPresentResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_HANDLEENTRYPRESENTRESP, "CMmPhoneBookOperationRead::HandleEntryPresentResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_HANDLEENTRYPRESENTRESP_TD, "CMmPhoneBookOperationRead::HandleEntryPresentResp" ); // Check for Is there any extension data // And the Extension data record number is valid @@ -661,7 +660,7 @@ iNumOfEntriesFilled++; } TFLOGSTRING2("TSY: CMmPhoneBookOperationRead::HandleUSimPbRespL - Append entries into array %i",iNumOfEntriesFilled); -OstTrace1( TRACE_NORMAL, DUP4_CMMPHONEBOOKOPERATIONREAD_HANDLEUICCPBRESPL, "CMmPhoneBookOperationRead::HandleUICCPbRespL;iNumOfEntriesFilled=%d", iNumOfEntriesFilled ); +OstTrace1( TRACE_NORMAL, DUP4_CMMPHONEBOOKOPERATIONREAD_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationRead::HandleUICCPbRespL;iNumOfEntriesFilled=%d", iNumOfEntriesFilled ); } // End of if Ext Data is not Present else { @@ -696,7 +695,7 @@ TBool &aEntryStored ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::HandleExtReadResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_HANDLEEXTREADRESP, "CMmPhoneBookOperationRead::HandleExtReadResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_HANDLEEXTREADRESP_TD, "CMmPhoneBookOperationRead::HandleExtReadResp" ); // Check for next extension data record if ( 0xFF != aFileData[UICC_EXT_REC_NO_OFFSET] ) @@ -728,9 +727,9 @@ TInt offset = aFileData.Find(&KTagUnusedbyte,1); // store Data iNumberBuf.Append(aFileData.Mid(1,( offset - 1 ))); - - if( ( EMmTsyONStoreReadEntryIPC == iSavedIPCForComplete ) && - ( EMmTsyONStoreReadIPC == iSavedIPCForComplete ) ) + + if( ( EMmTsyONStoreReadEntryIPC != iSavedIPCForComplete ) && + ( EMmTsyONStoreReadIPC != iSavedIPCForComplete ) ) { StoreEntryToListL( aEntryStored ); } @@ -741,7 +740,7 @@ iNumOfEntriesFilled++; } TFLOGSTRING2("TSY: CMmPhoneBookOperationRead::HandleUSimPbRespL - Append entries into array %i",iNumOfEntriesFilled); -OstTrace1( TRACE_NORMAL, DUP5_CMMPHONEBOOKOPERATIONREAD_HANDLEUICCPBRESPL, "CMmPhoneBookOperationRead::HandleUICCPbRespL;iNumOfEntriesFilled=%d", iNumOfEntriesFilled ); +OstTrace1( TRACE_NORMAL, DUP5_CMMPHONEBOOKOPERATIONREAD_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationRead::HandleUICCPbRespL;iNumOfEntriesFilled=%d", iNumOfEntriesFilled ); } } } @@ -757,7 +756,7 @@ TInt aStatus ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::USimReadWriteSizeResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_USIMREADWRITESIZERESP, "CMmPhoneBookOperationRead::USimReadWriteSizeResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_USIMREADWRITESIZERESP_TD, "CMmPhoneBookOperationRead::USimReadWriteSizeResp" ); TInt ret( aStatus ); TInt numOfEntries(0); @@ -775,7 +774,7 @@ else { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::USimReadWriteSizeResp - FileInfo read Fail"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD_USIMREADWRITESIZERESP, "CMmPhoneBookOperationRead::USimReadWriteSizeResp - FileInfo Read Fail" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD_USIMREADWRITESIZERESP_TD, "CMmPhoneBookOperationRead::USimReadWriteSizeResp - FileInfo Read Fail" ); ret = KErrArgument; } @@ -803,7 +802,7 @@ void CMmPhoneBookOperationRead::StoreEntryToListL( TBool &aEntryStored ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::StoreEntryToList"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_STOREENTRYTOLIST, "CMmPhoneBookOperationRead::StoreEntryToList" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_STOREENTRYTOLIST_TD, "CMmPhoneBookOperationRead::StoreEntryToList" ); iMmPhoneBookStoreMessHandler->StoreEntryToPhoneBookList( iStoreEntry, @@ -844,7 +843,7 @@ void CMmPhoneBookOperationRead::StoreAndCompleteOwnNumber( TInt aRet , TInt aEmptyEntry) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead::StoreAndCompleteOwnNumber"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_STOREANDCOMPLETEOWNNUMBER, "CMmPhoneBookOperationRead::StoreAndCompleteOwnNumber" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_STOREANDCOMPLETEOWNNUMBER_TD, "CMmPhoneBookOperationRead::StoreAndCompleteOwnNumber" ); if( ( EMmTsyONStoreReadEntryIPC == iSavedIPCForComplete ) && ( ( KErrNone != aEmptyEntry ) || ( KErrNone != aRet ) ) ) diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationread3g_adn.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationread3g_adn.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationread3g_adn.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -70,7 +70,7 @@ CMmPhoneBookOperationRead3g_adn::CMmPhoneBookOperationRead3g_adn() { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::CMmPhoneBookOperationRead3g_adn"); - OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_CMMPHONEBOOKOPERATIONREAD3G_ADN, "CMmPhoneBookOperationRead3g_adn::CMmPhoneBookOperationRead3g_adn" ); + OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_CMMPHONEBOOKOPERATIONREAD3G_ADN_TD, "CMmPhoneBookOperationRead3g_adn::CMmPhoneBookOperationRead3g_adn" ); } // ----------------------------------------------------------------------------- @@ -83,7 +83,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::~CMmPhoneBookOperationRead3g_adn"); - OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_CMMPHONEBOOKOPERATIONREAD3G_ADN, "CMmPhoneBookOperationRead3g_adn::~CMmPhoneBookOperationRead3g_adn" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_CMMPHONEBOOKOPERATIONREAD3G_ADN_TD, "CMmPhoneBookOperationRead3g_adn::~CMmPhoneBookOperationRead3g_adn" ); } // ----------------------------------------------------------------------------- @@ -101,7 +101,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::NewL"); - OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_NEWL, "CMmPhoneBookOperationRead3g_adn::NewL" ); + OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_NEWL_TD, "CMmPhoneBookOperationRead3g_adn::NewL" ); CMmPhoneBookOperationRead3g_adn* mmPhoneBookOperationRead3g_adn = @@ -141,7 +141,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::ConstructL"); - OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_CONSTRUCTL, "CMmPhoneBookOperationRead3g_adn::ConstructL" ); + OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_CONSTRUCTL_TD, "CMmPhoneBookOperationRead3g_adn::ConstructL" ); iLocationSearch = EFalse; iCurrentType1Ef = 0; @@ -168,7 +168,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::UICCCreateReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCCREATEREQ, "CMmPhoneBookOperationRead3g_adn::UICCCreateReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCCREATEREQ_TD, "CMmPhoneBookOperationRead3g_adn::UICCCreateReq" ); TInt ret( KErrNotSupported ); @@ -237,7 +237,7 @@ { // Nothing to do here TFLOGSTRING2("TSY: CMmPhoneBookOperationRead3g_adn::UICCCreateReq - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCCREATEREQ, "CMmPhoneBookOperationRead3g_adn::UICCCreateReq - UnKnown Ipc : %d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCCREATEREQ_TD, "CMmPhoneBookOperationRead3g_adn::UICCCreateReq - UnKnown Ipc : %d", aIpc ); break; } } // switch-case @@ -257,7 +257,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::UICCHandleData3gADNReadReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCHANDLEDATA3GADNREADREQ, "CMmPhoneBookOperationRead3g_adn::UICCHandleData3gADNReadReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCHANDLEDATA3GADNREADREQ_TD, "CMmPhoneBookOperationRead3g_adn::UICCHandleData3gADNReadReq" ); TInt ret(KErrNone); @@ -317,7 +317,7 @@ const TUint8 aRecordNo ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::UiccReadEfRecordReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFRECORDREQ, "CMmPhoneBookOperationRead3g_adn::UiccReadEfRecordReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFRECORDREQ_TD, "CMmPhoneBookOperationRead3g_adn::UiccReadEfRecordReq" ); TUiccReadLinearFixed params; params.messHandlerPtr = @@ -355,7 +355,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::HandleUICCPbRespL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_HANDLEUICCPBRESPL, "CMmPhoneBookOperationRead3g_adn::HandleUICCPbRespL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationRead3g_adn::HandleUICCPbRespL" ); TBool completed( EFalse ); TInt ret( KErrNone ); @@ -363,7 +363,7 @@ if ( UICC_STATUS_OK != aStatus ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::HandleUICCPbRespL-Unsuccessfully completed by UICC"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONREAD3G_ADN_HANDLEUICCPBRESPL, "CMmPhoneBookOperationRead3g_adn::HandleUICCPbRespL - Unsuccessfully completed by UICC" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONREAD3G_ADN_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationRead3g_adn::HandleUICCPbRespL - Unsuccessfully completed by UICC" ); ret = CMmStaticUtility::UICCCSCauseToEpocError(aStatus ); } @@ -397,7 +397,7 @@ { // Nothing to do here TFLOGSTRING2("TSY: CMmPhoneBookOperationRead3g_adn::HandleUICCPbRespL - Unknown IPC: %d", iSavedIPCForComplete); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_HANDLEUICCPBRESPL, "CMmPhoneBookOperationRead3g_adn::HandleUICCPbRespL - UnKnown Ipc : =%d", iSavedIPCForComplete ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationRead3g_adn::HandleUICCPbRespL - UnKnown Ipc : =%d", iSavedIPCForComplete ); break; } } @@ -418,7 +418,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::HandleUICC3gADNRespL"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCHANDLEDATA3GADNREADREQ, "CMmPhoneBookOperationRead3g_adn::UICCHandleData3gADNReadReq" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCHANDLEDATA3GADNREADREQ_TD, "CMmPhoneBookOperationRead3g_adn::UICCHandleData3gADNReadReq" ); TBool completed ( EFalse ); TInt ret(KErrNone); @@ -469,7 +469,7 @@ default: { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::HandleUICC3gADNRespL - default branch "); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_HANDLEUICC3GADNRESPL, "CMmPhoneBookOperationRead3g_adn::HandleUICC3gADNRespL - default branch " ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_HANDLEUICC3GADNRESPL_TD, "CMmPhoneBookOperationRead3g_adn::HandleUICC3gADNRespL - default branch " ); break; } } @@ -560,7 +560,7 @@ TInt aTraId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::UiccReadEfPbrRecordResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFPBRRECORDRESP, "CMmPhoneBookOperationRead3g_adn::UiccReadEfPbrRecordResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFPBRRECORDRESP_TD, "CMmPhoneBookOperationRead3g_adn::UiccReadEfPbrRecordResp" ); TInt ret( KErrArgument ); if( UICC_STATUS_OK == aStatus ) @@ -583,7 +583,7 @@ else { TFLOGSTRING2("TSY: CMmPhoneBookOperationWrite3g_adn::UiccReadEfPbrRecordResp: file reading fails: 0x%x", aStatus ); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFPBRRECORDRESP, "CMmPhoneBookOperationRead3g_adn::UiccReadEfPbrRecordResp;file reading fails: =%d", aStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFPBRRECORDRESP_TD, "CMmPhoneBookOperationRead3g_adn::UiccReadEfPbrRecordResp;file reading fails: =%d", aStatus ); iNumOfEntriesToRead = 0; } @@ -604,7 +604,7 @@ const TDesC8 &aFileData ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::UiccReadEfType1RespL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE1RESPL, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType1RespL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE1RESPL_TD, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType1RespL" ); TInt ret ( KErrNone ); @@ -760,7 +760,7 @@ default: { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::UiccReadEfType1RespL - default branch "); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE1RESPL, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType1RespL - default branch" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE1RESPL_TD, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType1RespL - default branch" ); break; } @@ -771,7 +771,7 @@ // ADN Read failed for some reason so complete the // operation with error value TFLOGSTRING("TSY: CMmPhoneBookOperationWrite3g_adn::UiccReadEfType1RespL - Type1 File Read failed "); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE1RESPL, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType1RespL - Type1 file read failed" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE1RESPL_TD, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType1RespL - Type1 file read failed" ); iCurrentReadPhase = EPB_3G_ADN_Read_Phase_complete; ret = KErrArgument; @@ -802,7 +802,7 @@ const TDesC8 &aFileData ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::UiccReadEfType2RespL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE2RESPL, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType2RespL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE2RESPL_TD, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType2RespL" ); TInt ret ( KErrNone ); @@ -894,7 +894,7 @@ default: { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::UiccReadEfType2RespL - default branch"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE2RESPL, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType2RespL - default branch" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE2RESPL_TD, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType2RespL - default branch" ); break; } } @@ -902,7 +902,7 @@ else { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::UiccReadEfType2RespL - Type2 File Read Failed"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE2RESPL, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType2RespL - Type2 file read failed" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE2RESPL_TD, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType2RespL - Type2 file read failed" ); iCurrentReadPhase = EPB_3G_ADN_Read_Phase_complete; ret = KErrArgument; @@ -932,7 +932,7 @@ const TDesC8 &aFileData ) { TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::UiccReadEfType2RespL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE3RESPL, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType3RespL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE3RESPL_TD, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType3RespL" ); TInt ret ( KErrNone ); @@ -1024,7 +1024,7 @@ // EXT Reading fails for some reason complete the operation with // error value TFLOGSTRING("TSY: CMmPhoneBookOperationRead3g_adn::UiccReadEfType3RespL - EXT Read fail"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE3RESPL, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType3RespL - EXT Read fail" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_UICCREADEFTYPE3RESPL_TD, "CMmPhoneBookOperationRead3g_adn::UiccReadEfType3RespL - EXT Read fail" ); iCurrentReadPhase = EPB_3G_ADN_Read_Phase_complete; ret = KErrArgument; @@ -1052,7 +1052,7 @@ TInt CMmPhoneBookOperationRead3g_adn::GetNextType1File() { TFLOGSTRING( "TSY: CMmPhoneBookOperationRead3g_adn::GetNextType1File" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_GETNEXTTYPE1FILE, "CMmPhoneBookOperationRead3g_adn::GetNextType1File" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_GETNEXTTYPE1FILE_TD, "CMmPhoneBookOperationRead3g_adn::GetNextType1File" ); TInt ret ( KErrNotFound ); @@ -1086,7 +1086,7 @@ TInt &aExtFileTagIndex ) { TFLOGSTRING( "TSY: CMmPhoneBookOperationRead3g_adn::CheckForExtToContinueNextRead" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_CHECKFOREXTTOCONTINUENEXTREAD, "CMmPhoneBookOperationRead3g_adn::CheckForExtToContinueNextRead" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_CHECKFOREXTTOCONTINUENEXTREAD_TD, "CMmPhoneBookOperationRead3g_adn::CheckForExtToContinueNextRead" ); TInt ret ( KErrNone ); @@ -1125,7 +1125,7 @@ TInt CMmPhoneBookOperationRead3g_adn::ContinueWithNextReading( TUint8 aTraId ) { TFLOGSTRING( "TSY: CMmPhoneBookOperationRead3g_adn::ContinueWithNextReading" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_CONTINUEWITHNEXTREADING, "CMmPhoneBookOperationRead3g_adn::ContinueWithNextReading" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_CONTINUEWITHNEXTREADING_TD, "CMmPhoneBookOperationRead3g_adn::ContinueWithNextReading" ); TInt ret( KErrNone ); if( KErrNone == GetNextType1File() ) @@ -1178,7 +1178,7 @@ TInt CMmPhoneBookOperationRead3g_adn::StartReadingEntry( TUint8 aTransId ) { TFLOGSTRING( "TSY: CMmPhoneBookOperationRead3g_adn::StartReadingEntry" ); - OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_STARTREADINGENTRY, "CMmPhoneBookOperationRead3g_adn::StartReadingEntry" ); + OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_STARTREADINGENTRY_TD, "CMmPhoneBookOperationRead3g_adn::StartReadingEntry" ); TInt ret( KErrNone ); @@ -1240,7 +1240,7 @@ const TInt aLocation ) { TFLOGSTRING( "TSY: CMmPhoneBookOperationRead3G_adn::CreateInternalPbEntryL" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_CREATEINTERNALPBENTRYL, "CMmPhoneBookOperationRead3g_adn::CreateInternalPbEntryL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_CREATEINTERNALPBENTRYL_TD, "CMmPhoneBookOperationRead3g_adn::CreateInternalPbEntryL" ); // Check if this entry was already stored in internal list iStoreEntry = iMmPhoneBookStoreMessHandler->FindEntryFromPbList( @@ -1270,7 +1270,7 @@ const TInt aLocation, TBool& aAllocatedNow ) { TFLOGSTRING( "TSY: CMmPhoneBookOperationRead3g_adn::CreateReadPbEntryL" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_CREATEREADPBENTRYL, "CMmPhoneBookOperationRead3g_adn::CreateReadPbEntryL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_CREATEREADPBENTRYL_TD, "CMmPhoneBookOperationRead3g_adn::CreateReadPbEntryL" ); aAllocatedNow = ETrue; CPhoneBookStoreEntry* phoneBookStoreEntry( NULL ); @@ -1311,7 +1311,7 @@ TUint8 aOffset ) { TFLOGSTRING( "TSY: CMmPhoneBookOperationRead3g_adn::SearchForFileTagIndex" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_SEARCHFORFILETAGINDEX, "CMmPhoneBookOperationRead3g_adn::SearchForFileTagIndex" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_SEARCHFORFILETAGINDEX_TD, "CMmPhoneBookOperationRead3g_adn::SearchForFileTagIndex" ); TInt index( KErrNotFound ); for( TInt count(0); countiapInfo.Count() == iType2FileArray.Count() ) @@ -1404,7 +1404,7 @@ const TDesC8 &aFileData ) { TFLOGSTRING( "TSY: CMmPhoneBookOperationRead3g_adn::CheckForEmptyEntry" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_CHECKFOREMPTYENTRY, "CMmPhoneBookOperationRead3g_adn::CheckForEmptyEntry" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_CHECKFOREMPTYENTRY_TD, "CMmPhoneBookOperationRead3g_adn::CheckForEmptyEntry" ); TBool notEmpty( ETrue ); TBuf8 emptyData; @@ -1432,7 +1432,7 @@ TDes8& aEmptyPattern ) { TFLOGSTRING( "TSY: CMmPhoneBookOperationRead3g_adn::GetEmptyRecordPattern" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_GETEMPTYRECORDPATTERN, "CMmPhoneBookOperationRead3G_adn::GetEmptyRecordPattern" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD3G_ADN_GETEMPTYRECORDPATTERN_TD, "CMmPhoneBookOperationRead3G_adn::GetEmptyRecordPattern" ); switch( aFileType ) { @@ -1486,7 +1486,7 @@ default: { TFLOGSTRING( "TSY: CMmPhoneBookOperationRead3g_adn::GetEmptyRecordPattern: default" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_GETEMPTYRECORDPATTERN, "CMmPhoneBookOperationRead3g_adn::GetEmptyRecordPattern : default" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONREAD3G_ADN_GETEMPTYRECORDPATTERN_TD, "CMmPhoneBookOperationRead3g_adn::GetEmptyRecordPattern : default" ); break; } } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationwrite.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationwrite.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookoperationwrite.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -69,7 +69,7 @@ CMmPhoneBookOperationWrite::CMmPhoneBookOperationWrite() { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::CMmPhoneBookOperationWrite"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_CMMPHONEBOOKOPERATIONWRITE, "CMmPhoneBookOperationWrite::CMmPhoneBookOperationWrite" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_CMMPHONEBOOKOPERATIONWRITE_TD, "CMmPhoneBookOperationWrite::CMmPhoneBookOperationWrite" ); iPhoneBookEntry = NULL; } @@ -81,7 +81,7 @@ CMmPhoneBookOperationWrite::~CMmPhoneBookOperationWrite() { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::~CMmPhoneBookOperationWrite"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_CMMPHONEBOOKOPERATIONWRITE, "CMmPhoneBookOperationWrite::~CMmPhoneBookOperationWrite" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_CMMPHONEBOOKOPERATIONWRITE_TD, "CMmPhoneBookOperationWrite::~CMmPhoneBookOperationWrite" ); } // --------------------------------------------------------------------------- @@ -97,7 +97,7 @@ TInt aIpc ) // Data { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::NewL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_NEWL, "CMmPhoneBookOperationWrite::NewL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_NEWL_TD, "CMmPhoneBookOperationWrite::NewL" ); TName phonebookTypeName; @@ -133,7 +133,7 @@ void CMmPhoneBookOperationWrite::ConstructL() { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_CONSTRUCTL, "CMmPhoneBookOperationWrite::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_CONSTRUCTL_TD, "CMmPhoneBookOperationWrite::ConstructL" ); } @@ -150,7 +150,7 @@ ) { TFLOGSTRING2("TSY: CMmPhoneBookOperationWrite::UICCCreateReq Ipc: %d", aIpc); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_UICCCREATEREQ, "CMmPhoneBookOperationWrite::UICCCreateReq;aIpc=%hd", aIpc ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_UICCCREATEREQ_TD, "CMmPhoneBookOperationWrite::UICCCreateReq;aIpc=%hd", aIpc ); TInt ret (KErrNotSupported); iSavedIpc = aIpc; @@ -257,7 +257,7 @@ default: { TFLOGSTRING2("TSY: CMmPhoneBookOperationWrite::UICCCreateReq Unknown Ipc: %d", aIpc); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONWRITE_UICCCREATEREQ, "CMmPhoneBookOperationWrite::UICCCreateReq;Unknown aIpc =%hd", aIpc ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONWRITE_UICCCREATEREQ_TD, "CMmPhoneBookOperationWrite::UICCCreateReq;Unknown aIpc =%hd", aIpc ); break; } @@ -277,7 +277,7 @@ CPhoneBookStoreEntry& aDataToWrite ) { TFLOGSTRING3("TSY: CMmPhoneBookOperationWrite::SimPbReqWriteL, aTransId:%d,index:%d", aTransId, aIndex); -OstTraceExt2( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEL, "CMmPhoneBookOperationWrite::UiccPbReqWriteL;aTransId=%hhu;aIndex=%hd", aTransId, aIndex ); +OstTraceExt2( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEL_TD, "CMmPhoneBookOperationWrite::UiccPbReqWriteL;aTransId=%hhu;aIndex=%hd", aTransId, aIndex ); TInt ret( KErrNone ); @@ -372,24 +372,25 @@ CPhoneBookStoreEntry& aDataToWrite ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::UiccPBReqWriteEntry"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEENTRY, "CMmPhoneBookOperationWrite::UiccPBReqWriteEntry" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEENTRY_TD, "CMmPhoneBookOperationWrite::UiccPBReqWriteEntry" ); TInt ret( KErrNone ); TUiccWriteLinearFixed cmdParams; cmdParams.messHandlerPtr = static_cast ( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 )); - cmdParams.filePath.Append( static_cast( MF_FILE )); - cmdParams.filePath.Append( APPL_FILE_ID>>8); - cmdParams.filePath.Append( APPL_FILE_ID); - - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + if( PB_MBDN_FID == iFileId ) { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); } - + else + { + cmdParams.filePath.Append( APPL_FILE_ID >> 8 ); + cmdParams.filePath.Append( APPL_FILE_ID ); + } + cmdParams.serviceType = UICC_APPL_UPDATE_LINEAR_FIXED; cmdParams.fileId = iFileId; cmdParams.trId = static_cast( aTransId ); @@ -472,7 +473,7 @@ ret = iMmPhoneBookStoreMessHandler->UiccMessHandler()-> CreateUiccApplCmdReq( cmdParams ); TFLOGSTRING2("TSY: CreateUiccApplCmdReq returns %d", ret); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEENTRY, "CMmPhoneBookOperationWrite::UiccPBReqWriteEntry;ret=%hd", ret ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEENTRY_TD, "CMmPhoneBookOperationWrite::UiccPBReqWriteEntry;ret=%hd", ret ); } @@ -492,24 +493,26 @@ CPhoneBookStoreEntry& aDataToWrite ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::UiccPbReqWriteExt"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBWRITEEXT, "CMmPhoneBookOperationWrite::UiccPbReqWriteExt" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBWRITEEXT_TD, "CMmPhoneBookOperationWrite::UiccPbReqWriteExt" ); TInt ret( KErrNone ); TUiccWriteLinearFixed cmdParams; cmdParams.messHandlerPtr = static_cast ( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 )); - cmdParams.filePath.Append( static_cast( MF_FILE )); - cmdParams.filePath.Append( APPL_FILE_ID>>8); - cmdParams.filePath.Append( APPL_FILE_ID); - - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + if( ( PB_EXT5_FID == iExtFileId ) || + ( PB_EXT6_FID == iExtFileId) ) { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); } - + else + { + cmdParams.filePath.Append( APPL_FILE_ID >> 8 ); + cmdParams.filePath.Append( APPL_FILE_ID ); + } + cmdParams.fileId = iExtFileId; cmdParams.serviceType = UICC_APPL_UPDATE_LINEAR_FIXED; cmdParams.trId = static_cast( aTransId ); @@ -583,7 +586,7 @@ ret = iMmPhoneBookStoreMessHandler->UiccMessHandler()-> CreateUiccApplCmdReq( cmdParams ); TFLOGSTRING2("TSY: CreateUiccApplCmdReq returns %d", ret); -OstTraceExt1( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEEXT, "CMmPhoneBookOperationWrite::UiccPbReqWriteExt;ret=%hd", ret ); +OstTraceExt1( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEEXT_TD, "CMmPhoneBookOperationWrite::UiccPbReqWriteExt;ret=%hd", ret ); } return ret; @@ -603,25 +606,27 @@ TUint8 aTransId) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::UiccPbReqWriteEXTDelete"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEREADEXT, "CMmPhoneBookOperationWrite::UiccPbReqWriteReadExt" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEREADEXT_TD, "CMmPhoneBookOperationWrite::UiccPbReqWriteReadExt" ); TInt ret ( KErrNone ); TUiccReadLinearFixed cmdParams; cmdParams.messHandlerPtr = static_cast ( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 )); - cmdParams.filePath.Append( static_cast( MF_FILE )); - cmdParams.filePath.Append( APPL_FILE_ID>>8); - cmdParams.filePath.Append( APPL_FILE_ID); - - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + if( ( PB_EXT5_FID == iExtFileId ) || + ( PB_EXT6_FID == iExtFileId) ) { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); } - - // Append transaction id + else + { + cmdParams.filePath.Append( APPL_FILE_ID >> 8 ); + cmdParams.filePath.Append( APPL_FILE_ID ); + } + + // Append transaction id cmdParams.trId = static_cast( aTransId ); // Append File id @@ -648,7 +653,7 @@ ret = iMmPhoneBookStoreMessHandler->UiccMessHandler()-> CreateUiccApplCmdReq( cmdParams ); TFLOGSTRING2("TSY: CreateUiccApplCmdReq returns %d", ret); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEREADEXT, "CMmPhoneBookOperationWrite::UiccPbReqWriteReadExt;ret=%hd", ret ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEREADEXT_TD, "CMmPhoneBookOperationWrite::UiccPbReqWriteReadExt;ret=%hd", ret ); } return ret; @@ -665,24 +670,25 @@ TUint8 aTransId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::UiccPbReqWriteRead"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEREAD, "CMmPhoneBookOperationWrite::UiccPbReqWriteRead" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEREAD_TD, "CMmPhoneBookOperationWrite::UiccPbReqWriteRead" ); TInt ret ( KErrNone ); TUiccReadLinearFixed cmdParams; cmdParams.messHandlerPtr = static_cast ( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 )); - cmdParams.filePath.Append( static_cast( MF_FILE )); - cmdParams.filePath.Append( APPL_FILE_ID>>8); - cmdParams.filePath.Append( APPL_FILE_ID); - - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + if( PB_MBDN_FID == iExtFileId ) { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); } - + else + { + cmdParams.filePath.Append( APPL_FILE_ID >> 8 ); + cmdParams.filePath.Append( APPL_FILE_ID ); + } + cmdParams.trId = static_cast( aTransId ); cmdParams.fileId = iFileId; cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED ; @@ -701,7 +707,7 @@ ret = iMmPhoneBookStoreMessHandler->UiccMessHandler()-> CreateUiccApplCmdReq( cmdParams ); TFLOGSTRING2("TSY: CreateUiccApplCmdReq returns %d", ret); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEREAD, "CMmPhoneBookOperationWrite::UiccPbReqWriteRead;ret=%hd", ret ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEREAD_TD, "CMmPhoneBookOperationWrite::UiccPbReqWriteRead;ret=%hd", ret ); } return ret; @@ -717,7 +723,7 @@ TUint8 aTransId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::UiccPbReqWriteEXTDelete"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEEXTDELETE, "CMmPhoneBookOperationWrite::UiccPbReqWriteEXTDelete" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEEXTDELETE_TD, "CMmPhoneBookOperationWrite::UiccPbReqWriteEXTDelete" ); TInt ret ( KErrNone ); TBuf8<13>deleteEntryData; @@ -725,17 +731,19 @@ TUiccWriteLinearFixed cmdParams; cmdParams.messHandlerPtr = static_cast ( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 )); - cmdParams.filePath.Append( static_cast( MF_FILE )); - cmdParams.filePath.Append( APPL_FILE_ID>>8); - cmdParams.filePath.Append( APPL_FILE_ID); - - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + if( ( PB_EXT5_FID == iExtFileId ) || + ( PB_EXT6_FID == iExtFileId) ) { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); } - + else + { + cmdParams.filePath.Append( APPL_FILE_ID >> 8 ); + cmdParams.filePath.Append( APPL_FILE_ID ); + } + cmdParams.trId = static_cast( aTransId ); cmdParams.fileId = iExtFileId; cmdParams.serviceType = UICC_APPL_UPDATE_LINEAR_FIXED ; @@ -765,7 +773,7 @@ ret = iMmPhoneBookStoreMessHandler->UiccMessHandler()-> CreateUiccApplCmdReq( cmdParams ); TFLOGSTRING2("TSY: CreateUiccApplCmdReq returns %d", ret); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEEXTDELETE, "CMmPhoneBookOperationWrite::UiccPbReqWriteExtDelete;ret=%hd", ret ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEEXTDELETE_TD, "CMmPhoneBookOperationWrite::UiccPbReqWriteExtDelete;ret=%hd", ret ); } return ret ; @@ -785,7 +793,7 @@ CPhoneBookStoreEntry& aDataToWrite ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::StartWriteForEntryPresentInList"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_STARTWRITEFORENTRYPRESENTINLIST, "CMmPhoneBookOperationWrite::StartWriteForEntryPresentInList" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_STARTWRITEFORENTRYPRESENTINLIST_TD, "CMmPhoneBookOperationWrite::StartWriteForEntryPresentInList" ); TInt ret( KErrNone ); // if Entry present in list Store it locally @@ -860,23 +868,16 @@ TInt CMmPhoneBookOperationWrite::UiccPbReqReadMBI( TUint8 aOffset, TUint8 aTransId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::UiccPbReqReadMBI"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_UICCPBREQREADMBI, "CMmPhoneBookOperationWrite::UiccPbReqReadMBI" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_UICCPBREQREADMBI_TD, "CMmPhoneBookOperationWrite::UiccPbReqReadMBI" ); TInt ret ( KErrNone ); TUiccReadLinearFixed cmdParams; cmdParams.messHandlerPtr = static_cast ( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 )); - cmdParams.filePath.Append( static_cast( MF_FILE )); - cmdParams.filePath.Append( APPL_FILE_ID>>8); - cmdParams.filePath.Append( APPL_FILE_ID); - - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) - { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); - } - + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); + cmdParams.trId = static_cast( aTransId ); cmdParams.fileId = PB_MBI_FID; cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED ; @@ -916,24 +917,17 @@ TUint8 aOperationType ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::UiccPBReqWriteMBIProfile"); -OstTrace0( TRACE_FATAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEMBIPROFILE, "CMmPhoneBookOperationWrite::UiccPBReqWriteMBIProfile" ); +OstTrace0( TRACE_FATAL, CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEMBIPROFILE_TD, "CMmPhoneBookOperationWrite::UiccPBReqWriteMBIProfile" ); TInt ret ( KErrNone ); TUiccWriteLinearFixed cmdParams; cmdParams.messHandlerPtr = static_cast ( iMmPhoneBookStoreMessHandler ); - cmdParams.filePath.Append( static_cast( MF_FILE >> 8 )); - cmdParams.filePath.Append( static_cast( MF_FILE )); - cmdParams.filePath.Append( APPL_FILE_ID>>8); - cmdParams.filePath.Append( APPL_FILE_ID); - - if( UICC_CARD_TYPE_UICC == iMmUiccMessHandler->GetCardType() ) - { - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK >> 8 )); - cmdParams.filePath.Append( static_cast( DF_PHONEBOOK )); - } - + cmdParams.filePath.Append(static_cast( MF_FILE >> 8 )); + cmdParams.filePath.Append(static_cast( MF_FILE )); + cmdParams.filePath.Append( iMmUiccMessHandler->GetApplicationFileId() ); + cmdParams.trId = static_cast( aTransId ); cmdParams.fileId = PB_MBI_FID; cmdParams.serviceType = UICC_APPL_READ_LINEAR_FIXED ; @@ -972,7 +966,7 @@ TInt aTransId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::HandleUICCPbRespL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_HANDLEUICCPBRESPL, "CMmPhoneBookOperationWrite::HandleUICCPbRespL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationWrite::HandleUICCPbRespL" ); TBool complete ( EFalse ); TInt ret ( KErrNone ); @@ -1036,7 +1030,7 @@ default: { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::HandleSimPbRespL - NO such Write operation Phase supported "); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_HANDLEUICCPBRESPL, "CMmPhoneBookOperationWrite::HandleUICCPbRespL - No such write operation phase supported" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationWrite::HandleUICCPbRespL - No such write operation phase supported" ); break; } } @@ -1130,7 +1124,7 @@ default: { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::HandleSimPbRespL - unknown Ipc "); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONWRITE_HANDLEUICCPBRESPL, "CMmPhoneBookOperationWrite::HandleUICCPbRespL - unknown Ipc" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKOPERATIONWRITE_HANDLEUICCPBRESPL_TD, "CMmPhoneBookOperationWrite::HandleUICCPbRespL - unknown Ipc" ); break; } } @@ -1152,7 +1146,7 @@ TUint8 aTransId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::HandleWriteReadEntryResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_HANDLEWRITEREADENTRYRESP, "CMmPhoneBookOperationWrite::HandleWriteReadEntryResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_HANDLEWRITEREADENTRYRESP_TD, "CMmPhoneBookOperationWrite::HandleWriteReadEntryResp" ); TInt ret ( KErrNone ); if( UICC_STATUS_OK == aStatus ) @@ -1291,7 +1285,7 @@ TUint8 aTransId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::HandleWriteReadExtEntryResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_HANDLEWRITEREADEXTENTRYRESP, "CMmPhoneBookOperationWrite::HandleWriteReadExtEntryResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_HANDLEWRITEREADEXTENTRYRESP_TD, "CMmPhoneBookOperationWrite::HandleWriteReadExtEntryResp" ); TInt ret ( KErrNone ); if( UICC_STATUS_OK == aStatus ) @@ -1404,7 +1398,7 @@ TUint8 aTransId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::HandleWriteSearchExtEntryResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_HANDLEWRITESEARCHEXTENTRYRESP, "CMmPhoneBookOperationWrite::HandleWriteSearchExtEntryResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_HANDLEWRITESEARCHEXTENTRYRESP_TD, "CMmPhoneBookOperationWrite::HandleWriteSearchExtEntryResp" ); TInt ret ( KErrNone ); if( UICC_STATUS_OK == aStatus) @@ -1518,7 +1512,7 @@ TUint8 aTransId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::HandleWriteEntryResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_HANDLEWRITEENTRYRESP, "CMmPhoneBookOperationWrite::HandleWriteEntryResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_HANDLEWRITEENTRYRESP_TD, "CMmPhoneBookOperationWrite::HandleWriteEntryResp" ); TInt ret ( KErrNone ); if( UICC_STATUS_OK == aStatus ) @@ -1620,7 +1614,7 @@ TUint8 aTransId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::HandleWriteExtEntryResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_HANDLEWRITEEXTENTRYRESP, "CMmPhoneBookOperationWrite::HandleWriteExtEntryResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_HANDLEWRITEEXTENTRYRESP_TD, "CMmPhoneBookOperationWrite::HandleWriteExtEntryResp" ); TInt ret ( KErrNone ); if( UICC_STATUS_OK == aStatus ) @@ -1778,7 +1772,7 @@ { TInt ret ( KErrNone ); TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::HandleWriteMBIReadResp"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_HANDLEWRITEMBIREADRESP, "CMmPhoneBookOperationWrite::HandleWriteMBIReadResp" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_HANDLEWRITEMBIREADRESP_TD, "CMmPhoneBookOperationWrite::HandleWriteMBIReadResp" ); if( UICC_STATUS_OK == aStatus ) @@ -1814,7 +1808,7 @@ { TInt ret ( KErrNone ); TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::HandleWriteMBIWriteResp"); -OstTrace0( TRACE_FATAL, CMMPHONEBOOKOPERATIONWRITE_HANDLEWRITEMBIWRITERESP, "CMmPhoneBookOperationWrite::HandleWriteMBIWriteResp" ); +OstTrace0( TRACE_FATAL, CMMPHONEBOOKOPERATIONWRITE_HANDLEWRITEMBIWRITERESP_TD, "CMmPhoneBookOperationWrite::HandleWriteMBIWriteResp" ); if( UICC_STATUS_OK == aStatus ) { @@ -1851,7 +1845,7 @@ void CMmPhoneBookOperationWrite::GetExtRecNum( TUint8 &aExtRecordNo ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::GetExtRecNum"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEMSISDN, "CMmPhoneBookOperationWrite::UiccPbReqWriteMsisdn" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKOPERATIONWRITE_UICCPBREQWRITEMSISDN_TD, "CMmPhoneBookOperationWrite::UiccPbReqWriteMsisdn" ); if( UICC_EF_FDN_NO_EXT_NUM_LEN < iPhoneBookEntry->iNumber->Length() ) @@ -1887,7 +1881,7 @@ TUint8 aTransId ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::CheckForExtRecordNum"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_CHECKFOREXTRECORDNUM, "CMmPhoneBookOperationWrite::CheckForExtRecordNum" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_CHECKFOREXTRECORDNUM_TD, "CMmPhoneBookOperationWrite::CheckForExtRecordNum" ); TInt ret( KErrNone ); @@ -1933,7 +1927,7 @@ CPhoneBookStoreEntry& aDataToWrite ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::ContinueWriteEntry"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_CONTINUEWRITEENTRY, "CMmPhoneBookOperationWrite::ContinueWriteEntry" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_CONTINUEWRITEENTRY_TD, "CMmPhoneBookOperationWrite::ContinueWriteEntry" ); TInt ret( KErrNone ); @@ -1992,7 +1986,7 @@ void CMmPhoneBookOperationWrite::CopyData( const TDesC16& aSource, TDes16& aTarget ) { TFLOGSTRING("TSY: CMmPhoneBookOperationWrite::CopyData"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_COPYDATA, "CMmPhoneBookOperationWrite::CopyData" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONWRITE_COPYDATA_TD, "CMmPhoneBookOperationWrite::CopyData" ); TInt temp ( aSource.Length() ); TInt temp1( aTarget.MaxLength() ); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookstoremesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookstoremesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookstoremesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -89,7 +89,7 @@ TPrimitiveInitInfo::TPrimitiveInitInfo() { TFLOGSTRING("TSY: TPrimitiveInitInfo::TPrimitiveInitInfo"); -OstTrace0( TRACE_NORMAL, TPRIMITIVEINITINFO_TPRIMITIVEINITINFO, "TPrimitiveInitInfo::TPrimitiveInitInfo" ); +OstTrace0( TRACE_NORMAL, TPRIMITIVEINITINFO_TPRIMITIVEINITINFO_TD, "TPrimitiveInitInfo::TPrimitiveInitInfo" ); iNoOfRecords = 0; // 2 byte long @@ -123,7 +123,7 @@ nameLength = endOfAlphaString; } TFLOGSTRING("TSY: TPrimitiveInitInfo::GetPBEntryFromUICCData. Saving name."); -OstTrace0( TRACE_NORMAL, TPRIMITIVEINITINFO_GETPBENTRYFROMUICCDATA, "TPrimitiveInitInfo::GetPBEntryFromUICCData. Saving Name" ); +OstTrace0( TRACE_NORMAL, TPRIMITIVEINITINFO_GETPBENTRYFROMUICCDATA_TD, "TPrimitiveInitInfo::GetPBEntryFromUICCData. Saving Name" ); aName.Copy( aFileData.Mid( 0, nameLength ) ); } // No else. Alpha string length is 0 and it is not copied @@ -140,7 +140,7 @@ if ( KMinLength < numLength ) { TFLOGSTRING("TSY: TPrimitiveInitInfo::GetPBEntryFromUICCData. Saving number."); -OstTrace0( TRACE_NORMAL, DUP1_TPRIMITIVEINITINFO_GETPBENTRYFROMUICCDATA, "TPrimitiveInitInfo::GetPBEntryFromUICCData. Save Number" ); +OstTrace0( TRACE_NORMAL, DUP1_TPRIMITIVEINITINFO_GETPBENTRYFROMUICCDATA_TD, "TPrimitiveInitInfo::GetPBEntryFromUICCData. Save Number" ); // Store number in buffer4 // Start for number @@ -159,7 +159,7 @@ CMmPhoneBookStoreMessHandler::CMmPhoneBookStoreMessHandler() { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::CMmPhoneBookStoreMessHandler."); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_CMMPHONEBOOKSTOREMESSHANDLER, "CMmPhoneBookStoreMessHandler::CMmPhoneBookStoreMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_CMMPHONEBOOKSTOREMESSHANDLER_TD, "CMmPhoneBookStoreMessHandler::CMmPhoneBookStoreMessHandler" ); } // --------------------------------------------------------------------------- @@ -170,7 +170,7 @@ CMmPhoneBookStoreMessHandler::~CMmPhoneBookStoreMessHandler() { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::~CMmPhoneBookStoreMessHandler."); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREMESSHANDLER_CMMPHONEBOOKSTOREMESSHANDLER, "CMmPhoneBookStoreMessHandler::~CMmPhoneBookStoreMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREMESSHANDLER_CMMPHONEBOOKSTOREMESSHANDLER_TD, "CMmPhoneBookStoreMessHandler::~CMmPhoneBookStoreMessHandler" ); // Delete all the entries for( TInt pbCount = 0; pbCount < iPBEntryList.Count(); pbCount++ ) @@ -196,7 +196,7 @@ CMmUiccMessHandler* aUiccMessHandler) //Pointer to the Uicc Message handler { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::NewL."); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_NEWL, "CMmPhoneBookStoreMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_NEWL_TD, "CMmPhoneBookStoreMessHandler::NewL" ); // Create PhoneBookStore messagehandler CMmPhoneBookStoreMessHandler* mmPhoneBookStoreMessHandler = @@ -227,7 +227,7 @@ CMmUiccMessHandler* aUiccMessHandler) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_CONSTRUCTL, "CMmPhoneBookStoreMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_CONSTRUCTL_TD, "CMmPhoneBookStoreMessHandler::ConstructL" ); iOperationlist = CMmPhoneBookStoreOperationList::NewL( this , aUiccMessHandler ); iNumberOfFdnInfoResps = 0; @@ -243,7 +243,7 @@ const CMmDataPackage* aDataPackage ) { TFLOGSTRING2("TSY: CMmPhoneBookStoreMessHandler::ExtFuncL - arrived. IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_EXTFUNCL, "CMmPhoneBookStoreMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_EXTFUNCL_TD, "CMmPhoneBookStoreMessHandler::ExtFuncL;aIpc=%d", aIpc ); TInt ret( KErrNone ); CMmPhoneBookStoreOperationBase* operation( NULL ); @@ -283,7 +283,7 @@ if ( KErrNone != ret) { TFLOGSTRING2("TSY: CMmPhoneBookStoreMessHandler::ExtFuncL;CreateReq returns %d", ret); -OstTrace1( TRACE_NORMAL, DUP11_CMMPHONEBOOKSTOREMESSHANDLER_EXTFUNCL, "CMmPhoneBookStoreMessHandler::ExtFuncL;CreateReq returns %d", ret ); +OstTrace1( TRACE_NORMAL, DUP11_CMMPHONEBOOKSTOREMESSHANDLER_EXTFUNCL_TD, "CMmPhoneBookStoreMessHandler::ExtFuncL;CreateReq returns %d", ret ); iOperationlist->RemoveOperationFromList( transId ); } @@ -291,7 +291,7 @@ else { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::ExtFuncL - Server Busy "); -OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEBOOKSTOREMESSHANDLER_EXTFUNCL, "CMmPhoneBookStoreMessHandler::ExtFuncL - Server Busy " ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEBOOKSTOREMESSHANDLER_EXTFUNCL_TD, "CMmPhoneBookStoreMessHandler::ExtFuncL - Server Busy " ); ret = KErrServerBusy; } @@ -316,7 +316,7 @@ TInt ret(KErrNone); TFLOGSTRING2("TSY: CMmPhoneBookStoreMessHandler::ProcessUiccMsg. transactId:%d", aTraId); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_PROCESSUICCMSG, "CMmPhoneBookStoreMessHandler::ProcessUiccMsg" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_PROCESSUICCMSG_TD, "CMmPhoneBookStoreMessHandler::ProcessUiccMsg" ); if ( ETrIdReadMailboxIdentifier != aTraId ) { @@ -328,7 +328,7 @@ if( operation->HandleUICCPbRespL( aStatus, aDetails, aFileData, aTraId )) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::ProcessUiccMsg. Remove Operation from the list "); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREMESSHANDLER_PROCESSUICCMSG, "CMmPhoneBookStoreMessHandler::ProcessUiccMsg. Remove operation from the list " ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREMESSHANDLER_PROCESSUICCMSG_TD, "CMmPhoneBookStoreMessHandler::ProcessUiccMsg. Remove operation from the list " ); // remove operation From the list iOperationlist->RemoveOperationFromList( aTraId ); @@ -337,7 +337,7 @@ else { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::ProcessUiccMsg. Operation not Found "); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREMESSHANDLER_PROCESSUICCMSG, "CMmPhoneBookStoreMessHandler::ProcessUiccMsg. Operation not found " ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREMESSHANDLER_PROCESSUICCMSG_TD, "CMmPhoneBookStoreMessHandler::ProcessUiccMsg. Operation not found " ); } } else // Mailbox identifiers is special case @@ -360,7 +360,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationList::CreateNewOperation"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_CREATENEWOPERATION, "CMmPhoneBookStoreOperationList::CreateNewOperation" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_CREATENEWOPERATION_TD, "CMmPhoneBookStoreOperationList::CreateNewOperation" ); CMmPhoneBookStoreOperationBase* pointer( NULL ); @@ -514,7 +514,7 @@ { // Nothing to do here TFLOGSTRING2("TSY: CMmPhoneBookStoreMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONLIST_BUILDL, "CMmPhoneBookStoreOperationList::BuildL;Unknown aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONLIST_BUILDL_TD, "CMmPhoneBookStoreOperationList::BuildL;Unknown aIpc=%d", aIpc ); break; } } @@ -542,7 +542,7 @@ // Save Name TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::SeparatePhoneBookEntryFromIsiMsgL. Saving name in commonTSY Array."); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_STOREPHONEBOOKENTRY, "CMmPhoneBookStoreOperationBase::StorePhonebookEntry. Save name to commonTSY Array" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_STOREPHONEBOOKENTRY_TD, "CMmPhoneBookStoreOperationBase::StorePhonebookEntry. Save name to commonTSY Array" ); aEntry.iText = HBufC::NewL( aName.Length() ); @@ -562,7 +562,7 @@ // Store Number TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::SeparatePhoneBookEntryFromIsiMsgL. Saving number in commonTSY Array."); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREOPERATIONBASE_STOREPHONEBOOKENTRY, "CMmPhoneBookStoreOperationBase::StorePhonebookEntry. Save number to commonTSY Array" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREOPERATIONBASE_STOREPHONEBOOKENTRY_TD, "CMmPhoneBookStoreOperationBase::StorePhonebookEntry. Save number to commonTSY Array" ); TInt numLength = aNumber.Length(); if(KMinLength < numLength) @@ -606,7 +606,7 @@ const TUint16 aFileId ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::StoreAnrToPhonebookEntryL."); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_STOREANRTOPHONEBOOKENTRYL, "CMmPhoneBookStoreMessHandler::StoreAnrToPhonebookEntryL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_STOREANRTOPHONEBOOKENTRYL_TD, "CMmPhoneBookStoreMessHandler::StoreAnrToPhonebookEntryL" ); TInt anrLength( aAnr.Length() ); if ( KMaxAnrLength < anrLength ) @@ -635,7 +635,7 @@ TUint8 aFileTypeTag ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::StoreSneToPbEntry."); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_STORESNETOPBENTRY, "CMmPhoneBookStoreMessHandler::StoreSneToPbEntry" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_STORESNETOPBENTRY_TD, "CMmPhoneBookStoreMessHandler::StoreSneToPbEntry" ); if ( aString.Length() ) { @@ -677,7 +677,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::ConvertToUcs2FromBCD"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_CONVERTTOUCS2FROMBCD, "CMmPhoneBookStoreMessHandler::ConvertToUcs2FromBCD" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_CONVERTTOUCS2FROMBCD_TD, "CMmPhoneBookStoreMessHandler::ConvertToUcs2FromBCD" ); TInt maxLength(0); TUint8 data; @@ -844,7 +844,7 @@ TUint16 aFileId ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::ConvertToBCDFromUCS2"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_CONVERTTOBCDFROMUCS2, "CMmPhoneBookStoreMessHandler::ConvertToBCDFromUCS2" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_CONVERTTOBCDFROMUCS2_TD, "CMmPhoneBookStoreMessHandler::ConvertToBCDFromUCS2" ); TInt ret ( KErrNone ); TInt count( 0 ); @@ -914,7 +914,7 @@ TUint16 aFileId ) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::GetBCDCodeforUCS"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_GETBCDCODEFORUCS, "CMmPhoneBookStoreMessHandler::GetBCDCodeforUCS" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_GETBCDCODEFORUCS_TD, "CMmPhoneBookStoreMessHandler::GetBCDCodeforUCS" ); TInt bcdNumber( -1 ); if ( aUCSCharacter >= '0' && aUCSCharacter <='9') @@ -937,7 +937,7 @@ void CMmPhoneBookStoreMessHandler::StoreEntryToPhoneBookList( TPBEntry* aStoreEntry, TUint8 aPBIndex ) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::StoreEntryToPhoenBookList"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_STOREENTRYTOPHOENBOOKLIST, "CMmPhoneBookStoreMessHandler::StoreEntryToPhoenBookList" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_STOREENTRYTOPHOENBOOKLIST_TD, "CMmPhoneBookStoreMessHandler::StoreEntryToPhoenBookList" ); iPBEntryList[aPBIndex].iEntryList.Append( aStoreEntry ); } @@ -952,7 +952,7 @@ TInt aEntryIndex ) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::ResetEntryInPhoneBookList"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_RESETENTRYINPHONEBOOKLIST, "CMmPhoneBookStoreMessHandler::ResetEntryInPhoneBookList" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_RESETENTRYINPHONEBOOKLIST_TD, "CMmPhoneBookStoreMessHandler::ResetEntryInPhoneBookList" ); TInt numOfEntries( iPBEntryList[aPbIndex].iEntryList.Count() ); for( TInt i( 0 ); i < numOfEntries; i++) { @@ -979,7 +979,7 @@ TPBEntry& aEntry ) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::IndexCheckInPBList"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_INDEXCHECKINPBLIST, "CMmPhoneBookStoreMessHandler::IndexCheckInPBList" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_INDEXCHECKINPBLIST_TD, "CMmPhoneBookStoreMessHandler::IndexCheckInPBList" ); TBool entryFound( EFalse ); @@ -1005,7 +1005,7 @@ TUint8 aPBIndex ) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::GetIndexForPresentEntry"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_GETINDEXFORPRESENTENTRY, "CMmPhoneBookStoreMessHandler::GetIndexForPresentEntry" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_GETINDEXFORPRESENTENTRY_TD, "CMmPhoneBookStoreMessHandler::GetIndexForPresentEntry" ); TInt count( -1 ); for( ;( count+1 ) < iPBEntryList[aPBIndex].iEntryList.Count(); count++) @@ -1027,7 +1027,7 @@ TInt CMmPhoneBookStoreMessHandler::EmptyEntryCheckInPBList( TUint8 aPBIndex ) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::EmptyEntryCheckInPBList"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_EMPTYENTRYCHECKINPBLIST, "CMmPhoneBookStoreMessHandler::EmptyEntryCheckInPBList" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_EMPTYENTRYCHECKINPBLIST_TD, "CMmPhoneBookStoreMessHandler::EmptyEntryCheckInPBList" ); TInt entryNumber( 0 ); @@ -1055,7 +1055,7 @@ TUint8 aPBIndex) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::RemoveEntryFromList"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_REMOVEENTRYFROMLIST, "CMmPhoneBookStoreMessHandler::RemoveEntryFromList" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_REMOVEENTRYFROMLIST_TD, "CMmPhoneBookStoreMessHandler::RemoveEntryFromList" ); iPBEntryList[aPBIndex].iEntryList[aIndex] = aEntry; @@ -1072,7 +1072,7 @@ TUint8 aPBIndex) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::RemoveExtEntryFromList"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_REMOVEEXTENTRYFROMLIST, "CMmPhoneBookStoreMessHandler::RemoveExtEntryFromList" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_REMOVEEXTENTRYFROMLIST_TD, "CMmPhoneBookStoreMessHandler::RemoveExtEntryFromList" ); TInt count = iPBEntryList[aPBIndex].iEntryList[aIndex]->PBEntryExtRecord.Count(); if( 0 < count ) @@ -1091,7 +1091,7 @@ CMmMessageRouter* CMmPhoneBookStoreMessHandler::MessageRouter() { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::MessageRouter"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_MESSAGEROUTER, "CMmPhoneBookStoreMessHandler::MessageRouter" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_MESSAGEROUTER_TD, "CMmPhoneBookStoreMessHandler::MessageRouter" ); return iMessageRouter; } @@ -1106,7 +1106,7 @@ CMmUiccMessHandler* CMmPhoneBookStoreMessHandler::UiccMessHandler() { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::UiccMessHandler"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_UICCMESSHANDLER, "CMmPhoneBookStoreMessHandler::UiccMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_UICCMESSHANDLER_TD, "CMmPhoneBookStoreMessHandler::UiccMessHandler" ); return iMmUiccMessHandler; } @@ -1120,7 +1120,7 @@ CMmPhoNetSender* CMmPhoneBookStoreMessHandler::PhoNetSender() { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::PhoNetSender"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_PHONETSENDER, "CMmPhoneBookStoreMessHandler::PhoNetSender" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_PHONETSENDER_TD, "CMmPhoneBookStoreMessHandler::PhoNetSender" ); return iPhoNetSender; } @@ -1135,7 +1135,7 @@ TUint8 aRecordNo ) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::FindEntryFromPbList"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_FINDENTRYFROMPBLIST, "CMmPhoneBookStoreMessHandler::FindEntryFromPbList" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_FINDENTRYFROMPBLIST_TD, "CMmPhoneBookStoreMessHandler::FindEntryFromPbList" ); TPBEntry* ret( NULL ); @@ -1162,7 +1162,7 @@ RArray& aArray ) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::GetEntryForType2FileId"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_GETENTRYFORTYPE2FILEID, "CMmPhoneBookStoreMessHandler::GetEntryForType2FileId" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_GETENTRYFORTYPE2FILEID_TD, "CMmPhoneBookStoreMessHandler::GetEntryForType2FileId" ); TInt numOfEntries( iPBEntryList[EPhonebookTypeAdn].iEntryList.Count() ); // Loop all entries that have been created @@ -1195,7 +1195,7 @@ TInt CMmPhoneBookStoreMessHandler::GetMailboxIdentifiers() { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::GetMailboxIdentifiers"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_GETMAILBOXNUMBERS, "CMmPhoneBookStoreMessHandler::GetMailboxIdentifiers" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_GETMAILBOXNUMBERS_TD, "CMmPhoneBookStoreMessHandler::GetMailboxIdentifiers" ); // Set parameters for UICC_APPL_CMD_REQ message TUiccReadLinearFixed params; params.messHandlerPtr = static_cast( this ); @@ -1227,7 +1227,7 @@ const TDesC8 &aFileData ) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::HandleGetMailboxIdentifiers"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_HANDLEGETMAILBOXIDENTIFIERS, "CMmPhoneBookStoreMessHandler::HandleGetMailboxIdentifiers" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_HANDLEGETMAILBOXIDENTIFIERS_TD, "CMmPhoneBookStoreMessHandler::HandleGetMailboxIdentifiers" ); RMobilePhone::TMobilePhoneVoicemailIdsV3* voicemailIds( new ( ELeave ) RMobilePhone::TMobilePhoneVoicemailIdsV3() ); @@ -1271,7 +1271,7 @@ TUint8 &aPBRRecNum ) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::GetPBRRecordNum"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_GETPBRRECORDNUM, "CMmPhoneBookStoreMessHandler::GetPBRRecordNum" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_GETPBRRECORDNUM_TD, "CMmPhoneBookStoreMessHandler::GetPBRRecordNum" ); TInt ret( KErrNone ); @@ -1315,7 +1315,7 @@ TInt aIndexToRead ) { TFLOGSTRING("TSY: CMmPhoneBookStoreMessHandler::GetCurrentEfRecNum"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_GETCURRENTEFRECNUM, "CMmPhoneBookStoreMessHandler::GetCurrentEfRecNum" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREMESSHANDLER_GETCURRENTEFRECNUM_TD, "CMmPhoneBookStoreMessHandler::GetCurrentEfRecNum" ); TInt ret( KErrNone ); // get ADN anf PBR Max no of records diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookstoreoperationbase.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookstoreoperationbase.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookstoreoperationbase.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -65,7 +65,7 @@ CMmPhoneBookStoreOperationBase::CMmPhoneBookStoreOperationBase() { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::CMmPhoneBookStoreOperationBase"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_CMMPHONEBOOKSTOREOPERATIONBASE, "CMmPhoneBookStoreOperationBase::CMmPhoneBookStoreOperationBase" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_CMMPHONEBOOKSTOREOPERATIONBASE_TD, "CMmPhoneBookStoreOperationBase::CMmPhoneBookStoreOperationBase" ); iRet = KErrNone; iWriteLocation = 0; @@ -82,7 +82,7 @@ CMmPhoneBookStoreOperationBase::~CMmPhoneBookStoreOperationBase() { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::~CMmPhoneBookStoreOperationBase"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREOPERATIONBASE_CMMPHONEBOOKSTOREOPERATIONBASE, "CMmPhoneBookStoreOperationBase::~CMmPhoneBookStoreOperationBase" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREOPERATIONBASE_CMMPHONEBOOKSTOREOPERATIONBASE_TD, "CMmPhoneBookStoreOperationBase::~CMmPhoneBookStoreOperationBase" ); } // --------------------------------------------------------------------------- @@ -93,7 +93,7 @@ void CMmPhoneBookStoreOperationBase::CancelReq( TName& /*aPhoneBook*/ ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::CancelReq - does nothing"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONBASE_CANCELREQ, "CMmPhoneBookStoreOperationBase::CancelReq - does nothing" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONBASE_CANCELREQ_TD, "CMmPhoneBookStoreOperationBase::CancelReq - does nothing" ); } // --------------------------------------------------------------------------- @@ -104,7 +104,7 @@ TInt CMmPhoneBookStoreOperationBase::CompleteReq( TInt /*aErrorCode*/ ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::CompleteReq - not supported"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONBASE_COMPLETEREQ, "CMmPhoneBookStoreOperationBase::CompleteReq - not supported" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONBASE_COMPLETEREQ_TD, "CMmPhoneBookStoreOperationBase::CompleteReq - not supported" ); return KErrNotSupported; } @@ -117,7 +117,7 @@ const TName& CMmPhoneBookStoreOperationBase::GetPhoneBookName()const { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::GetPhoneBookName - PhoenbookName"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_GETPHONEBOOKNAME, "CMmPhoneBookStoreOperationBase::GetPhoneBookName - PhoneBookName" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_GETPHONEBOOKNAME_TD, "CMmPhoneBookStoreOperationBase::GetPhoneBookName - PhoneBookName" ); return iPhoneBookTypeName; } @@ -132,7 +132,7 @@ const TUint8 aPbMask ) { TFLOGSTRING2("TSY: CMmPhoneBookStoreOperationBase::ConvertToSimPhoneBookType SourcePBType: 0x%x", aPbMask); -OstTraceExt1( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOSIMPHONEBOOKTYPE, "CMmPhoneBookStoreOperationBase::ConvertToSimPhoneBookType;aPbMask=%hhx", aPbMask ); +OstTraceExt1( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOSIMPHONEBOOKTYPE_TD, "CMmPhoneBookStoreOperationBase::ConvertToSimPhoneBookType;aPbMask=%hhx", aPbMask ); TUint16 phoneBookType( KMaskUnspecifiedType ); @@ -170,13 +170,13 @@ } default: { -OstTrace1( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOSIMPHONEBOOKTYPE, "CMmPhoneBookStoreOperationBase::ConvertToSimPhoneBookType;ASSERT phoneBookType (%d) != KMaskUnspecifiedType", phoneBookType ); +OstTrace1( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOSIMPHONEBOOKTYPE_TD, "CMmPhoneBookStoreOperationBase::ConvertToSimPhoneBookType;ASSERT phoneBookType (%d) != KMaskUnspecifiedType", phoneBookType ); TF_ASSERT( phoneBookType != KMaskUnspecifiedType ); break; } } TFLOGSTRING2("TSY: CMmPhoneBookStoreOperationBase::ConvertToSimPhoneBookType phoneBookType: 0x%x" ,phoneBookType ); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOSIMPHONEBOOKTYPE, "CMmPhoneBookStoreOperationBase::ConvertToSimPhoneBookType;phoneBookType=%x", phoneBookType ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOSIMPHONEBOOKTYPE_TD, "CMmPhoneBookStoreOperationBase::ConvertToSimPhoneBookType;phoneBookType=%x", phoneBookType ); return phoneBookType; } @@ -221,7 +221,7 @@ const TName& aPBType ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::ConvertToPBtype"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBTYPE, "CMmPhoneBookStoreOperationBase::ConvertToPBtype" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBTYPE_TD, "CMmPhoneBookStoreOperationBase::ConvertToPBtype" ); TUint8 pbMask( 0 ); @@ -255,7 +255,7 @@ } TFLOGSTRING2("TSY: CMmPhoneBookStoreOperationBase::ConvertToPBtype : phonebooktype: %d", pbMask); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBTYPE, "CMmPhoneBookStoreOperationBase::ConvertToPBtype;pbMask=%hhx", pbMask ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBTYPE_TD, "CMmPhoneBookStoreOperationBase::ConvertToPBtype;pbMask=%hhx", pbMask ); return pbMask; } @@ -270,7 +270,7 @@ const TName& aPBType, TUint16 &aFileIdExt, TUint8 aCardType ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::ConvertToPBfileId"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBFILEID, "CMmPhoneBookStoreOperationBase::ConvertToPBfileId" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBFILEID_TD, "CMmPhoneBookStoreOperationBase::ConvertToPBfileId" ); TUint16 fileId( 0 ); @@ -322,7 +322,7 @@ fileId = UICC_ILLEGAL_FILE_ID; } TFLOGSTRING2("TSY: CMmPhoneBookStoreOperationBase::ConvertToPBfileId phonebookfileid: %d", fileId); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBFILEID, "CMmPhoneBookStoreOperationBase::ConvertToPBfileId;fileId=%hu", fileId ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBFILEID_TD, "CMmPhoneBookStoreOperationBase::ConvertToPBfileId;fileId=%hu", fileId ); return fileId; @@ -339,7 +339,7 @@ const TUint16 aFileId ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::ConvertToConfArrayIndex"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOCONFARRAYINDEX, "CMmPhoneBookStoreOperationBase::ConvertToConfArrayIndex" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOCONFARRAYINDEX_TD, "CMmPhoneBookStoreOperationBase::ConvertToConfArrayIndex" ); TUint8 index( 0 ); switch(aFileId) { @@ -375,7 +375,7 @@ TName& aName ) { TFLOGSTRING2("TSY: CMmPhoneBookStoreOperationBase::ConvertToPBname : source: %d" ,aTrans ); -OstTraceExt1( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME, "CMmPhoneBookStoreOperationBase::ConvertToPBname;source=%hhu", aTrans ); +OstTraceExt1( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME_TD, "CMmPhoneBookStoreOperationBase::ConvertToPBname;source=%hhu", aTrans ); // get number of phonebook type from transaction Id TUint8 numOfPbType( aTrans & KMaskPhonebookType ); @@ -383,43 +383,43 @@ if ( KMaskAdnType == numOfPbType ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::ConvertToPBname - ADN"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME, "CMmPhoneBookStoreOperationBase::ConvertToPBname - ADN" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME_TD, "CMmPhoneBookStoreOperationBase::ConvertToPBname - ADN" ); aName = KETelIccAdnPhoneBook; } else if ( KMaskFdnType == numOfPbType ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::ConvertToPBname - FDN"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME, "CMmPhoneBookStoreOperationBase::ConvertToPBname - FDN" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME_TD, "CMmPhoneBookStoreOperationBase::ConvertToPBname - FDN" ); aName = KETelIccFdnPhoneBook; } else if ( KMaskSdnType == numOfPbType ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::ConvertToPBname - SDN"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME, "CMmPhoneBookStoreOperationBase::ConvertToPBname - SDN" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME_TD, "CMmPhoneBookStoreOperationBase::ConvertToPBname - SDN" ); aName = KETelIccSdnPhoneBook; } else if ( KMaskBdnType == numOfPbType ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::ConvertToPBname - BDN"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME, "CMmPhoneBookStoreOperationBase::ConvertToPBname - BDN" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME_TD, "CMmPhoneBookStoreOperationBase::ConvertToPBname - BDN" ); aName = KETelIccBdnPhoneBook; } else if ( KMaskVoiceMailBox == numOfPbType ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::ConvertToPBname - VMBX"); -OstTrace0( TRACE_NORMAL, DUP5_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME, "CMmPhoneBookStoreOperationBase::ConvertToPBname - VMBX" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME_TD, "CMmPhoneBookStoreOperationBase::ConvertToPBname - VMBX" ); aName = KETelIccVoiceMailBox; } else if ( KMaskMbdnType == numOfPbType ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::ConvertToPBname - MBDN"); -OstTrace0( TRACE_NORMAL, DUP6_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME, "CMmPhoneBookStoreOperationBase::ConvertToPBname - MBDN" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME_TD, "CMmPhoneBookStoreOperationBase::ConvertToPBname - MBDN" ); aName = KETelIccMbdnPhoneBook; } else { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::ConvertToPBname - unknown -> Error situation!" ); -OstTrace0( TRACE_NORMAL, DUP7_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME, "CMmPhoneBookStoreOperationBase::ConvertToPBname - unknown -> Error situation!" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMPHONEBOOKSTOREOPERATIONBASE_CONVERTTOPBNAME_TD, "CMmPhoneBookStoreOperationBase::ConvertToPBname - unknown -> Error situation!" ); //Nothing can do. } } @@ -433,7 +433,7 @@ TInt CMmPhoneBookStoreOperationBase::EmptyEntryCheck( const TDesC8 &aFileData) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationBase::EmptyEntryCheck"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_EMPTYENTRYCHECK, "CMmPhoneBookStoreOperationBase::EmptyEntryCheck" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKOPERATIONREAD_EMPTYENTRYCHECK_TD, "CMmPhoneBookStoreOperationBase::EmptyEntryCheck" ); TInt ret( KErrNone); @@ -457,7 +457,7 @@ RArray & aFileList ) { TFLOGSTRING( "TSY: CMmPhoneBookStoreOperationBase::FetchFileListFromPBR" ); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_FETCHFILELISTFROMPBR, "CMmPhoneBookStoreOperationBase::FetchFileListFromPBR" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONBASE_FETCHFILELISTFROMPBR_TD, "CMmPhoneBookStoreOperationBase::FetchFileListFromPBR" ); TInt ret( KErrNone ); TPrimitiveTag primTag; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookstoreoperationlist.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookstoreoperationlist.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonebookstoreoperationlist.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -75,7 +75,7 @@ { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationList::\ CMmPhoneBookStoreOperationList"); - OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_CMMPHONEBOOKSTOREOPERATIONLIST, "CMmPhoneBookStoreOperationList::CMmPhoneBookStoreOperationList" ); + OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_CMMPHONEBOOKSTOREOPERATIONLIST_TD, "CMmPhoneBookStoreOperationList::CMmPhoneBookStoreOperationList" ); } // --------------------------------------------------------------------------- @@ -87,7 +87,7 @@ { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationList::\ ~CMmPhoneBookStoreOperationList"); - OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREOPERATIONLIST_CMMPHONEBOOKSTOREOPERATIONLIST, "CMmPhoneBookStoreOperationList::~CMmPhoneBookStoreOperationList" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREOPERATIONLIST_CMMPHONEBOOKSTOREOPERATIONLIST_TD, "CMmPhoneBookStoreOperationList::~CMmPhoneBookStoreOperationList" ); iPtrOperationArrayNew.DeleteAll(); // resets all elements to @@ -107,7 +107,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationList::NewL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_NEWL, "CMmPhoneBookStoreOperationList::NewL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_NEWL_TD, "CMmPhoneBookStoreOperationList::NewL" ); CMmPhoneBookStoreOperationList* mmPhoneBookOperationList = new( ELeave ) CMmPhoneBookStoreOperationList(); @@ -128,7 +128,7 @@ void CMmPhoneBookStoreOperationList::ConstructL() { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationList::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_CONSTRUCTL, "CMmPhoneBookStoreOperationList::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_CONSTRUCTL_TD, "CMmPhoneBookStoreOperationList::ConstructL" ); } @@ -142,7 +142,7 @@ CMmPhoneBookStoreOperationBase* aOperation ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationList::AddOperation"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_ADDOPERATION, "CMmPhoneBookStoreOperationList::AddOperation" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_ADDOPERATION_TD, "CMmPhoneBookStoreOperationList::AddOperation" ); if( (( aTrans - ETrIdPbOperationStart ) >= 0)&& ((aTrans - ETrIdPbOperationStart) < KMaxPbTrIdCount )) { @@ -160,7 +160,7 @@ TUint8 aTrans ) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationList::Find"); -OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_FIND, "CMmPhoneBookStoreOperationList::Find" ); +OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_FIND_TD, "CMmPhoneBookStoreOperationList::Find" ); CMmPhoneBookStoreOperationBase* basePointer( NULL ); //transaction id is basically just an index to operation array + start offset @@ -184,7 +184,7 @@ TUint8 aTrans ) // transactionId { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationList::RemoveOperationFromList"); - OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREOPERATIONLIST_REMOVEOPERATIONFROMLIST, "CMmPhoneBookStoreOperationList::RemoveOperationFromList" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEBOOKSTOREOPERATIONLIST_REMOVEOPERATIONFROMLIST_TD, "CMmPhoneBookStoreOperationList::RemoveOperationFromList" ); delete iPtrOperationArrayNew[aTrans - ETrIdPbOperationStart]; @@ -205,7 +205,7 @@ TInt CMmPhoneBookStoreOperationList::FindEmptyIndexTransId() { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationList::FindEmptyIndexTransId"); - OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_FINDEMPTYINDEXTRANSID, "CMmPhoneBookStoreOperationList::FindEmptyIndexTransId" ); + OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_FINDEMPTYINDEXTRANSID_TD, "CMmPhoneBookStoreOperationList::FindEmptyIndexTransId" ); TInt transId = -1; for( TInt count = 0 ; count < KMaxPbTrIdCount ; count++) @@ -228,7 +228,7 @@ void CMmPhoneBookStoreOperationList::CancelOperation( TName &aPhoneBook) { TFLOGSTRING("TSY: CMmPhoneBookStoreOperationList::CancelOperation"); - OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_CANCELOPERATION, "CMmPhoneBookStoreOperationList::CancelOperation" ); + OstTrace0( TRACE_NORMAL, CMMPHONEBOOKSTOREOPERATIONLIST_CANCELOPERATION_TD, "CMmPhoneBookStoreOperationList::CancelOperation" ); // Chekc for all operation which have the same phonebook name for( TInt count = 0 ; count < KMaxPbTrIdCount ; count++) diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmphonemesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonemesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonemesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -48,6 +48,7 @@ #include #include #include +#include #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE @@ -127,7 +128,7 @@ CMmPhoneMessHandler::CMmPhoneMessHandler() { TFLOGSTRING("TSY: CMmPhoneMessHandler constructed."); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_CMMPHONEMESSHANDLER, "CMmPhoneMessHandler::CMmPhoneMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_CMMPHONEMESSHANDLER_TD, "CMmPhoneMessHandler::CMmPhoneMessHandler" ); iACLIsProgress = EFalse; iAPNList = NULL; @@ -149,7 +150,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::NewL"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_NEWL, "CMmPhoneMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_NEWL_TD, "CMmPhoneMessHandler::NewL" ); CMmPhoneMessHandler* phoneMessHandler = new ( ELeave ) CMmPhoneMessHandler(); @@ -200,7 +201,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_CONSTRUCTL, "CMmPhoneMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_CONSTRUCTL_TD, "CMmPhoneMessHandler::ConstructL" ); iPhoNetSender = aPhoNetSender; iSupplServMessHandler = aSupplServMessHandler; @@ -228,7 +229,7 @@ CMmPhoneMessHandler::~CMmPhoneMessHandler() { TFLOGSTRING("TSY: CMmPhoneMessHandler destructed."); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_CMMPHONEMESSHANDLER, "CMmPhoneMessHandler::~CMmPhoneMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_CMMPHONEMESSHANDLER_TD, "CMmPhoneMessHandler::~CMmPhoneMessHandler" ); if( iStoreInfo ) { @@ -256,7 +257,7 @@ TInt CMmPhoneMessHandler::SubscribeEventsFromPhoNet() { TFLOGSTRING("TSY: CMmPhoneMessHandler::SubscribeEventsFromPhoNet"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_SUBSCRIBEEVENTSFROMPHONET, "CMmPhoneMessHandler::SubscribeEventsFromPhoNet" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_SUBSCRIBEEVENTSFROMPHONET_TD, "CMmPhoneMessHandler::SubscribeEventsFromPhoNet" ); // Cross check requests with PhonetReceiver TUint8 requestArray[] = { @@ -310,11 +311,15 @@ PN_SMS, SMS_RESOURCE_IND, // used only in SimAtkTSY PN_SMS, SMS_RECEIVED_MSG_IND, PN_SMS, SMS_CB_ROUTING_IND, + PN_SMS, SMS_CB_SIM_ROUTING_IND, // used only in SimAtkTSY + PN_SMS, SMS_RESOURCE_CONF_IND, // UICC SERVER INDICATIONS PN_UICC, UICC_CARD_IND, PN_UICC, UICC_IND, PN_UICC, UICC_REFRESH_IND, + PN_UICC, UICC_CAT_IND, + PN_UICC, UICC_APDU_RESET_IND, #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING // MTC SERVER INDICATIONS @@ -349,6 +354,9 @@ // GSS SERVER INDICATIONS PN_GSS, GSS_HSXPA_USER_SETTING_IND, + // NAME SERVICE INDICATIONS + PN_NAMESERVICE, PNS_NAME_ADD_IND, + PN_NAMESERVICE, PNS_NAME_REMOVE_IND, }; TInt ret = iPhoNetSender->SubscribeEvents( @@ -371,7 +379,7 @@ ) { TFLOGSTRING2("TSY: CMmPhoneMessHandler::ExtFuncL. Licensee specific implemtantion. IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, CMMPHONEMESSHANDLER_EXTFUNCL, "CMmPhoneMessHandler::ExtFuncL;Licensee specific implemtantion aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMPHONEMESSHANDLER_EXTFUNCL_TD, "CMmPhoneMessHandler::ExtFuncL;Licensee specific implemtantion aIpc=%d", aIpc ); TInt ret( KErrNone ); TUint8 transId( KPhoneTransId ); @@ -429,13 +437,13 @@ if ( ! readError ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::ExtFuncL: commontsy refresh successfully completed ==> REFRESH_DONE"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_EXTFUNCL, "CMmPhoneMessHandler::ExtFuncL: commontsy refresh successfully completed ==> REFRESH_DONE" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_EXTFUNCL_TD, "CMmPhoneMessHandler::ExtFuncL: commontsy refresh successfully completed ==> REFRESH_DONE" ); ret = UiccRefreshReq( UICC_REFRESH_DONE ); } else { TFLOGSTRING("TSY: CMmPhoneMessHandler::ExtFuncL: commontsy refresh completed with an error ==> REFRESH_DONE"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEMESSHANDLER_EXTFUNCL, "CMmPhoneMessHandler::ExtFuncL: commontsy refresh completed with an error ==> REFRESH_DONE" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEMESSHANDLER_EXTFUNCL_TD, "CMmPhoneMessHandler::ExtFuncL: commontsy refresh completed with an error ==> REFRESH_DONE" ); ret = UiccRefreshReq( UICC_REFRESH_NOT_OK ); } break; @@ -565,7 +573,7 @@ default: { TFLOGSTRING2("TSY: CMmPhoneMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP7_CMMPHONEMESSHANDLER_EXTFUNCL, "CMmPhoneMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP7_CMMPHONEMESSHANDLER_EXTFUNCL_TD, "CMmPhoneMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc ); ret = KErrNotSupported; break; } @@ -589,7 +597,7 @@ TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); TFLOGSTRING3("TSY: CMmPhoneMessHandler::ReceiveMessageL, Resource: %d, Message: %d", resource, messageId ); -OstTraceExt2( TRACE_NORMAL, CMMPHONEMESSHANDLER_RECEIVEMESSAGEL, "CMmPhoneMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); +OstTraceExt2( TRACE_NORMAL, CMMPHONEMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPhoneMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); switch( resource ) { @@ -606,7 +614,7 @@ else { TFLOGSTRING("TSY: CMmPhoneMessHandler::ReceiveMessageL, switch resource - case PN_MODEM_INFO, switch messageId - default.\n" ); -OstTrace0( TRACE_NORMAL, DUP4_CMMPHONEMESSHANDLER_RECEIVEMESSAGEL, "CMmPhoneMessHandler::ReceiveMessageL, switch resource - case PN_MODEM_INFO, switch messageId - default" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPHONEMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPhoneMessHandler::ReceiveMessageL, switch resource - case PN_MODEM_INFO, switch messageId - default" ); } break; // end case PN_MODEM_INFO } @@ -626,7 +634,7 @@ default: { TFLOGSTRING("TSY: CMmPhoneMessHandler::ReceiveMessageL, switch resource - default.\n" ); -OstTrace0( TRACE_NORMAL, DUP5_CMMPHONEMESSHANDLER_RECEIVEMESSAGEL, "CMmPhoneMessHandler::ReceiveMessageL, switch resource - default" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMPHONEMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPhoneMessHandler::ReceiveMessageL, switch resource - default" ); break; } } // End of switch @@ -645,7 +653,7 @@ ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::InfoSerialNumberReadReq."); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_INFOSERIALNUMBERREADREQ, "CMmPhoneMessHandler::InfoSerialNumberReadReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_INFOSERIALNUMBERREADREQ_TD, "CMmPhoneMessHandler::InfoSerialNumberReadReq" ); TBuf8<1> data; data.Append( aTarget ); // Target identifier ( INFO_SN_IMEI_PLAIN ) @@ -679,7 +687,7 @@ ISI_HEADER_SIZE + INFO_SERIAL_NUMBER_READ_RESP_OFFSET_STATUS ) ); TFLOGSTRING2("TSY: CMmPhoneMessHandler::InfoSerialNumberReadResp, status=0x%02x",status); -OstTraceExt1( TRACE_NORMAL, CMMPHONEMESSHANDLER_INFOSERIALNUMBERREADRESP, "CMmPhoneMessHandler::InfoSerialNumberReadResp;status=%hhx", status ); +OstTraceExt1( TRACE_NORMAL, CMMPHONEMESSHANDLER_INFOSERIALNUMBERREADRESP_TD, "CMmPhoneMessHandler::InfoSerialNumberReadResp;status=%hhx", status ); // Get information from possible sub block(s). if ( INFO_OK == status ) @@ -731,7 +739,7 @@ TInt CMmPhoneMessHandler::UiccReadDynamicFlagsReq() { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadDynamicFlagsReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADDYNAMICFLAGSREQ, "CMmPhoneMessHandler::UiccReadDynamicFlagsReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADDYNAMICFLAGSREQ_TD, "CMmPhoneMessHandler::UiccReadDynamicFlagsReq" ); return UiccApplCmdReq( ETrIdReadDynamicFlags, @@ -750,7 +758,7 @@ TInt CMmPhoneMessHandler::UiccWriteDynamicFlagsReq( TUint8 aInfo ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccWriteDynamicFlagsReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCWRITEDYNAMICFLAGSREQ, "CMmPhoneMessHandler::UiccWriteDynamicFlagsReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCWRITEDYNAMICFLAGSREQ_TD, "CMmPhoneMessHandler::UiccWriteDynamicFlagsReq" ); TInt ret( KErrNone ); TUint8 line( 0 ); @@ -799,7 +807,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadDynamicFlagsResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADDYNAMICFLAGSRESP, "CMmPhoneMessHandler::UiccReadDynamicFlagsResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADDYNAMICFLAGSRESP_TD, "CMmPhoneMessHandler::UiccReadDynamicFlagsResp" ); RMobilePhone::TMobilePhoneALSLine alsLine ( RMobilePhone::EAlternateLineUnknown ); @@ -836,7 +844,7 @@ void CMmPhoneMessHandler::UiccWriteDynamicFlagsResp( TInt aStatus ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccWriteDynamicFlagsResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCWRITEDYNAMICFLAGSRESP, "CMmPhoneMessHandler::UiccWriteDynamicFlagsResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCWRITEDYNAMICFLAGSRESP_TD, "CMmPhoneMessHandler::UiccWriteDynamicFlagsResp" ); if ( UICC_STATUS_OK == aStatus ) { @@ -856,7 +864,7 @@ TInt CMmPhoneMessHandler::UiccCspFileReq() { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccCspFileReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCCSPFILEREQ, "CMmPhoneMessHandler::UiccCspFileReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCCSPFILEREQ_TD, "CMmPhoneMessHandler::UiccCspFileReq" ); return UiccApplCmdReq( ETrIdReadCsp, @@ -876,11 +884,12 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccHandleCallFwdFlagsResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCCSPFILERESP, "CMmPhoneMessHandler::UiccCspFileResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCCSPFILERESP_TD, "CMmPhoneMessHandler::UiccCspFileResp" ); RMobilePhone::TMobilePhoneCspFileV1 cspFileEtel; - if ( aStatus == KErrNone && ( KCpsLength <= aFileData.Length() ) ) + if ( ( aStatus == UICC_STATUS_OK ) && + ( KCpsLength <= aFileData.Length() ) ) { TUint8 i( 0 ); // Call offering capabilities @@ -959,7 +968,7 @@ TInt CMmPhoneMessHandler::UiccImsiReq( ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccImsiReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCIMSIREQ, "CMmPhoneMessHandler::UiccImsiReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCIMSIREQ_TD, "CMmPhoneMessHandler::UiccImsiReq" ); return UiccApplCmdReq( ETrIdReadImsi, @@ -978,7 +987,7 @@ void CMmPhoneMessHandler::UiccImsiResp( TInt aStatus, const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccImsiResp" ); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCIMSIRESP, "CMmPhoneMessHandler::UiccImsiResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCIMSIRESP_TD, "CMmPhoneMessHandler::UiccImsiResp" ); TInt err( KErrNone ); TBuf8 imsiData; @@ -989,7 +998,7 @@ // 1st digit of the buffer is byte count (see 3GPP TS 51.011 // 10.3.2 EFIMSI (IMSI)). Get first IMSI number from second byte higher // nibbles. Lower part has parity information and it is ignored. - imsiData.AppendNum( + imsiData.AppendNum( ( ( aFileData[KFirstImsiDigit]>> KNibbleShift )&KNibbleMask ), EDecimal ); @@ -1009,7 +1018,7 @@ } if ( KUnusedNibble != ( ( aFileData[i]>>KNibbleShift )&KNibbleMask ) ) { - imsiData.AppendNum( + imsiData.AppendNum( ( ( aFileData[i]>>KNibbleShift )&KNibbleMask ), EDecimal ); } @@ -1043,7 +1052,7 @@ TInt CMmPhoneMessHandler::UiccReadServiceProviderName() { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadServiceProviderName"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADSERVICEPROVIDERNAME, "CMmPhoneMessHandler::UiccReadServiceProviderName" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADSERVICEPROVIDERNAME_TD, "CMmPhoneMessHandler::UiccReadServiceProviderName" ); return UiccApplCmdReq( ETrIdReadServiceProviderName, @@ -1064,16 +1073,17 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadServiceProviderNameResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADSERVICEPROVIDERNAMERESP, "CMmPhoneMessHandler::UiccReadServiceProviderNameResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADSERVICEPROVIDERNAMERESP_TD, "CMmPhoneMessHandler::UiccReadServiceProviderNameResp" ); TInt ret( KErrNotFound ); - if ( KErrNone == aStatus && ( KSpnLength == aFileData.Length() ) ) + if ( ( UICC_STATUS_OK == aStatus ) && + ( KSpnLength == aFileData.Length() ) ) { // Store data and read SPN display info ret = UiccProcessServiceTypeCheck( aFileData ); } - if ( KErrNone != aStatus || KErrNone != ret ) + if ( ( UICC_STATUS_OK != aStatus ) || ( KErrNone != ret ) ) { // Complete error without data iMessageRouter->Complete( @@ -1094,7 +1104,7 @@ const TDesC8& aFileData ) { TFLOGSTRING3("TSY: CMmPhoneMessHandler::ProcessUiccMsg, transaction ID: %d, status %d", aTraId, aStatus ); -OstTraceExt2( TRACE_NORMAL, CMMPHONEMESSHANDLER_PROCESSUICCMSG, "CMmPhoneMessHandler::ProcessUiccMsg;aTraId=%d;aStatus=%d", aTraId, aStatus ); +OstTraceExt2( TRACE_NORMAL, CMMPHONEMESSHANDLER_PROCESSUICCMSG_TD, "CMmPhoneMessHandler::ProcessUiccMsg;aTraId=%d;aStatus=%d", aTraId, aStatus ); switch( aTraId ) { @@ -1157,7 +1167,7 @@ default: { TFLOGSTRING("TSY: CMmPhoneMessHandler::ProcessUiccMsg - unknown transaction ID" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_PROCESSUICCMSG, "CMmPhoneMessHandler::ProcessUiccMsg - unknown transaction ID" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_PROCESSUICCMSG_TD, "CMmPhoneMessHandler::ProcessUiccMsg - unknown transaction ID" ); break; } } @@ -1173,7 +1183,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccProcessServiceTypeCheck"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCPROCESSSERVICETYPECHECK, "CMmPhoneMessHandler::UiccProcessServiceTypeCheck" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCPROCESSSERVICETYPECHECK_TD, "CMmPhoneMessHandler::UiccProcessServiceTypeCheck" ); TBuf8 spnBuffer( aFileData.Mid( 1 ) ); TBuf8 spnOutputBuffer; @@ -1242,12 +1252,12 @@ const TDesC8& aFileData) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccProcessSpnNameInfo"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCPROCESSSPNNAMEINFO, "CMmPhoneMessHandler::UiccProcessSpnNameInfo" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCPROCESSSPNNAMEINFO_TD, "CMmPhoneMessHandler::UiccProcessSpnNameInfo" ); TInt numOfPlmns( 0 ); TInt lengthOfDataInBytes( 0 ); TInt i( 0 ); // Index used of data extracting - if ( KErrNone == aStatus ) + if ( UICC_STATUS_OK == aStatus ) { TInt lengthOfLengthInBytes( 0 ); @@ -1305,7 +1315,7 @@ } // Copy PLMNs and complete - if ( KErrNone == aStatus ) + if ( UICC_STATUS_OK == aStatus ) { if ( 170 < numOfPlmns ) { @@ -1354,7 +1364,7 @@ void CMmPhoneMessHandler::UiccRefreshInd( const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccRefreshInd"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREFRESHIND, "CMmPhoneMessHandler::UiccRefreshInd" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREFRESHIND_TD, "CMmPhoneMessHandler::UiccRefreshInd" ); TUint8 serviceType( aIsiMessage.Get8bit( ISI_HEADER_SIZE + UICC_REFRESH_IND_OFFSET_SERVICETYPE ) ); if ( UICC_REFRESH_PERMISSION == serviceType ) @@ -1375,7 +1385,7 @@ void CMmPhoneMessHandler::UiccRefreshResp( const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccRefreshResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREFRESHRESP, "CMmPhoneMessHandler::UiccRefreshResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREFRESHRESP_TD, "CMmPhoneMessHandler::UiccRefreshResp" ); if ( iCompleteRefresfDone ) { TUint8 status( aIsiMessage.Get8bit( @@ -1398,7 +1408,7 @@ TInt CMmPhoneMessHandler::UiccRefreshReq( TUint8 aStatus ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccRefreshReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREFRESHREQ, "CMmPhoneMessHandler::UiccRefreshReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREFRESHREQ_TD, "CMmPhoneMessHandler::UiccRefreshReq" ); TInt ret( KErrNone ); // If there was error in cacheing some file, set internal flag @@ -1451,7 +1461,7 @@ void CMmPhoneMessHandler::HandleUiccRefresh( const TIsiReceiveC &aIsiMessage ) { TFLOGSTRING("TSY:CMmPhoneMessHandler::HandleUiccRefresh" ); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh" ); TUint16 refreshFiles( 0 ); TBool enabledServicesChanged( EFalse ); @@ -1477,21 +1487,21 @@ case KElemFileSmsParams: // 6F42, SMS parameters { TFLOGSTRING("TSY:CMmPhoneMessHandler::HandleUiccRefresh: SMSP refresh."); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh: SMSP refresh" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh: SMSP refresh" ); refreshFiles |= KCacheSmsParams; break; } case KElemFileFixedDiallingNumbers: // 6F3B, Storage FDN { TFLOGSTRING("TSY:CMmPhoneMessHandler::HandleUiccRefresh: FDN refresh"); -OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh: FDN refresh" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh: FDN refresh" ); refreshFiles |= KCacheFdn; break; } case KElemSimServiceTable: // 6F38, Service table { TFLOGSTRING("TSY:CMmPhoneMessHandler::HandleUiccRefresh: ServiceTable refresh"); -OstTrace0( TRACE_NORMAL, DUP4_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh: ServiceTable refresh" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh: ServiceTable refresh" ); refreshFiles |= KCacheServiceTable; // Also internal service table cacheing is needed. EFalse means // no complete to CTSY. @@ -1502,14 +1512,14 @@ case KElemFileDynFlagsOrange: // 6F9F, ALS { TFLOGSTRING("TSY: CMmPhoneMessHandler::HandleUiccRefresh: ALS line refresh"); -OstTrace0( TRACE_NORMAL, DUP5_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh: ALS line." ); +OstTrace0( TRACE_NORMAL, DUP5_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh: ALS line." ); refreshFiles |= KCacheALSline; break; } case KElemFileShortMessages: // 6F3C, SMS { TFLOGSTRING("TSY: CMmPhoneMessHandler::HandleUiccRefresh: SMS refresh"); -OstTrace0( TRACE_NORMAL, DUP6_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh: SMS refresh" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh: SMS refresh" ); iInternalRefreshFiles |= KRefreshSms; iMessageRouter->GetSmsMessHandler()->InitializeSmsCache(); break; @@ -1517,7 +1527,7 @@ case KElemFileAcl: // 6F57, ACL { TFLOGSTRING("TSY: CMmPhoneMessHandler::HandleUiccRefresh: APN refresh"); -OstTrace0( TRACE_NORMAL, DUP7_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh: APN refresh" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh: APN refresh" ); iMessageRouter->Complete( EMobilePhoneNotifyAPNListChanged, KErrNone ); @@ -1533,7 +1543,7 @@ case KElemEst: // 6F56, Enabled service table { TFLOGSTRING("TSY: CMmPhoneMessHandler::HandleUiccRefresh: ServiceTable enabled"); -OstTrace0( TRACE_NORMAL, DUP8_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh: ServiceTable enabled" ); +OstTrace0( TRACE_NORMAL, DUP8_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh: ServiceTable enabled" ); enabledServicesChanged = ETrue; break; } @@ -1541,7 +1551,7 @@ case KElemFileCallFwdIndicationStatus: { TFLOGSTRING("TSY: CMmPhoneMessHandler::HandleUiccRefresh: Call forwarding flags refresh "); -OstTrace0( TRACE_NORMAL, DUP9_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh: Call forwarding flags refresh" ); +OstTrace0( TRACE_NORMAL, DUP9_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh: Call forwarding flags refresh" ); // Re-read call forwarding flags iInternalRefreshFiles |= KRefreshCallForwardingFlags; @@ -1553,7 +1563,7 @@ case KElemFileOpl: // 6FC6, Operator PLMN List { TFLOGSTRING("TSY: CMmPhoneMessHandler::HandleUiccRefresh: OPL list refresh"); -OstTrace0( TRACE_NORMAL, DUP10_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh: OPL list refresh" ); +OstTrace0( TRACE_NORMAL, DUP10_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh: OPL list refresh" ); iInternalRefreshFiles |= KRefreshOplRules; @@ -1566,7 +1576,7 @@ case KElemFilePlmnNetworkName: // 6FC5, PLMN Network Name { TFLOGSTRING("TSY: CMmPhoneMessHandler::HandleUiccRefresh: PNN refresh"); -OstTrace0( TRACE_NORMAL, DUP11_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh: PNN refresh" ); +OstTrace0( TRACE_NORMAL, DUP11_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh: PNN refresh" ); iInternalRefreshFiles |= KRefreshPnnRecord; @@ -1586,7 +1596,7 @@ case KElemFileOperatorName: // 6F14, Operator name { TFLOGSTRING("TSY: CMmPhoneMessHandler::HandleUiccRefresh: ONS name refresh"); -OstTrace0( TRACE_NORMAL, DUP12_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh: ONS name refresh" ); +OstTrace0( TRACE_NORMAL, DUP12_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh: ONS name refresh" ); iInternalRefreshFiles |= KRefreshOnsName; @@ -1599,7 +1609,7 @@ default: { TFLOGSTRING2("TSY:CMmPhoneMessHandler::HandleUiccRefresh:Unknown type: 0x%x", fileId); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh;fileId=%hu", fileId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh;fileId=%hu", fileId ); break; } } @@ -1608,7 +1618,7 @@ if ( 0x4F == ( fileId >> 8 ) ) { TFLOGSTRING("TSY:CMmPhoneMessHandler::HandleUiccRefresh: ADN refresh."); -OstTrace0( TRACE_NORMAL, DUP13_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh: ADN refresh" ); +OstTrace0( TRACE_NORMAL, DUP13_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh: ADN refresh" ); refreshFiles |= KCacheAdn; } @@ -1641,13 +1651,13 @@ // Check if we have any files to refresh in CommonTSY. TFLOGSTRING2("TSY: CMmPhoneMessHandler::HandleUiccRefresh: refreshFiles = %d", refreshFiles ); -OstTraceExt1( TRACE_NORMAL, DUP14_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh;refreshFiles=%hu", refreshFiles ); +OstTraceExt1( TRACE_NORMAL, DUP14_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh;refreshFiles=%hu", refreshFiles ); if ( 0 < refreshFiles ) { iCommonTSYRefreshPending = ETrue; TFLOGSTRING2("TSY: CMmPhoneMessHandler::HandleUiccRefresh: CommonTSY Refresh Pending = %d", iCommonTSYRefreshPending ); -OstTrace1( TRACE_NORMAL, DUP15_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH, "CMmPhoneMessHandler::HandleUiccRefresh;iCommonTSYRefreshPending=%d", iCommonTSYRefreshPending ); +OstTrace1( TRACE_NORMAL, DUP15_CMMPHONEMESSHANDLER_HANDLEUICCREFRESH_TD, "CMmPhoneMessHandler::HandleUiccRefresh;iCommonTSYRefreshPending=%d", iCommonTSYRefreshPending ); CMmDataPackage dataPackage; dataPackage.PackData( &refreshFiles ); @@ -1679,13 +1689,13 @@ if ( KErrNone == aError ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::SmsCachingCompleted: nokiatsy sms caching completed"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_SMSCACHINGCOMPLETED, "CMmPhoneMessHandler::SmsCachingCompleted: nokiatsy sms caching completed" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_SMSCACHINGCOMPLETED_TD, "CMmPhoneMessHandler::SmsCachingCompleted: nokiatsy sms caching completed" ); UiccRefreshReq( UICC_REFRESH_DONE ); } else { TFLOGSTRING2("TSY: CMmPhoneMessHandler::SmsCachingCompleted: nokiatsy sms caching completed with error %d", aError); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_SMSCACHINGCOMPLETED, "CMmPhoneMessHandler::SmsCachingCompleted: nokiatsy sms caching completed with error" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_SMSCACHINGCOMPLETED_TD, "CMmPhoneMessHandler::SmsCachingCompleted: nokiatsy sms caching completed with error" ); UiccRefreshReq( UICC_REFRESH_NOT_OK ); } } @@ -1702,13 +1712,13 @@ if ( UICC_STATUS_OK == aError ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::ServiceTableCachingCompleted: nokiatsy service table caching completed"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_SERVICETABLECACHINGCOMPLETED, "CMmPhoneMessHandler::ServiceTableCachingCompleted: nokiatsy service table caching completed" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_SERVICETABLECACHINGCOMPLETED_TD, "CMmPhoneMessHandler::ServiceTableCachingCompleted: nokiatsy service table caching completed" ); UiccRefreshReq( UICC_REFRESH_DONE ); } else { TFLOGSTRING2("TSY: CMmPhoneMessHandler::ServiceTableCachingCompleted: nokiatsy service table caching completed with error %d", aError); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_SERVICETABLECACHINGCOMPLETED, "CMmPhoneMessHandler::ServiceTableCachingCompleted: nokiatsy service table caching completed with error;aError=%d", aError ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_SERVICETABLECACHINGCOMPLETED_TD, "CMmPhoneMessHandler::ServiceTableCachingCompleted: nokiatsy service table caching completed with error;aError=%d", aError ); UiccRefreshReq( UICC_REFRESH_NOT_OK ); } } @@ -1727,13 +1737,13 @@ if ( UICC_STATUS_OK == aError ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::CallForwFlagsCachingCompleted: nokiatsy refresh successfully completed ==> REFRESH_DONE"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_CALLFORWFLAGSCACHINGCOMPLETED, "CMmPhoneMessHandler::CallForwFlagsCachingCompleted: nokiatsy refresh successfully completed" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_CALLFORWFLAGSCACHINGCOMPLETED_TD, "CMmPhoneMessHandler::CallForwFlagsCachingCompleted: nokiatsy refresh successfully completed" ); UiccRefreshReq( UICC_REFRESH_DONE ); } else { TFLOGSTRING2("TSY: CMmPhoneMessHandler::CallForwFlagsCachingCompleted: nokiatsy refresh completed with error %d ==> REFRESH_DONE", aError); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_CALLFORWFLAGSCACHINGCOMPLETED, "CMmPhoneMessHandler::CallForwFlagsCachingCompleted: nokiatsy refresh completed with error" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_CALLFORWFLAGSCACHINGCOMPLETED_TD, "CMmPhoneMessHandler::CallForwFlagsCachingCompleted: nokiatsy refresh completed with error" ); UiccRefreshReq( UICC_REFRESH_NOT_OK ); } } @@ -1758,13 +1768,13 @@ if ( KErrNone == aError ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::OplRulesCachingCompleted: nokiatsy refresh successfully completed ==> REFRESH_DONE"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_OPLRULESCACHINGCOMPLETED, "CMmPhoneMessHandler::OplRulesCachingCompleted: nokiatsy refresh successfully completed ==> REFRESH_DONE" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_OPLRULESCACHINGCOMPLETED_TD, "CMmPhoneMessHandler::OplRulesCachingCompleted: nokiatsy refresh successfully completed ==> REFRESH_DONE" ); UiccRefreshReq( UICC_REFRESH_DONE ); } else { TFLOGSTRING2("TSY: CMmPhoneMessHandler::OplRulesCachingCompleted: nokiatsy refresh completed with error %d ==> REFRESH_DONE", aError); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_OPLRULESCACHINGCOMPLETED, "CMmPhoneMessHandler::OplRulesCachingCompleted: nokiatsy refresh completed with error" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_OPLRULESCACHINGCOMPLETED_TD, "CMmPhoneMessHandler::OplRulesCachingCompleted: nokiatsy refresh completed with error" ); UiccRefreshReq( UICC_REFRESH_NOT_OK ); } } @@ -1787,13 +1797,13 @@ if ( UICC_STATUS_OK == aError ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::PnnRecordCachingCompleted: nokiatsy refresh successfully completed ==> REFRESH_DONE"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_PNNRECORDCACHINGCOMPLETED, "CMmPhoneMessHandler::PnnRecordCachingCompleted: nokiatsy refresh successfully completed ==> REFRESH_DONE" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_PNNRECORDCACHINGCOMPLETED_TD, "CMmPhoneMessHandler::PnnRecordCachingCompleted: nokiatsy refresh successfully completed ==> REFRESH_DONE" ); UiccRefreshReq( UICC_REFRESH_DONE ); } else { TFLOGSTRING2("TSY: CMmPhoneMessHandler::PnnRecordCachingCompleted: nokiatsy refresh completed with error %d ==> REFRESH_DONE", aError); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_PNNRECORDCACHINGCOMPLETED, "CMmPhoneMessHandler::PnnRecordCachingCompleted: nokiatsy refresh completed with error" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_PNNRECORDCACHINGCOMPLETED_TD, "CMmPhoneMessHandler::PnnRecordCachingCompleted: nokiatsy refresh completed with error" ); UiccRefreshReq( UICC_REFRESH_NOT_OK ); } } @@ -1814,13 +1824,13 @@ if ( UICC_STATUS_OK == aError ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::OnsNameCachingCompleted: nokiatsy refresh successfully completed ==> REFRESH_DONE"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_ONSNAMECACHINGCOMPLETED, "CMmPhoneMessHandler::OnsNameCachingCompleted: nokiatsy refresh successfully completed ==> REFRESH_DONE" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_ONSNAMECACHINGCOMPLETED_TD, "CMmPhoneMessHandler::OnsNameCachingCompleted: nokiatsy refresh successfully completed ==> REFRESH_DONE" ); UiccRefreshReq( UICC_REFRESH_DONE ); } else { TFLOGSTRING2("TSY: CMmPhoneMessHandler::OnsNameCachingCompleted: nokiatsy refresh completed with error %d ==> REFRESH_DONE", aError); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_ONSNAMECACHINGCOMPLETED, "CMmPhoneMessHandler::OnsNameCachingCompleted: nokiatsy refresh completed with error" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_ONSNAMECACHINGCOMPLETED_TD, "CMmPhoneMessHandler::OnsNameCachingCompleted: nokiatsy refresh completed with error" ); UiccRefreshReq( UICC_REFRESH_NOT_OK ); } } @@ -1834,7 +1844,7 @@ TInt CMmPhoneMessHandler::UiccReadEfEstReq() { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadEfEstReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADEFESTREQ, "CMmPhoneMessHandler::UiccReadEfEstReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADEFESTREQ_TD, "CMmPhoneMessHandler::UiccReadEfEstReq" ); TInt ret( KErrNone ); @@ -1852,7 +1862,7 @@ else { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadEfEstReq: card type is NOT UICC or ACL not supported in EFust"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCREADEFESTREQ, "CMmPhoneMessHandler::UiccReadEfEstReq: card type is NOT UICC or ACL not supported in EFust" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCREADEFESTREQ_TD, "CMmPhoneMessHandler::UiccReadEfEstReq: card type is NOT UICC or ACL not supported in EFust" ); iACLIsProgress = EFalse; ret = KErrNotFound; } @@ -1869,7 +1879,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccGetAclStatusReadEfEstResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCGETACLSTATUSREADEFESTRESP, "CMmPhoneMessHandler::UiccGetAclStatusReadEfEstResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCGETACLSTATUSREADEFESTRESP_TD, "CMmPhoneMessHandler::UiccGetAclStatusReadEfEstResp" ); TInt ret( KErrNone ); RMobilePhone::TAPNControlListServiceStatus aclStatus; @@ -1889,7 +1899,7 @@ else { TFLOGSTRING2("TSY: CMmPhoneMessHandler::UiccGetAclStatusReadEfEstResp: EFest reading failed: 0x%x", aStatus); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCGETACLSTATUSREADEFESTRESP, "CMmPhoneMessHandler::UiccGetAclStatusReadEfEstResp: EFest reading failed: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCGETACLSTATUSREADEFESTRESP_TD, "CMmPhoneMessHandler::UiccGetAclStatusReadEfEstResp: EFest reading failed: 0x%x", aStatus ); ret = KErrAccessDenied; } @@ -1917,7 +1927,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCSETACLSTATUSREADEFESTRESP, "CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCSETACLSTATUSREADEFESTRESP_TD, "CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp" ); TInt ret( KErrNone ); TBool completeNeeded( ETrue ); @@ -1941,7 +1951,7 @@ { // ACL status already correct, let's complete TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp: ACL status already correct, let's complete"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCSETACLSTATUSREADEFESTRESP, "CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp: ACL status already correct, let's complete" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCSETACLSTATUSREADEFESTRESP_TD, "CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp: ACL status already correct, let's complete" ); } } else if ( ( UICC_STATUS_OK == aStatus ) && ( ! aclState & KAclStateMask ) ) @@ -1956,14 +1966,14 @@ { // ACL status already correct, let's complete TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp: ACL status already correct, let's complete"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEMESSHANDLER_UICCSETACLSTATUSREADEFESTRESP, "CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp: ACL status already correct, let's complete" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPHONEMESSHANDLER_UICCSETACLSTATUSREADEFESTRESP_TD, "CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp: ACL status already correct, let's complete" ); } } else { // EFest reading failed TFLOGSTRING2("TSY: CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp: EFest reading failed: 0x%x", aStatus ); -OstTrace1( TRACE_NORMAL, DUP3_CMMPHONEMESSHANDLER_UICCSETACLSTATUSREADEFESTRESP, "CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp: EFest reading failed: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP3_CMMPHONEMESSHANDLER_UICCSETACLSTATUSREADEFESTRESP_TD, "CMmPhoneMessHandler::UiccSetAclStatusReadEfEstResp: EFest reading failed: 0x%x", aStatus ); ret = KErrAccessDenied; } @@ -1984,7 +1994,7 @@ TInt CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstReq( TUint8 aOldAclState ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCSETACLSTATUSWRITEEFESTREQ, "CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCSETACLSTATUSWRITEEFESTREQ_TD, "CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstReq" ); TInt ret( KErrNone ); TUint8 newState; @@ -2018,7 +2028,7 @@ else { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstReq: card type is NOT UICC or ACL not supported in EFust"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCSETACLSTATUSWRITEEFESTREQ, "CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstReq: card type is NOT UICC or ACL not supported in EFust" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCSETACLSTATUSWRITEEFESTREQ_TD, "CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstReq: card type is NOT UICC or ACL not supported in EFust" ); iACLIsProgress = EFalse; ret = KErrGeneral; } @@ -2034,7 +2044,7 @@ TInt aStatus ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCSETACLSTATUSWRITEEFESTRESP, "CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCSETACLSTATUSWRITEEFESTRESP_TD, "CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstResp" ); TInt ret( KErrAccessDenied ); if( UICC_STATUS_OK == aStatus ) @@ -2044,7 +2054,7 @@ else { TFLOGSTRING2("TSY: CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstResp: writing failed: 0x%x", aStatus); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCSETACLSTATUSWRITEEFESTRESP, "CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstResp: writing failed: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCSETACLSTATUSWRITEEFESTRESP_TD, "CMmPhoneMessHandler::UiccSetAclStatusWriteEfEstResp: writing failed: 0x%x", aStatus ); } iACLIsProgress = EFalse; //set ACL flag @@ -2068,7 +2078,7 @@ TInt CMmPhoneMessHandler::UiccReadAclReq() { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadAclReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADACLREQ, "CMmPhoneMessHandler::UiccReadAclReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADACLREQ_TD, "CMmPhoneMessHandler::UiccReadAclReq" ); TInt ret( KErrNone ); @@ -2086,7 +2096,7 @@ else { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadAclReq: card type is NOT UICC or ACL not supported in EFust"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCREADACLREQ, "CMmPhoneMessHandler::UiccReadAclReq: card type is NOT UICC or ACL not supported in EFust" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCREADACLREQ_TD, "CMmPhoneMessHandler::UiccReadAclReq: card type is NOT UICC or ACL not supported in EFust" ); iACLIsProgress = EFalse; ret = KErrNotFound; } @@ -2104,7 +2114,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccReadAclResp"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADACLRESP, "CMmPhoneMessHandler::UiccReadAclResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCREADACLRESP_TD, "CMmPhoneMessHandler::UiccReadAclResp" ); TInt ret( KErrNone ); if ( ( UICC_STATUS_OK == aStatus ) && ( KApnDataIndex < aFileData.Length() ) ) @@ -2145,7 +2155,7 @@ default: { TFLOGSTRING2( "TSY: CMmPhoneMessHandler::UiccReadAclResp: unknown IPC (%d)", iOngoingAclIpc ); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCREADACLRESP, "CMmPhoneMessHandler::UiccReadAclResp: unknown IPC (%d)", iOngoingAclIpc ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCREADACLRESP_TD, "CMmPhoneMessHandler::UiccReadAclResp: unknown IPC (%d)", iOngoingAclIpc ); iACLIsProgress = EFalse; break; } @@ -2154,7 +2164,7 @@ else { TFLOGSTRING2("TSY: CMmPhoneMessHandler::UiccReadAclResp: reading failed: 0x%x", aStatus); -OstTrace1( TRACE_NORMAL, DUP2_CMMPHONEMESSHANDLER_UICCREADACLRESP, "CMmPhoneMessHandler::UiccReadAclResp: reading failed: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP2_CMMPHONEMESSHANDLER_UICCREADACLRESP_TD, "CMmPhoneMessHandler::UiccReadAclResp: reading failed: 0x%x", aStatus ); ret = KErrAccessDenied; } @@ -2177,7 +2187,7 @@ ) const { TFLOGSTRING2("TSY: CMmPhoneMessHandler::DecodeACL. Number of total entries: %d", aTotalEntries); -OstTrace1( TRACE_NORMAL, CMMPHONEMESSHANDLER_DECODEACL, "CMmPhoneMessHandler::DecodeACL. Number of total entries: %d", aTotalEntries ); +OstTrace1( TRACE_NORMAL, CMMPHONEMESSHANDLER_DECODEACL_TD, "CMmPhoneMessHandler::DecodeACL. Number of total entries: %d", aTotalEntries ); CDesC8ArrayFlat* apnList = new( ELeave ) CDesC8ArrayFlat( 1 ); CleanupStack::PushL( apnList ); @@ -2217,7 +2227,7 @@ { TInt indexCount( iAPNList->MdcaCount() ); TFLOGSTRING2("TSY: CMmPhoneMessHandler::CompleteEnumerateAPNEntries. Number of APN's: %d",indexCount); -OstTrace1( TRACE_NORMAL, CMMPHONEMESSHANDLER_COMPLETEENUMERATEAPNENTRIES, "CMmPhoneMessHandler::CompleteEnumerateAPNEntries. Number of APN's: %d", indexCount ); +OstTrace1( TRACE_NORMAL, CMMPHONEMESSHANDLER_COMPLETEENUMERATEAPNENTRIES_TD, "CMmPhoneMessHandler::CompleteEnumerateAPNEntries. Number of APN's: %d", indexCount ); CMmDataPackage dataPackage; dataPackage.PackData( &indexCount ); @@ -2237,7 +2247,7 @@ void CMmPhoneMessHandler::CompleteGetAPNName( TUint8 aIndex ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::CompleteGetAPNName "); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_COMPLETEGETAPNNAME, "CMmPhoneMessHandler::CompleteGetAPNName" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_COMPLETEGETAPNNAME_TD, "CMmPhoneMessHandler::CompleteGetAPNName" ); CMmDataPackage dataPackage; RMobilePhone::TAPNEntryV3 aclEntry; @@ -2250,7 +2260,7 @@ else { TFLOGSTRING2("TSY: CMmPhoneMessHandler::CompleteGetAPNName. Copy entry from index %d",aIndex); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_COMPLETEGETAPNNAME, "CMmPhoneMessHandler::CompleteGetAPNName. Copy entry from index %d", aIndex ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_COMPLETEGETAPNNAME_TD, "CMmPhoneMessHandler::CompleteGetAPNName. Copy entry from index %d", aIndex ); aclEntry.iApn.Copy( iAPNList->MdcaPoint( aIndex ) ); } @@ -2268,7 +2278,7 @@ TInt CMmPhoneMessHandler::UiccDeleteApnEntry( TInt aIndex ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccDeleteApnEntry "); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCDELETEAPNENTRY, "CMmPhoneMessHandler::UiccDeleteApnEntry" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCDELETEAPNENTRY_TD, "CMmPhoneMessHandler::UiccDeleteApnEntry" ); TInt ret; if ( iAPNList->MdcaCount() <= aIndex ) @@ -2294,7 +2304,7 @@ TInt CMmPhoneMessHandler::UiccWriteEfAclReq() { TFLOGSTRING( "TSY: CMmPhoneMessHandler::UiccWriteEfAclReq" ); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCWRITEEFACLREQ, "CMmPhoneMessHandler::UiccWriteEfAclReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCWRITEEFACLREQ_TD, "CMmPhoneMessHandler::UiccWriteEfAclReq" ); TInt ret( KErrNone ); @@ -2327,7 +2337,7 @@ else { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccWriteEfAclReq: card type is NOT UICC or ACL not supported in EFust"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCWRITEEFACLREQ, "CMmPhoneMessHandler::UiccWriteEfAclReq: card type is NOT UICC or ACL not supported in EFust" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCWRITEEFACLREQ_TD, "CMmPhoneMessHandler::UiccWriteEfAclReq: card type is NOT UICC or ACL not supported in EFust" ); iACLIsProgress = EFalse; ret = KErrNotFound; } @@ -2342,13 +2352,13 @@ void CMmPhoneMessHandler::UiccWriteEfAclResp( TInt aStatus ) { TFLOGSTRING( "TSY: CMmPhoneMessHandler::UiccWriteEfAclResp" ); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCWRITEEFACLRESP, "CMmPhoneMessHandler::UiccWriteEfAclResp" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCWRITEEFACLRESP_TD, "CMmPhoneMessHandler::UiccWriteEfAclResp" ); TInt ret( KErrNone ); if( UICC_STATUS_OK != aStatus ) { TFLOGSTRING2( "TSY: CMmPhoneMessHandler::UiccWriteEfAclResp: EFacl writing failed: 0x%x", aStatus ); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCWRITEEFACLRESP, "CMmPhoneMessHandler::UiccWriteEfAclResp: EFacl writing failed: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_UICCWRITEEFACLRESP_TD, "CMmPhoneMessHandler::UiccWriteEfAclResp: EFacl writing failed: 0x%x", aStatus ); ret = KErrAccessDenied; } @@ -2367,7 +2377,7 @@ TUint16 CMmPhoneMessHandler::ACLLength( CDesC8ArrayFlat* aApnList ) const { TFLOGSTRING2("TSY: CMmPhoneMessHandler::ACLLength. Count: %d", aApnList->MdcaCount()); -OstTrace1( TRACE_NORMAL, CMMPHONEMESSHANDLER_ACLLENGTH, "CMmPhoneMessHandler::ACLLength. Count: %d", aApnList->MdcaCount() ); +OstTrace1( TRACE_NORMAL, CMMPHONEMESSHANDLER_ACLLENGTH_TD, "CMmPhoneMessHandler::ACLLength. Count: %d", aApnList->MdcaCount() ); TUint16 length( 0 ); @@ -2385,7 +2395,7 @@ length++; TFLOGSTRING2("TSY: CMmPhoneMessHandler::ACLLength. ACL len: %d", length); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_ACLLENGTH, "CMmPhoneMessHandler::ACLLength. ACL len: %d", length ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONEMESSHANDLER_ACLLENGTH_TD, "CMmPhoneMessHandler::ACLLength. ACL len: %d", length ); return length; } @@ -2406,7 +2416,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmPhoneMessHandler::UiccApplCmdReq"); -OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCAPPLCMDREQ, "CMmPhoneMessHandler::UiccApplCmdReq" ); +OstTrace0( TRACE_NORMAL, CMMPHONEMESSHANDLER_UICCAPPLCMDREQ_TD, "CMmPhoneMessHandler::UiccApplCmdReq" ); TInt ret( KErrNone ); TBuf8 filePath; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmphonetreceiver.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonetreceiver.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonetreceiver.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* 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" @@ -128,23 +128,23 @@ ( ( 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; @@ -178,7 +178,7 @@ iSatMessageBuffer( NULL ) { TFLOGSTRING("TSY: CMmPhoNetReceiver::CMmPhoNetReceiver"); -OstTrace0( TRACE_NORMAL, CMMPHONETRECEIVER_CMMPHONETRECEIVER, "CMmPhoNetReceiver::CMmPhoNetReceiver" ); +OstTrace0( TRACE_NORMAL, CMMPHONETRECEIVER_CMMPHONETRECEIVER_TD, "CMmPhoNetReceiver::CMmPhoNetReceiver" ); //None } @@ -190,7 +190,7 @@ 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(); @@ -216,7 +216,7 @@ ) { TFLOGSTRING("TSY: CMmPhoNetReceiver::NewL"); -OstTrace0( TRACE_NORMAL, CMMPHONETRECEIVER_NEWL, "CMmPhoNetReceiver::NewL" ); +OstTrace0( TRACE_NORMAL, CMMPHONETRECEIVER_NEWL_TD, "CMmPhoNetReceiver::NewL" ); CMmPhoNetReceiver* phoNetReceiver = NULL; @@ -247,17 +247,17 @@ { // 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() ); } // ----------------------------------------------------------------------------- @@ -268,7 +268,7 @@ 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(); } @@ -286,7 +286,7 @@ ) { 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 ), @@ -298,7 +298,7 @@ { 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 @@ -318,7 +318,7 @@ -- 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() ) { @@ -329,7 +329,7 @@ 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 ); } @@ -338,7 +338,7 @@ // 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(); } } @@ -373,7 +373,7 @@ (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; @@ -396,7 +396,7 @@ // 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; } @@ -451,7 +451,7 @@ ) { 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 ) ); @@ -460,7 +460,7 @@ 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(); @@ -520,7 +520,7 @@ ) { 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 || @@ -528,7 +528,7 @@ { 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; @@ -538,7 +538,7 @@ 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 @@ -561,12 +561,24 @@ ) { 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 // ----------------------------------------------------------------------------- @@ -577,7 +589,7 @@ ) { 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 @@ -593,12 +605,12 @@ -- 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 ) ) ); @@ -607,7 +619,7 @@ 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; } } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmphonetsender.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonetsender.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmphonetsender.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -127,23 +127,23 @@ ( ( i + 1 ) == length ) ) // All bytes collected and traced { firstTime = EFalse; -OstTraceExt1( TRACE_NORMAL, _TFLOG_PRINT_ISIMESSAGE, "Phonet Sender: [ %s]", trace_msg ); +OstTraceExt1( TRACE_NORMAL, _TFLOG_PRINT_ISIMESSAGE_TD, "Phonet Sender: [ %s]", trace_msg ); trace_msg.SetLength( 0 ); } else if ( firstTime ) // 1st line of the trace { firstTime = EFalse; -OstTraceExt1( TRACE_NORMAL, DUP1__TFLOG_PRINT_ISIMESSAGE, "Phonet Sender: [ %s", trace_msg ); +OstTraceExt1( TRACE_NORMAL, DUP1__TFLOG_PRINT_ISIMESSAGE_TD, "Phonet Sender: [ %s", trace_msg ); trace_msg.SetLength( 0 ); } else if ( ( i + 1 ) == length ) // The last line { -OstTraceExt1( TRACE_NORMAL, DUP4__TFLOG_PRINT_ISIMESSAGE, "Phonet Sender: %s]", trace_msg ); +OstTraceExt1( TRACE_NORMAL, DUP4__TFLOG_PRINT_ISIMESSAGE_TD, "Phonet Sender: %s]", trace_msg ); trace_msg.SetLength( 0 ); } else // just print bytes { -OstTraceExt1( TRACE_NORMAL, DUP5__TFLOG_PRINT_ISIMESSAGE, "Phonet Sender: %s", trace_msg ); +OstTraceExt1( TRACE_NORMAL, DUP5__TFLOG_PRINT_ISIMESSAGE_TD, "Phonet Sender: %s", trace_msg ); trace_msg.SetLength( 0 ); } counter = 0; @@ -171,7 +171,7 @@ iSendBufferPtr( 0,0 ) { TFLOGSTRING("TSY: CMmPhoNetSender::CMmPhoNetSender"); -OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_CMMPHONETSENDER, "CMmPhoNetSender::CMmPhoNetSender" ); +OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_CMMPHONETSENDER_TD, "CMmPhoNetSender::CMmPhoNetSender" ); } // ----------------------------------------------------------------------------- @@ -182,7 +182,7 @@ CMmPhoNetSender::~CMmPhoNetSender() { TFLOGSTRING("TSY: CMmPhoNetSender::~CMmPhoNetSender"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONETSENDER_CMMPHONETSENDER, "CMmPhoNetSender::~CMmPhoNetSender" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONETSENDER_CMMPHONETSENDER_TD, "CMmPhoNetSender::~CMmPhoNetSender" ); delete iSendBuffer; } @@ -197,7 +197,7 @@ ) { TFLOGSTRING("TSY: CMmPhoNetSender::NewL"); -OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_NEWL, "CMmPhoNetSender::NewL" ); +OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_NEWL_TD, "CMmPhoNetSender::NewL" ); CMmPhoNetSender* phoNetSender = NULL; @@ -221,16 +221,16 @@ void CMmPhoNetSender::ConstructL() { TFLOGSTRING("TSY: CMmPhoNetSender::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_CONSTRUCTL, "CMmPhoNetSender::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_CONSTRUCTL_TD, "CMmPhoNetSender::ConstructL" ); iSendBuffer = HBufC8::NewL( KMaxSendBufferSize ); iSendBufferPtr.Set( iSendBuffer->Des() ); TFLOGSTRING2("TSY: iSendBuffer len=%d", iSendBuffer->Length()); -OstTrace1( TRACE_NORMAL, DUP1_CMMPHONETSENDER_CONSTRUCTL, "CMmPhoNetSender::ConstructL;iSendBuffer->Length=%d", iSendBuffer->Length() ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPHONETSENDER_CONSTRUCTL_TD, "CMmPhoNetSender::ConstructL;iSendBuffer->Length=%d", iSendBuffer->Length() ); TFLOGSTRING3("TSY: iSendBufferPtr len=%d maxlen=%d", iSendBufferPtr.Length(), iSendBufferPtr.MaxLength()); -OstTrace1( TRACE_NORMAL, DUP2_CMMPHONETSENDER_CONSTRUCTL, "CMmPhoNetSender::ConstructL;iSendBufferPtr.MaxLength=%d", iSendBufferPtr.MaxLength() ); +OstTrace1( TRACE_NORMAL, DUP2_CMMPHONETSENDER_CONSTRUCTL_TD, "CMmPhoNetSender::ConstructL;iSendBufferPtr.MaxLength=%d", iSendBufferPtr.MaxLength() ); } // ----------------------------------------------------------------------------- @@ -241,7 +241,7 @@ // TDes8& CMmPhoNetSender::SendBufferDes() { -OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_SENDBUFFERDES, "CMmPhoNetSender::SendBufferDes" ); +OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_SENDBUFFERDES_TD, "CMmPhoNetSender::SendBufferDes" ); return iSendBufferPtr; } @@ -258,7 +258,7 @@ ) { TFLOGSTRING("TSY: CMmPhoNetSender::Send"); -OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_SEND, "CMmPhoNetSender::Send" ); +OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_SEND_TD, "CMmPhoNetSender::Send" ); TInt ret( KErrServerBusy ); @@ -293,7 +293,7 @@ ) { TFLOGSTRING("TSY: CMmPhoNetSender::Send (resource+transaction+data)"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPHONETSENDER_SEND, "CMmPhoNetSender::Send (resource+transaction+data)" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPHONETSENDER_SEND_TD, "CMmPhoNetSender::Send (resource+transaction+data)" ); // We shall use send buffer TDes8& buffer( SendBufferDes() ); @@ -325,7 +325,7 @@ ) { TFLOGSTRING("TSY: CMmPhoNetSender::EventSend"); -OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_EVENTSEND, "CMmPhoNetSender::EventSend" ); +OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_EVENTSEND_TD, "CMmPhoNetSender::EventSend" ); return iPhoNet->CustomFunction( EIscNokiaEventSend, (TDes8*)&aEvent ); } @@ -341,7 +341,7 @@ ) { TFLOGSTRING("TSY: CMmPhoNetSender::SubscribeEvents"); -OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_SUBSCRIBEEVENTS, "CMmPhoNetSender::SubscribeEvents" ); +OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_SUBSCRIBEEVENTS_TD, "CMmPhoNetSender::SubscribeEvents" ); return iPhoNet->CustomFunction( EIscNokiaEventSubscribe, (TDes8*)&aEvents ); } @@ -358,7 +358,7 @@ ) { TFLOGSTRING("TSY: CMmPhoNetSender::GetChannelInfo"); -OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_GETCHANNELINFO, "CMmPhoNetSender::GetChannelInfo" ); +OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_GETCHANNELINFO_TD, "CMmPhoNetSender::GetChannelInfo" ); return iPhoNet->GetChannelInfo( aChannel, aInfo ); } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmpipecontrol.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmpipecontrol.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmpipecontrol.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -23,9 +23,7 @@ #include "cmmpacketservicemesshandler.h" #include "cmmpacketmesshandlercontextlist.h" #include -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING #include -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ #include "tsylogger.h" #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE @@ -69,7 +67,7 @@ { TFLOGSTRING("TSY: CMmPipeControl::CMmPipeControl"); -OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_CMMPIPECONTROL, "CMmPipeControl::CMmPipeControl" ); +OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_CMMPIPECONTROL_TD, "CMmPipeControl::CMmPipeControl" ); } // ----------------------------------------------------------------------------- @@ -81,7 +79,7 @@ { TFLOGSTRING("TSY: CMmPipeControl::~CMmPipeControl"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPIPECONTROL_CMMPIPECONTROL, "CMmPipeControl::~CMmPipeControl" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPIPECONTROL_CMMPIPECONTROL_TD, "CMmPipeControl::~CMmPipeControl" ); } // ---------------------------------------------------------------------------- @@ -97,7 +95,7 @@ { TFLOGSTRING("TSY: CMmPipeControl::NewL"); -OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_NEWL, "CMmPipeControl::NewL" ); +OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_NEWL_TD, "CMmPipeControl::NewL" ); CMmPipeControl* mmPipeControl = new ( ELeave ) CMmPipeControl(); @@ -113,6 +111,8 @@ aPhoNetReceiver->RegisterL( mmPipeControl, PN_PIPE, PNS_PIPE_ENABLE_RESP ); aPhoNetReceiver->RegisterL( mmPipeControl, PN_PIPE, PNS_PIPE_RESET_RESP ); aPhoNetReceiver->RegisterL( mmPipeControl, PN_PIPE, PNS_PIPE_REMOVE_RESP ); + aPhoNetReceiver->RegisterL( mmPipeControl, PN_PIPE, PNS_PIPE_REDIRECT_RESP ); + aPhoNetReceiver->RegisterL( mmPipeControl, PN_PIPE, PNS_PEP_CTRL_RESP ); #ifdef DUMMY_NIF_PEP_FOR_PACKET_DATA_TESTING_DOS @@ -123,10 +123,6 @@ #endif //DUMMY_NIF_PEP_FOR_PACKET_DATA_TESTING_DOS -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING - aPhoNetReceiver-> - RegisterL( mmPipeControl, PN_NAMESERVICE, PNS_NAME_QUERY_RESP ); -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ CleanupStack::Pop( mmPipeControl ); @@ -142,15 +138,12 @@ { TFLOGSTRING("TSY: CMmPipeControl::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_CONSTRUCTL, "CMmPipeControl::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_CONSTRUCTL_TD, "CMmPipeControl::ConstructL" ); iSecondPepDeviceId = KSecondPepDevice; // Default Device Id of second PEP iSecondPepObjectId = KSecondPepObject; // Default Object Id of second PEP InitLists(); -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING - PnsNameQueryReq(); -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ } // ----------------------------------------------------------------------------- @@ -165,7 +158,7 @@ TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); TFLOGSTRING3("TSY: CMmPipeControl::ReceiveMessageL - resource: %d, msgId: %d", resource, messageId); -OstTraceExt2( TRACE_NORMAL, CMMPIPECONTROL_RECEIVEMESSAGEL, "CMmPipeControl::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); +OstTraceExt2( TRACE_NORMAL, CMMPIPECONTROL_RECEIVEMESSAGEL_TD, "CMmPipeControl::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); switch ( resource ) { @@ -193,6 +186,16 @@ PnsPipeRemoveResp( aIsiMessage ); break; } + case PNS_PIPE_REDIRECT_RESP: + { + PnsPipeRedirectResp( aIsiMessage ); + break; + } + case PNS_PEP_CTRL_RESP: + { + PnsPepCtrlResp( aIsiMessage ); + break; + } #ifdef DUMMY_NIF_PEP_FOR_PACKET_DATA_TESTING_DOS case PNS_PEP_CONNECT_REQ: @@ -221,38 +224,17 @@ { TFLOGSTRING2("TSY: CMmPipeControl::ReceiveMessageL - PN_PIPE - unknown msgId: %d", messageId); -OstTrace1( TRACE_NORMAL, DUP1_CMMPIPECONTROL_RECEIVEMESSAGEL, "CMmPipeControl::ReceiveMessageL;unknown messageId=%d", messageId ); +OstTrace1( TRACE_NORMAL, DUP1_CMMPIPECONTROL_RECEIVEMESSAGEL_TD, "CMmPipeControl::ReceiveMessageL;unknown messageId=%d", messageId ); break; } } break; } -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING - case PN_NAMESERVICE: - { - switch( messageId ) - { - case PNS_NAME_QUERY_RESP: - { - PnsNameQueryResp( aIsiMessage ); - break; - } - default: - { - - TFLOGSTRING2("TSY: CMmPipeControl::ReceiveMessageL - PN_NAMESERVICE - unknown msgId: %d", messageId); -OstTrace1( TRACE_NORMAL, DUP2_CMMPIPECONTROL_RECEIVEMESSAGEL, "CMmPipeControl::ReceiveMessageL;unknown messageId=%d", messageId ); - break; - } - } - break; - } -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ default: { TFLOGSTRING2("TSY: CMmPipeControl::ReceiveMessageL - unknown resource: %d", resource); -OstTrace1( TRACE_NORMAL, DUP3_CMMPIPECONTROL_RECEIVEMESSAGEL, "CMmPipeControl::ReceiveMessageL;unknown resource=%d", resource ); +OstTrace1( TRACE_NORMAL, DUP3_CMMPIPECONTROL_RECEIVEMESSAGEL_TD, "CMmPipeControl::ReceiveMessageL;unknown resource=%d", resource ); break; // server not known } } // end of switch @@ -267,7 +249,7 @@ { TFLOGSTRING("TSY: CMmPipeControl::InitLists"); -OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_INITLISTS, "CMmPipeControl::InitLists" ); +OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_INITLISTS_TD, "CMmPipeControl::InitLists" ); // Find PipeHandle id from Pipe Operation by PipeHandle List for ( TInt i = 0; i < KMmMaxNumberOfPipeHandles; i++ ) @@ -290,7 +272,7 @@ { TFLOGSTRING("TSY: CMmPipeControl::SetPipeHandle"); -OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_SETPIPEHANDLE, "CMmPipeControl::SetPipeHandle" ); +OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_SETPIPEHANDLE_TD, "CMmPipeControl::SetPipeHandle" ); // Find PipeHandle id from Pipe Operation by PipeHandle List for ( TInt i = 0; i < KMmMaxNumberOfPipeHandles; i++ ) @@ -318,7 +300,7 @@ { TFLOGSTRING("TSY: CMmPipeControl::SetTransactionId"); -OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_SETTRANSACTIONID, "CMmPipeControl::SetTransactionId" ); +OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_SETTRANSACTIONID_TD, "CMmPipeControl::SetTransactionId" ); // Find PipeHandle id from Pipe Operation by PipeHandle List for ( TInt i = 0; i < KMmMaxNumberOfPipeHandles; i++ ) @@ -345,7 +327,7 @@ { TFLOGSTRING("TSY: CMmPipeControl::TransactionId"); -OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_TRANSACTIONID, "CMmPipeControl::TransactionId" ); +OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_TRANSACTIONID_TD, "CMmPipeControl::TransactionId" ); TUint8 transId( 0 ); @@ -376,7 +358,7 @@ { TFLOGSTRING("TSY: CMmPipeControl::ResetPipeHandle"); -OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_RESETPIPEHANDLE, "CMmPipeControl::ResetPipeHandle" ); +OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_RESETPIPEHANDLE_TD, "CMmPipeControl::ResetPipeHandle" ); // Find PipeHandle id from Pipe Operation by PipeHandle List for ( TInt i = 0; i < KMmMaxNumberOfPipeHandles; i++ ) @@ -405,7 +387,7 @@ { TFLOGSTRING("TSY: CMmPipeControl::IsOperationCalled"); -OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_ISOPERATIONCALLED, "CMmPipeControl::IsOperationCalled" ); +OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_ISOPERATIONCALLED_TD, "CMmPipeControl::IsOperationCalled" ); TBool ret( EFalse); @@ -422,91 +404,6 @@ return ret; } -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING -// ---------------------------------------------------------------------------- -// CMmPipeControl::PnsNameQueryReq -// Construct a PNS_NAME_QUERY_REQ ISI-message -// ---------------------------------------------------------------------------- -// -TInt CMmPipeControl::PnsNameQueryReq() const - { - - TFLOGSTRING("TSY: CMmPipeControl::PnsNameQueryReq"); -OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_PNSNAMEQUERYREQ, "CMmPipeControl::PnsNameQueryReq" ); - - // create buffer for isi msg data - TBuf8 data; - // set message data - data.Append( KGpdsPadding ); // Padding byte - data.Append( KGpdsPadding ); // Padding byte - data.Append( KGpdsPadding ); // Padding byte - data.Append( KGpdsPadding ); // Padding byte - data.Append( KGpdsPadding ); // Padding byte - data.Append( PN_GPRS ); // Gprs server - data.Append( KGpdsPadding ); // Padding byte - data.Append( KGpdsPadding ); // Padding byte - data.Append( KGpdsPadding ); // Padding byte - data.Append( PN_GPRS ); // Gprs server - - // set dummyTransactionId value to 0x0F - TUint8 dummyTransactionId( KDummyTrId ); - - // Sending message to phonet - return iPhoNetSender->Send( - PN_NAMESERVICE, dummyTransactionId, PNS_NAME_QUERY_REQ, data ); - } - -// ---------------------------------------------------------------------------- -// CMmPipeControl::PnsNameQueryResp -// Breaks a PNS_NAME_QUERY_RESP ISI-message -// ---------------------------------------------------------------------------- -// -void CMmPipeControl::PnsNameQueryResp( - const TIsiReceiveC& aIsiMessage ) - { - - TUint16 matchesInThisMsg( aIsiMessage.Get16bit( - ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_MATCHESINMSG ) ); - - TFLOGSTRING2("TSY: CMmPipeControl::PnsNameQueryResp - matches in this msg: %d", matchesInThisMsg); -OstTraceExt1( TRACE_NORMAL, CMMPIPECONTROL_PNSNAMEQUERYRESP, "CMmPipeControl::PnsNameQueryResp;matchesInThisMsg=%hu", matchesInThisMsg ); - - if ( 0 < matchesInThisMsg ) - { - for ( TInt i = 0; i < matchesInThisMsg; i++ ) - { - // each match is represented as 8-byte record => - // recordIndex = i * SIZE_PN_NAME_SRV_ITEM_STR - // name is 4 bytes => - // last byte index = PN_NAME_SRV_ITEM_STR_OFFSET_NAME + KLastByteIndex - TInt recordIndex( i * SIZE_PN_NAME_SRV_ITEM_STR ); - TUint8 name( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_NAMEENTRYTBL + - recordIndex + ( PN_NAME_SRV_ITEM_STR_OFFSET_NAME + KLastByteIndex ) ) ); - if ( PN_GPRS == name ) - { - // Get and store SecondPepDevice id and SecondPepObject id - iSecondPepDeviceId = aIsiMessage.Get8bit( - ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_NAMEENTRYTBL + - recordIndex + PN_NAME_SRV_ITEM_STR_OFFSET_DEV ); - iSecondPepObjectId = aIsiMessage.Get8bit( - ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_NAMEENTRYTBL + - recordIndex + PN_NAME_SRV_ITEM_STR_OFFSET_OBJ ); - // then find right server, stop finding - i = matchesInThisMsg; - - TFLOGSTRING3("TSY: CMmPipeControl::PnsNameQueryResp. SecondPepDeviceId: %d SecondPepObjectId: %d", iSecondPepDeviceId, iSecondPepObjectId ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSNAMEQUERYRESP, "CMmPipeControl::PnsNameQueryResp;iSecondPepDeviceId=%hhu;iSecondPepObjectId=%hhu", iSecondPepDeviceId, iSecondPepObjectId ); - - } - //no else - } - } - //no else - } - -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - // ---------------------------------------------------------------------------- // CMmPipeControl::PnsPipeCreateReq // Construct a PNS_PIPE_CREATE_REQ ISI-message @@ -519,14 +416,11 @@ { TFLOGSTRING2("TSY: CMmPipeControl::PnsPipeCreateReq. TransactionId: %d", aTransId ); -OstTraceExt1( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPECREATEREQ, "CMmPipeControl::PnsPipeCreateReq;aTransId=%hhu", aTransId ); +OstTraceExt1( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPECREATEREQ_TD, "CMmPipeControl::PnsPipeCreateReq;aTransId=%hhu", aTransId ); // create buffer for isi msg data -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING TBuf8 data; -#else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - TBuf8 data; -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ + // set message data data.Append( aPipeState ); data.Append( KGpdsPadding ); @@ -553,7 +447,7 @@ const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmPipeControl::PnsPipeCreateResp"); -OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPECREATERESP, "CMmPipeControl::PnsPipeCreateResp" ); +OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPECREATERESP_TD, "CMmPipeControl::PnsPipeCreateResp" ); // Get transaction Id TUint8 transId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID ) ); @@ -562,35 +456,22 @@ if ( KErrNone == ret ) { -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING TUint8 pipeHandle( aIsiMessage.Get8bit( ISI_HEADER_SIZE + PNS_PIPE_CREATE_RESP_OFFSET_PIPEHANDLE ) ); TUint8 errorCode( aIsiMessage.Get8bit( ISI_HEADER_SIZE + PNS_PIPE_CREATE_RESP_OFFSET_ERRORCODE ) ); -#else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - TUint8 pipeHandle( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + CM_PIPE_CREATE_RESP_OFFSET_PIPEHANDLE ) ); - TUint8 errorCode( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + CM_PIPE_CREATE_RESP_OFFSET_ERRORCODE ) ); -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ TFLOGSTRING4("TSY: CMmPipeControl::PnsPipeCreateResp. TransactionId: %d, PipeHandle: %d, error code: %d", transId, pipeHandle, errorCode ); -OstTraceExt3( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPIPECREATERESP, "CMmPipeControl::PnsPipeCreateResp;transId=%hhu;pipeHandle=%hhu;errorCode=%hhu", transId, pipeHandle, errorCode ); +OstTraceExt3( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPIPECREATERESP_TD, "CMmPipeControl::PnsPipeCreateResp;transId=%hhu;pipeHandle=%hhu;errorCode=%hhu", transId, pipeHandle, errorCode ); // Check PIPE Error Code if ( PN_PIPE_ERR_GENERAL == errorCode ) { -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING TUint8 pep1ErrorCode( aIsiMessage.Get8bit( ISI_HEADER_SIZE + PNS_PIPE_CREATE_RESP_OFFSET_PEP1ERRORCODE ) ); TUint8 pep2ErrorCode( aIsiMessage.Get8bit( ISI_HEADER_SIZE + PNS_PIPE_CREATE_RESP_OFFSET_PEP2ERRORCODE ) ); -#else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - TUint8 pep1ErrorCode( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + CM_PIPE_CREATE_RESP_OFFSET_PEP1ERRORCODE ) ); - TUint8 pep2ErrorCode( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + CM_PIPE_CREATE_RESP_OFFSET_PEP2ERRORCODE ) ); -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ + // Check PEP Error Codes if ( pep1ErrorCode == PN_PIPE_ERR_PEP_IN_USE || pep1ErrorCode == PN_PIPE_ERR_ALL_PIPES_IN_USE || @@ -599,7 +480,7 @@ { TFLOGSTRING("TSY: CMmPipeControl::PnsPipeCreateResp. ErrorCode changed to PN_PIPE_ERR_ALL_PIPES_IN_USE" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMPIPECONTROL_PNSPIPECREATERESP, "CMmPipeControl::PnsPipeCreateResp, ErrorCode changed to PN_PIPE_ERR_ALL_PIPES_IN_USE" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPIPECONTROL_PNSPIPECREATERESP_TD, "CMmPipeControl::PnsPipeCreateResp, ErrorCode changed to PN_PIPE_ERR_ALL_PIPES_IN_USE" ); // PEP can't create more pipes (all pipes in use), // error value is updated here errorCode = PN_PIPE_ERR_ALL_PIPES_IN_USE; @@ -623,46 +504,23 @@ // ---------------------------------------------------------------------------- // TInt CMmPipeControl::PnsPipeEnableReq( - const CMmDataPackage& aPackage ) const + TUint8 aPipeHandle, + TUint8 aTransId ) const { -TFLOGSTRING("TSY: CMmPipeControl::PnsPipeEnableReq"); -OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPEENABLEREQ, "CMmPipeControl::PnsPipeEnableReq" ); - - TInfoName* contextName = NULL; - aPackage.UnPackData( &contextName ); + TFLOGSTRING3("TSY: CMmPipeControl::PnsPipeEnableReq( aPipeHandle:0x%x, aTransId:0x%x )", aPipeHandle, aTransId ); + OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPEENABLEREQ_TD, "CMmPipeControl::PnsPipeEnableReq" ); TInt ret( KErrServerBusy ); - - if( NULL != contextName ) + // Check if Pipe operation is not outstanding. IsOperationCalled is EFalse + if ( !IsOperationCalled( aPipeHandle ) ) { - - TFLOGSTRING2("TSY: CMmPipeControl::PnsPipeEnableReq - context name: %S", contextName); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPIPEENABLEREQ, "CMmPipeControl::PnsPipeEnableReq;contextName=%S", *contextName ); - - TUint8 pipehandle( iContextList->PipeHandleByContextName(contextName) ); - - TUint8 traId( iContextList->ProxyIdByContextName( contextName ) ); - - TFLOGSTRING2("TSY: CMmPipeControl::PnsPipeEnableReq. PipeHandle: %d", pipehandle ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMPIPECONTROL_PNSPIPEENABLEREQ, "CMmPipeControl::PnsPipeEnableReq;pipehandle=%hhu", pipehandle ); - - // Check if Pipe operation is not outstanding. IsOperationCalled is EFalse - if ( !IsOperationCalled( pipehandle ) ) - { - // Create buffer for isi msg data -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING - TBuf8 data; -#else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - TBuf8 data; -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - data.Append( pipehandle ); - data.Append( KGpdsPadding ); - - // Send Isi message via phonet - ret = iPhoNetSender->Send( - PN_PIPE, traId, PNS_PIPE_ENABLE_REQ, data ); - } - //no else + // Create buffer for isi msg data + TBuf8 data; + data.Append( aPipeHandle ); + data.Append( KGpdsPadding ); + // Send Isi message via phonet + ret = iPhoNetSender->Send( + PN_PIPE, aTransId, PNS_PIPE_ENABLE_REQ, data ); } //no else @@ -678,7 +536,7 @@ const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmPipeControl::PnsPipeEnableResp"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPIPEENABLERESP, "CMmPipeControl::PnsPipeEnableResp" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPIPEENABLERESP_TD, "CMmPipeControl::PnsPipeEnableResp" ); // Get Transaction Id from the ISI message TUint8 transId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID ) ); @@ -689,20 +547,13 @@ { // Get Pipehandle from the ISI message TUint8 pipeHandle( aIsiMessage.Get8bit( -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING ISI_HEADER_SIZE + PNS_PIPE_ENABLE_RESP_OFFSET_PIPEHANDLE ) ); // Get Errorcode from the ISI message TUint8 errorCode( aIsiMessage.Get8bit( ISI_HEADER_SIZE + PNS_PIPE_ENABLE_RESP_OFFSET_ERRORCODE ) ); -#else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - ISI_HEADER_SIZE + CM_PIPE_ENABLE_RESP_OFFSET_PIPEHANDLE ) ); - // Get Errorcode from the ISI message - TUint8 errorCode( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + CM_PIPE_ENABLE_RESP_OFFSET_ERRORCODE ) ); -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ TFLOGSTRING4("TSY: CMmPipeControl::PnsPipeEnableResp - traId: %d, PipeHandle: %d, ErrorCode: %d", transId, pipeHandle, errorCode ); -OstTraceExt3( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPEENABLERESP, "CMmPipeControl::PnsPipeEnableResp;transId=%hhu;pipeHandle=%hhu;errorCode=%hhu", transId, pipeHandle, errorCode ); +OstTraceExt3( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPEENABLERESP_TD, "CMmPipeControl::PnsPipeEnableResp;transId=%hhu;pipeHandle=%hhu;errorCode=%hhu", transId, pipeHandle, errorCode ); iContextMessHandler->CompletePipeOperation( PNS_PIPE_ENABLE_RESP, @@ -724,7 +575,7 @@ const TUint8 aStateAfterReset ) { TFLOGSTRING2("TSY: CMmPipeControl::PnsPipeResetReq. PipeHandle: %d", aPipeHandle ); -OstTraceExt1( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPERESETREQ, "CMmPipeControl::PnsPipeResetReq;aPipeHandle=%hhu", aPipeHandle ); +OstTraceExt1( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPERESETREQ_TD, "CMmPipeControl::PnsPipeResetReq;aPipeHandle=%hhu", aPipeHandle ); // Set ret to KErrServerBusy TInt ret( KErrServerBusy ); @@ -733,11 +584,8 @@ if ( !IsOperationCalled( aPipeHandle ) ) { // Create buffer for isi msg data -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING TBuf8 data; -#else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - TBuf8 data; -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ + data.Append( aPipeHandle ); data.Append( aStateAfterReset ); @@ -765,7 +613,7 @@ const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmPipeControl::PnsPipeResetResp"); -OstTrace0( TRACE_NORMAL, DUP2_CMMPIPECONTROL_PNSPIPERESETRESP, "CMmPipeControl::PnsPipeResetResp" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMPIPECONTROL_PNSPIPERESETRESP_TD, "CMmPipeControl::PnsPipeResetResp" ); // Get Transaction Id from the ISI message TUint8 transId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID ) ); @@ -776,14 +624,10 @@ { // Get Pipehandle from the ISI message TUint8 pipeHandle( aIsiMessage.Get8bit( -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING ISI_HEADER_SIZE + PNS_PIPE_RESET_RESP_OFFSET_PIPEHANDLE ) ); -#else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - ISI_HEADER_SIZE + CM_PIPE_RESET_RESP_OFFSET_PIPEHANDLE ) ); -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ TFLOGSTRING3("TSY: CMmPipeControl::PnsPipeResetResp - traId: %d, pipe handle: %d", transId, pipeHandle); -OstTraceExt2( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPERESETRESP, "CMmPipeControl::PnsPipeResetResp;transId=%hhu;pipeHandle=%hhu", transId, pipeHandle ); +OstTraceExt2( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPERESETRESP_TD, "CMmPipeControl::PnsPipeResetResp;transId=%hhu;pipeHandle=%hhu", transId, pipeHandle ); // Call TransactionId TUint8 removeTransId( TransactionId( pipeHandle ) ); @@ -803,14 +647,10 @@ if ( KErrNone == ret ) { TUint8 errorCode( aIsiMessage.Get8bit( -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING ISI_HEADER_SIZE + PNS_PIPE_RESET_RESP_OFFSET_ERRORCODE ) ); -#else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - ISI_HEADER_SIZE + CM_PIPE_RESET_RESP_OFFSET_ERRORCODE ) ); -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ TFLOGSTRING3("TSY: CMmPipeControl::PnsPipeResetResp. PipeHandle: %d ErrorCode: %d", pipeHandle, errorCode ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPIPERESETRESP, "CMmPipeControl::PnsPipeResetResp;pipeHandle=%hhu;errorCode=%hhu", pipeHandle, errorCode ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPIPERESETRESP_TD, "CMmPipeControl::PnsPipeResetResp;pipeHandle=%hhu;errorCode=%hhu", pipeHandle, errorCode ); iContextMessHandler->CompletePipeOperation( PNS_PIPE_RESET_RESP, transId, @@ -832,7 +672,7 @@ const TUint8 aPipeHandle ) { TFLOGSTRING2("TSY: CMmPipeControl::PnsPipeRemoveReq. PipeHandle: %d", aPipeHandle ); -OstTraceExt1( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPEREMOVEREQ, "CMmPipeControl::PnsPipeRemoveReq;aPipeHandle=%hhu", aPipeHandle ); +OstTraceExt1( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPEREMOVEREQ_TD, "CMmPipeControl::PnsPipeRemoveReq;aPipeHandle=%hhu", aPipeHandle ); // Set ret to KErrNone TInt ret( KErrNone ); @@ -841,11 +681,7 @@ if ( !IsOperationCalled( aPipeHandle ) ) { // Create buffer for isi msg data -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING TBuf8 data; -#else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - TBuf8 data; -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ data.Append( aPipeHandle ); data.Append( KGpdsPadding ); @@ -880,7 +716,7 @@ const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmPipeControl::PnsPipeRemoveResp"); -OstTrace0( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPIPEREMOVERESP, "CMmPipeControl::PnsPipeRemoveResp" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPIPEREMOVERESP_TD, "CMmPipeControl::PnsPipeRemoveResp" ); // Get Transaction Id from the ISI message TUint8 transId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID ) ); @@ -890,22 +726,14 @@ if ( KErrNone == ret ) { // Get Pipehandle from the ISI message -#ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING TUint8 pipeHandle( aIsiMessage.Get8bit( ISI_HEADER_SIZE + PNS_PIPE_REMOVE_RESP_OFFSET_PIPEHANDLE ) ); // Get Errorcode from the ISI message TUint8 errorCode( aIsiMessage.Get8bit( ISI_HEADER_SIZE + PNS_PIPE_REMOVE_RESP_OFFSET_ERRORCODE ) ); -#else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - TUint8 pipeHandle( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + CM_PIPE_REMOVE_RESP_OFFSET_PIPEHANDLE ) ); - // Get Errorcode from the ISI message - TUint8 errorCode( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + CM_PIPE_REMOVE_RESP_OFFSET_ERRORCODE ) ); -#endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ TFLOGSTRING4("TSY: CMmPipeControl::PnsPipeRemoveResp - traId: %d, PipeHandle: %d, ErrorCode: %d", transId, pipeHandle, errorCode ); - OstTraceExt3( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPEREMOVERESP, "CMmPipeControl::PnsPipeRemoveResp;transId=%hhu;pipeHandle=%hhu;errorCode=%hhu", transId, pipeHandle, errorCode ); + OstTraceExt3( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPEREMOVERESP_TD, "CMmPipeControl::PnsPipeRemoveResp;transId=%hhu;pipeHandle=%hhu;errorCode=%hhu", transId, pipeHandle, errorCode ); // Call ResetPipeHandle -method from CMmPipeControl ResetPipeHandle( pipeHandle ); @@ -919,6 +747,157 @@ // no else } +// ---------------------------------------------------------------------------- +// CMmPipeControl::PnsPipeRedirectReq +// Construct a PNS_PIPE_REDIRECT_REQ ISI-message. +// ---------------------------------------------------------------------------- +// +TInt CMmPipeControl::PnsPipeRedirectReq( + TUint8 aTransId, + TUint8 aPipeHandle, + TUint8 aOldPepDevId, + TUint8 aOldPepObjId, + TUint8 aReplacementPepDevId, + TUint8 aReplacementPepObjId) + { + TFLOGSTRING4("TSY: CMmPipeControl::PnsPipeRedirectReq(aTransId:0x%x, aPipeHandle:0x%x, aOldPepDevId:0x%x )", aTransId, aPipeHandle, aOldPepDevId ); + TFLOGSTRING4("TSY: CMmPipeControl::PnsPipeRedirectReq( aOldPepObjId:0x%x, aReplacementPepDevId:0x%x, aReplacementPepObjId:0x%x)", aOldPepObjId, aReplacementPepDevId, aReplacementPepObjId ); + OstTraceExt4( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPEREDIRECTREQ_TD, "CMmPipeControl::PnsPipeRedirectReq;aTransId=%hhu;aPipeHandle=%hhu;aOldPepDevId=%hhu;aOldPepObjId=%hhu", aTransId, aPipeHandle, aOldPepDevId, aOldPepObjId ); + OstTraceExt2( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPIPEREDIRECTREQ_TD, "CMmPipeControl::PnsPipeRedirectReq;aReplacementPepDevId=%hhu;aReplacementPepObjId=%hhu", aReplacementPepDevId, aReplacementPepObjId ); + + TInt ret(KErrNone); + + TBuf8 data; + data.Append( aPipeHandle ); + data.Append( PN_PEP_DISABLE ); + data.Append( aOldPepDevId ); + data.Append( aOldPepObjId ); + data.Append( PN_PEP_TYPE_COMMON ); + data.Append( KGpdsPadding ); + data.Append( aReplacementPepDevId ); + data.Append( aReplacementPepObjId ); + data.Append( PN_PEP_TYPE_COMMON ); + data.Append( KGpdsPadding ); + + // Send Isi message via phonet + ret = iPhoNetSender->Send( + PN_PIPE, + aTransId, + PNS_PIPE_REDIRECT_REQ, + data ); + + return ret; + } + +// ---------------------------------------------------------------------------- +// CMmPipeControl::PnsPipeRedirectResp +// Breaks a PNS_PIPE_REDIRECT_RESP ISI-message. +// ---------------------------------------------------------------------------- +// +void CMmPipeControl::PnsPipeRedirectResp( + const TIsiReceiveC& aIsiMessage ) + { + TFLOGSTRING("TSY: CMmPipeControl::PnsPipeRedirectResp"); + OstTrace0( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPIPEREDIRECTRESP_TD, "CMmPipeControl::PnsPipeRedirectResp" ); + // Get Transaction Id from the ISI message + TUint8 transId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID ) ); + TUint8 pipeHandle( aIsiMessage.Get8bit( + ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_RESP_OFFSET_PIPEHANDLE ) ); + // Get Errorcode from the ISI message + TUint8 errorCode( aIsiMessage.Get8bit( + ISI_HEADER_SIZE + PNS_PIPE_REDIRECT_RESP_OFFSET_ERRORCODE ) ); + + TFLOGSTRING4("TSY: CMmPipeControl::PnsPipeRedirectResp - transId: 0x%x, PipeHandle: 0x%x, ErrorCode: 0x%x", transId, pipeHandle, errorCode ); + OstTraceExt3( TRACE_NORMAL, CMMPIPECONTROL_PNSPIPEREDIRECTRESP_TD, "CMmPipeControl::PnsPipeRedirectResp;transId=%u;pipeHandle=%u;errorCode=%u", transId, pipeHandle, errorCode ); + + iContextMessHandler->CompletePipeOperation( + PNS_PIPE_REDIRECT_RESP, + transId, + pipeHandle, + errorCode ); + } + +// ---------------------------------------------------------------------------- +// CMmPipeControl::PnsPepCtrlReq +// Construct a PNS_PIPE_REDIRECT_REQ ISI-message. +// ---------------------------------------------------------------------------- +// +TInt CMmPipeControl::PnsPepCtrlReq( + TUint8 aDevId, + TUint8 aObjId, + TUint8 aTransId, + TUint8 aPipeHandle, + TUint8 aControlId, + TUint8 aStatus, + TUint8 aChannelId ) + { + TFLOGSTRING4("TSY: CMmPipeControl::PnsPepCtrlReq( aTransId:0x%x, aPipeHandle:0x%x, aControlId:0x%x)", aTransId, aPipeHandle, aControlId ); + TFLOGSTRING3("TSY: CMmPipeControl::PnsPepCtrlReq( aStatus:0x%x, aChannelId:0x%x)", aStatus, aChannelId ); + OstTraceExt5( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPCTRLREQ_TD, "CMmPipeControl::PnsPepCtrlReq;aTransId=%hhu;aPipeHandle=%hhu;aControlId=%hhu;aStatus=%hhu;aChannelId=%hhu", aTransId, aPipeHandle, aControlId, aStatus, aChannelId ); + + TInt ret(KErrNone); + + TInt length( ISI_HEADER_SIZE + SIZE_PNS_PEP_CTRL_REQ + 7 ); + HBufC8* message = HBufC8::New( length ); + if( message ) + { + TPtr8 messageptr = message->Des(); + TIsiSend isimessage( messageptr, length ); + isimessage.Set8bit( ISI_HEADER_OFFSET_RECEIVERDEVICE, aDevId ); + isimessage.Set8bit( ISI_HEADER_OFFSET_RECEIVEROBJECT, aObjId ); + isimessage.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_PIPE ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_UTID, aTransId ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_SUBFUNCTION, PNS_PEP_CTRL_REQ ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PIPEHANDLE , aPipeHandle ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPTYPE , PN_PEP_TYPE_BCA ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPCTRLID, aControlId ); + + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPCTRLDATA, aStatus ); + + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPCTRLDATA + 1, aChannelId ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPCTRLDATA + 2, PN_PEP_SUB_TYPE_SYMBIAN_INTERNAL ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPCTRLDATA + 3, PN_PEP_TYPE_COMMON ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPCTRLDATA + 4, PN_PIPE ); + + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPCTRLDATA + 5, aDevId ); + isimessage.Set8bit( ISI_HEADER_SIZE + PNS_PEP_CTRL_REQ_OFFSET_PEPCTRLDATA + 6, aObjId ); + + ret = iPhoNetSender->Send( isimessage.Complete() ); + + delete message; + } + + return ret; + } + +// ---------------------------------------------------------------------------- +// CMmPipeControl::PnsPepCtrlResp +// Breaks a PNS_PEP_CTRL_RESP ISI-message. +// ---------------------------------------------------------------------------- +// +void CMmPipeControl::PnsPepCtrlResp( + const TIsiReceiveC& aIsiMessage ) + { + TFLOGSTRING("TSY: CMmPipeControl::PnsPepCtrlResp"); + OstTrace0( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPEPCTRLRESP_TD, "CMmPipeControl::PnsPepCtrlResp" ); + // Get Transaction Id from the ISI message + TUint8 transId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID ) ); + TUint8 pipeHandle( aIsiMessage.Get8bit( + ISI_HEADER_SIZE + PNS_PEP_CTRL_RESP_OFFSET_PIPEHANDLE ) ); + // Get Errorcode from the ISI message + TUint8 errorCode( aIsiMessage.Get8bit( + ISI_HEADER_SIZE + PNS_PEP_CTRL_RESP_OFFSET_ERRORCODE ) ); + + TFLOGSTRING4("TSY: CMmPipeControl::PnsPepCtrlResp - transId: %d, PipeHandle: %d, ErrorCode: %d", transId, pipeHandle, errorCode ); + OstTraceExt3( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPCTRLRESP_TD, "CMmPipeControl::PnsPepCtrlResp;transId=%x;pipeHandle=%x;errorCode=%x", transId, pipeHandle, errorCode ); + + iContextMessHandler->CompletePipeOperation( + PNS_PEP_CTRL_RESP, + transId, + pipeHandle, + errorCode ); + } + #ifdef DUMMY_NIF_PEP_FOR_PACKET_DATA_TESTING_DOS // ---------------------------------------------------------------------------- // CMmPipeControl::PnsPepConnectReq @@ -930,7 +909,7 @@ { TFLOGSTRING("TSY: CMmPipeControl::PnsPepConnectReq"); -OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPCONNECTREQ, "CMmPipeControl::PnsPepConnectReq" ); +OstTrace0( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPCONNECTREQ_TD, "CMmPipeControl::PnsPepConnectReq" ); // Get Transaction Id from the ISI message TUint8 transId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID ) ); @@ -940,11 +919,11 @@ ISI_HEADER_SIZE + PNS_PEP_CONNECT_REQ_OFFSET_PIPEHANDLE ) ); #else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ TUint8 pipeHandle( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + CM_PEP_CONNECT_REQ_OFFSET_PIPEHANDLE ) ); + ISI_HEADER_SIZE + PNS_PEP_CONNECT_REQ_OFFSET_PIPEHANDLE ) ); #endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ TFLOGSTRING3("TSY: CMmPipeControl::PnsPepConnectReq - traId: %d, PipeHandle: %d", transId, pipeHandle ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPEPCONNECTREQ, "CMmPipeControl::PnsPepConnectReq;transId=%hhu;pipeHandle=%hhu", transId, pipeHandle ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPEPCONNECTREQ_TD, "CMmPipeControl::PnsPepConnectReq;transId=%hhu;pipeHandle=%hhu", transId, pipeHandle ); PnsPepConnectResp( transId, pipeHandle ); } @@ -960,13 +939,13 @@ { TFLOGSTRING3("TSY: CMmPipeControl::PnsPepConnectResp - traId: %d, pipe handle: %d", aTransId, aPipeHandle); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPEPCONNECTRESP, "CMmPipeControl::PnsPepConnectResp;aTransId=%hhu;aPipeHandle=%hhu", aTransId, aPipeHandle ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPEPCONNECTRESP_TD, "CMmPipeControl::PnsPepConnectResp;aTransId=%hhu;aPipeHandle=%hhu", aTransId, aPipeHandle ); // Create buffer for isi msg data #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING TBuf8 data; #else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - TBuf8 data; + TBuf8 data; #endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ // Set message data data.Append( aPipeHandle ); @@ -981,7 +960,7 @@ TFLOGSTRING3("TSY: CMmPipeControl::PnsPepConnectResp. PipeHandle: %d RetFromPhonetSender: %d", aPipeHandle, ret ); -OstTraceExt2( TRACE_NORMAL, DUP2_CMMPIPECONTROL_PNSPEPCONNECTRESP, "CMmPipeControl::PnsPepConnectResp;aPipeHandle=%hhu;RetFromPhonetSender=%d", aPipeHandle, ret ); +OstTraceExt2( TRACE_NORMAL, DUP2_CMMPIPECONTROL_PNSPEPCONNECTRESP_TD, "CMmPipeControl::PnsPepConnectResp;aPipeHandle=%hhu;RetFromPhonetSender=%d", aPipeHandle, ret ); } // ---------------------------------------------------------------------------- @@ -1000,11 +979,11 @@ ISI_HEADER_SIZE + PNS_PEP_DISCONNECT_REQ_OFFSET_PIPEHANDLE ) ); #else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ TUint8 pipeHandle( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + CM_PEP_DISCONNECT_REQ_OFFSET_PIPEHANDLE ) ); + ISI_HEADER_SIZE + PNS_PEP_DISCONNECT_REQ_OFFSET_PIPEHANDLE ) ); #endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ TFLOGSTRING3("TSY: CMmPipeControl::PnsPepDisconnectReq - traId: %d, PipeHandle: %d", transId, pipeHandle ); -OstTraceExt2( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPDISCONNECTREQ, "CMmPipeControl::PnsPepDisconnectReq;transId=%hhu;pipeHandle=%hhu", transId, pipeHandle ); +OstTraceExt2( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPDISCONNECTREQ_TD, "CMmPipeControl::PnsPepDisconnectReq;transId=%hhu;pipeHandle=%hhu", transId, pipeHandle ); PnsPepDisconnectResp( transId, pipeHandle ); } @@ -1020,13 +999,13 @@ { TFLOGSTRING3("TSY: CMmPipeControl::PnsPepDisconnectResp - traId: %d, pipe handle: %d", aTransId, aPipeHandle); -OstTraceExt2( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPDISCONNECTRESP, "CMmPipeControl::PnsPepDisconnectResp;aTransId=%hhu;aPipeHandle=%hhu", aTransId, aPipeHandle ); +OstTraceExt2( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPDISCONNECTRESP_TD, "CMmPipeControl::PnsPepDisconnectResp;aTransId=%hhu;aPipeHandle=%hhu", aTransId, aPipeHandle ); //Create buffer for isi msg data #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING TBuf8 data; #else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - TBuf8 data; + TBuf8 data; #endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ // Set message data data.Append( aPipeHandle ); @@ -1037,12 +1016,12 @@ PN_PIPE, aTransId, PNS_PEP_DISCONNECT_RESP, data ) ); TFLOGSTRING3("TSY: CMmPipeControl::PnsPepDisconnectResp. PipeHandle: %d RetFromPhonetSender: %d", aPipeHandle, ret ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPEPDISCONNECTRESP, "CMmPipeControl::PnsPepDisconnectResp;aPipeHandle=%hhu;RetFromPhonetSender=%d", aPipeHandle, ret ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPEPDISCONNECTRESP_TD, "CMmPipeControl::PnsPepDisconnectResp;aPipeHandle=%hhu;RetFromPhonetSender=%d", aPipeHandle, ret ); } // ---------------------------------------------------------------------------- // CMmPipeControl::PnsPepResetReq -// Breaks a CM_PEP_RESET_REQ ISI-message. +// Breaks a PNS_PEP_RESET_REQ ISI-message. // ---------------------------------------------------------------------------- // void CMmPipeControl::PnsPepResetReq( @@ -1056,11 +1035,11 @@ ISI_HEADER_SIZE + PNS_PEP_RESET_REQ_OFFSET_PIPEHANDLE ) ); #else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ TUint8 pipeHandle( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + CM_PEP_RESET_REQ_OFFSET_PIPEHANDLE ) ); + ISI_HEADER_SIZE + PNS_PEP_RESET_REQ_OFFSET_PIPEHANDLE ) ); #endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ TFLOGSTRING3("TSY: CMmPipeControl::PnsPepResetReq - traId: %d, PipeHandle: %d", transId, pipeHandle ); -OstTraceExt2( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPRESETREQ, "CMmPipeControl::PnsPepResetReq;transId=%hhu;pipeHandle=%hhu", transId, pipeHandle ); +OstTraceExt2( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPRESETREQ_TD, "CMmPipeControl::PnsPepResetReq;transId=%hhu;pipeHandle=%hhu", transId, pipeHandle ); PnsPepResetResp( transId, pipeHandle ); } @@ -1076,13 +1055,13 @@ { TFLOGSTRING3("TSY: CMmPipeControl::PnsPepResetResp - traId: %d, pipe handle: %d", aTransId, aPipeHandle); -OstTraceExt1( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPRESETRESP, "CMmPipeControl::PnsPepResetResp;aTransId=%hhu", aTransId ); +OstTraceExt1( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPRESETRESP_TD, "CMmPipeControl::PnsPepResetResp;aTransId=%hhu", aTransId ); // Create buffer for isi msg data #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING TBuf8 data; #else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - TBuf8 data; + TBuf8 data; #endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ // Set message data data.Append( aPipeHandle ); @@ -1093,7 +1072,7 @@ PN_PIPE, aTransId, PNS_PEP_RESET_RESP, data ) ); TFLOGSTRING3("TSY: CMmPipeControl::PnsPepResetResp. PipeHandle: %d RetFromPhonetSender: %d", aPipeHandle, ret ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPEPRESETRESP, "CMmPipeControl::PnsPepResetResp;aPipeHandle=%hhu;ret=%d", aPipeHandle, ret ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPEPRESETRESP_TD, "CMmPipeControl::PnsPepResetResp;aPipeHandle=%hhu;ret=%d", aPipeHandle, ret ); } // ---------------------------------------------------------------------------- @@ -1112,11 +1091,11 @@ #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING ISI_HEADER_SIZE + PNS_PEP_ENABLE_REQ_OFFSET_PIPEHANDLE ) ); #else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - ISI_HEADER_SIZE + CM_PEP_ENABLE_REQ_OFFSET_PIPEHANDLE ) ); + ISI_HEADER_SIZE + PNS_PEP_ENABLE_REQ_OFFSET_PIPEHANDLE ) ); #endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ TFLOGSTRING3("TSY: CMmPipeControl::PnsPepEnableReq - traId: %d, PipeHandle: %d", transId, pipeHandle ); -OstTraceExt2( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPENABLEREQ, "CMmPipeControl::PnsPepEnableReq;transId=%hhu;pipeHandle=%hhu", transId, pipeHandle ); +OstTraceExt2( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPENABLEREQ_TD, "CMmPipeControl::PnsPepEnableReq;transId=%hhu;pipeHandle=%hhu", transId, pipeHandle ); PnsPepEnableResp( transId, pipeHandle ); } @@ -1132,13 +1111,13 @@ { TFLOGSTRING3("TSY: CMmPipeControl::PnsPepEnableResp - traId: %d, pipe handle: %d", aTransId, aPipeHandle); -OstTraceExt2( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPENABLERESP, "CMmPipeControl::PnsPepEnableResp;aTransId=%hhu;aPipeHandle=%hhu", aTransId, aPipeHandle ); +OstTraceExt2( TRACE_NORMAL, CMMPIPECONTROL_PNSPEPENABLERESP_TD, "CMmPipeControl::PnsPepEnableResp;aTransId=%hhu;aPipeHandle=%hhu", aTransId, aPipeHandle ); // Create buffer for isi msg data #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING TBuf8 data; #else /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ - TBuf8 data; + TBuf8 data; #endif /* INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING */ // Set message data data.Append( aPipeHandle ); @@ -1152,7 +1131,7 @@ data ) ); TFLOGSTRING3("TSY: CMmPipeControl::PnsPepEnableResp. PipeHandle: %d RetFromPhonetSender: %d", aPipeHandle, ret ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPEPENABLERESP, "CMmPipeControl::PnsPepEnableResp;aPipeHandle=%hhu;RetFromPhonetSender=%d", aPipeHandle, ret ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMPIPECONTROL_PNSPEPENABLERESP_TD, "CMmPipeControl::PnsPepEnableResp;aPipeHandle=%hhu;RetFromPhonetSender=%d", aPipeHandle, ret ); } #endif // DUMMY_NIF_PEP_FOR_PACKET_DATA_TESTING_DOS diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmsecuritymesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmsecuritymesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmsecuritymesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -102,7 +102,7 @@ CMmSecurityMessHandler::CMmSecurityMessHandler() { TFLOGSTRING("TSY: CMmSecurityMessHandler::CMmSecurityMessHandler"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_CMMSECURITYMESSHANDLER, "CMmSecurityMessHandler::CMmSecurityMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_CMMSECURITYMESSHANDLER_TD, "CMmSecurityMessHandler::CMmSecurityMessHandler" ); //none } @@ -120,7 +120,7 @@ CMmUiccMessHandler* aUiccMessHandler ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::NewL"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_NEWL, "CMmSecurityMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_NEWL_TD, "CMmSecurityMessHandler::NewL" ); CMmSecurityMessHandler* const securityMessHandler = new ( ELeave ) CMmSecurityMessHandler(); @@ -170,7 +170,7 @@ void CMmSecurityMessHandler::ConstructL() { TFLOGSTRING("TSY: CMmSecurityMessHandler::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_CONSTRUCTL, "CMmSecurityMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_CONSTRUCTL_TD, "CMmSecurityMessHandler::ConstructL" ); #ifdef INTERNAL_TESTING_OLD_IMPLEMENTATION_FOR_UICC_TESTING // Initialize the current MTC state to poweroff, and do the first state query @@ -194,7 +194,7 @@ // This flags indicates if lock state query in case iLockStateQuery = EFalse; iCodeType = RMobilePhone::ESecurityCodePin1; - + iFdnSetting = RMobilePhone::EFdnSetOff; } @@ -206,7 +206,7 @@ CMmSecurityMessHandler::~CMmSecurityMessHandler() { TFLOGSTRING("TSY: CMmSecurityMessHandler::~CMmSecurityMessHandler"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_CMMSECURITYMESSHANDLER, "CMmSecurityMessHandler::~CMmSecurityMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_CMMSECURITYMESSHANDLER_TD, "CMmSecurityMessHandler::~CMmSecurityMessHandler" ); } // ----------------------------------------------------------------------------- @@ -219,7 +219,7 @@ const CMmDataPackage* aDataPackage ) { TFLOGSTRING2("TSY: CMmSecurityMessHandler::ExtFuncL, aIpc: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_EXTFUNCL, "CMmSecurityMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_EXTFUNCL_TD, "CMmSecurityMessHandler::ExtFuncL;aIpc=%d", aIpc ); TInt ret( KErrNone ); @@ -371,7 +371,21 @@ } case EMmTsyBootNotifySimStatusReadyIPC: { - UiccReq(); + // In case of UICC server has started before TSY, application + // activation might not be done and in that case it is started now + if ( UICC_STATUS_APPL_ACTIVE != + iMmUiccMessHandler->GetUiccApplicationStatus() ) + { + iMmUiccMessHandler->CreateUiccReq(); + } + else + { + // Application activation was already done + iMessageRouter->Complete( + EMmTsyBootNotifySimStatusReadyIPC, + KErrNone ); + } + break; } case EMmTsySimGetICCType: @@ -392,7 +406,7 @@ RMobilePhone::TMobilePhoneFdnSetting* fdnSetting( NULL ); aDataPackage->UnPackData( &fdnSetting ); iFdnSetting = *fdnSetting; - + if( UICC_CARD_TYPE_UICC == cardType ) { ret = ReadEfEst( ETrIdSetFdnStateReadEst ); @@ -404,7 +418,7 @@ else { TFLOGSTRING("TSY: CMmSecurityMessHandler::ExtFuncL: unknown card type, FDN state not set"); -OstTrace0( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_EXTFUNCL, "CMmSecurityMessHandler::ExtFuncL: unknown card type, FDN state not set" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_EXTFUNCL_TD, "CMmSecurityMessHandler::ExtFuncL: unknown card type, FDN state not set" ); ret = KErrGeneral; } break; @@ -425,7 +439,7 @@ else { TFLOGSTRING("TSY: CMmSecurityMessHandler::ExtFuncL: unknown card type, FDN state cannot be solved"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_EXTFUNCL, "CMmSecurityMessHandler::ExtFuncL: unknown card type, FDN state cannot be solved" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_EXTFUNCL_TD, "CMmSecurityMessHandler::ExtFuncL: unknown card type, FDN state cannot be solved" ); ret = KErrGeneral; } break; @@ -440,7 +454,7 @@ { //This should not be in any use at the moment TFLOGSTRING("TSY: CMmSecurityMessHandler::ExtFuncL - EMmTsyBootGetRFStatusIPC (NOT IN USE!!!)"); -OstTrace0( TRACE_NORMAL, DUP5_CMMSECURITYMESSHANDLER_EXTFUNCL, "CMmSecurityMessHandler::ExtFuncL, EMmTsyBootGetRFStatusIPC (NOT IN USE!!!)" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMSECURITYMESSHANDLER_EXTFUNCL_TD, "CMmSecurityMessHandler::ExtFuncL, EMmTsyBootGetRFStatusIPC (NOT IN USE!!!)" ); ret = MtcRfStatusQueryReq( transId ); break; } @@ -448,7 +462,7 @@ default: { TFLOGSTRING2("TSY: CMmSecurityMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP6_CMMSECURITYMESSHANDLER_EXTFUNCL, "CMmSecurityMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP6_CMMSECURITYMESSHANDLER_EXTFUNCL_TD, "CMmSecurityMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc ); ret = KErrNotSupported; break; } @@ -470,7 +484,7 @@ TInt messageId(aIsiMessage.Get8bit(ISI_HEADER_OFFSET_MESSAGEID)); TFLOGSTRING3("TSY: CMmSecurityMessHandler::ReceiveMessageL - resource: %d, msgId: %d", resource, messageId); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_RECEIVEMESSAGEL, "CMmSecurityMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmSecurityMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); switch ( resource ) { @@ -497,7 +511,7 @@ default: { TFLOGSTRING2("TSY: CMmSecurityMessHandler::ReceiveMessageL - PN_MTC - unknown msgId: %d", messageId); -//OstTrace1( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_RECEIVEMESSAGEL, "CMmSecurityMessHandler::ReceiveMessageL;PN_MTC - unknown messageId=%d", messageId ); +//OstTrace1( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmSecurityMessHandler::ReceiveMessageL;PN_MTC - unknown messageId=%d", messageId ); break; } } // end switch ( messageId ) @@ -526,7 +540,7 @@ default: { TFLOGSTRING2("TSY: CMmSecurityMessHandler::ReceiveMessageL - PN_MTC - unknown msgId: %d", messageId); -OstTrace1( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_RECEIVEMESSAGEL, "CMmSecurityMessHandler::ReceiveMessageL;PN_MTC - unknown messageId=%d", messageId ); +OstTrace1( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmSecurityMessHandler::ReceiveMessageL;PN_MTC - unknown messageId=%d", messageId ); break; } } // end switch ( messageId ) @@ -537,16 +551,6 @@ { switch( messageId ) { - case UICC_RESP: - { - UiccResp( aIsiMessage ); - break; - } - case UICC_IND: - { - UiccInd( aIsiMessage ); - break; - } case UICC_CARD_IND: { UiccCardInd( aIsiMessage ); @@ -572,7 +576,7 @@ default: { TFLOGSTRING2("TSY: CMmSecurityMessHandler::ReceiveMessageL - unknown resource: %d", resource); -OstTrace1( TRACE_NORMAL, DUP5_CMMSECURITYMESSHANDLER_RECEIVEMESSAGEL, "CMmSecurityMessHandler::ReceiveMessageL;resource=%d", resource ); +OstTrace1( TRACE_NORMAL, DUP5_CMMSECURITYMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmSecurityMessHandler::ReceiveMessageL;resource=%d", resource ); break; // server not known } } // end of switch @@ -592,7 +596,9 @@ RMobilePhone::TMobilePassword unblockCode( aCodes->iUnblockCode ); TFLOGSTRING4("TSY: CMmSecurityMessHandler::VerifySecurityCode - code type: %d, code: %S, unblock code: %S",*aType, &code, &unblockCode); -OstTraceExt3( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_SECCODEVERIFYREQ, "CMmSecurityMessHandler::VerifySecurityCode;code=%S;unblockCode=%S;aType=%hhu", code, unblockCode, *aType ); +OstTraceExt3( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_SECCODEVERIFYREQ_TD, "CMmSecurityMessHandler::VerifySecurityCode;code=%S;unblockCode=%S;aType=%hhu", code, unblockCode, *aType ); + + iSecurityCode = *aType; switch( *aType ) { @@ -636,11 +642,11 @@ RMobilePhone::TMobilePhonePasswordChangeV1* aChange ) // Old&new password { TFLOGSTRING3("TSY: CMmSecurityMessHandler::SecCodeChangeReq - traId: %d, type: %d", aTransactionId, *aType); -OstTraceExt2( TRACE_NORMAL, CMMSECURITYMESSHANDLER_SECCODECHANGEREQ, "CMmSecurityMessHandler::SecCodeChangeReq;aTransactionId=%hhu;aType=%d", aTransactionId, *aType ); +OstTraceExt2( TRACE_NORMAL, CMMSECURITYMESSHANDLER_SECCODECHANGEREQ_TD, "CMmSecurityMessHandler::SecCodeChangeReq;aTransactionId=%hhu;aType=%d", aTransactionId, *aType ); TFLOGSTRING2("TSY: CMmSecurityMessHandler::SecCodeChangeReq - old password: %S", &(aChange->iOldPassword)); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_SECCODECHANGEREQ, "CMmSecurityMessHandler::SecCodeChangeReq;aChange->iOldPassword=%S", aChange->iOldPassword ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_SECCODECHANGEREQ_TD, "CMmSecurityMessHandler::SecCodeChangeReq;aChange->iOldPassword=%S", aChange->iOldPassword ); TFLOGSTRING2("TSY: CMmSecurityMessHandler::SecCodeChangeReq - new password: %S", &(aChange->iNewPassword)); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_SECCODECHANGEREQ, "CMmSecurityMessHandler::SecCodeChangeReq;aChange->iNewPassword=%S", aChange->iNewPassword ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_SECCODECHANGEREQ_TD, "CMmSecurityMessHandler::SecCodeChangeReq;aChange->iNewPassword=%S", aChange->iNewPassword ); TInt ret( KErrNone ); @@ -660,85 +666,6 @@ return ret; } -// ----------------------------------------------------------------------------- -// CMmSecurityMessHandler::UiccReq -// Builds UICC_REQ ISI message and sends it via phonet -// ----------------------------------------------------------------------------- -// -TInt CMmSecurityMessHandler::UiccReq() const - { -TFLOGSTRING("TSY: CMmSecurityMessHandler::UiccReq"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCREQ, "CMmSecurityMessHandler::UiccReq" ); - - // Create UICC_REQ message for querying card status - TIsiSend isiMsg( iPhoNetSender->SendBufferDes() ); - isiMsg.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_UICC ); - isiMsg.Set8bit( ISI_HEADER_OFFSET_TRANSID, KSecurityTransId ); - isiMsg.Set8bit( ISI_HEADER_OFFSET_MESSAGEID, UICC_REQ ); - isiMsg.Set8bit( ISI_HEADER_SIZE + UICC_REQ_OFFSET_SERVICETYPE, - UICC_STATUS_GET ); - - return iPhoNetSender->Send( isiMsg.Complete() ); - } - -// ----------------------------------------------------------------------------- -// CMmSecurityMessHandler::UiccResp -// Breaks UICC_RESP ISI-message and completes "notify SIM ready" -// to CommonTSY. -// ----------------------------------------------------------------------------- -// -void CMmSecurityMessHandler::UiccResp( const TIsiReceiveC& aIsiMessage ) - { - // Get service type - TUint8 serviceType( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + UICC_RESP_OFFSET_SERVICETYPE ) ); - - // Get status - TUint8 status( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + UICC_RESP_OFFSET_STATUS ) ); - -TFLOGSTRING3("TSY: CMmSecurityMessHandler::UiccResp, service type: %d, status: %d", serviceType, status ); -OstTraceExt2( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCRESP, "CMmSecurityMessHandler::UiccResp;serviceType=%d;status=%d", serviceType, status ); - - if ( UICC_STATUS_GET == serviceType && UICC_STATUS_OK == status ) - { - if ( !iBootState.iSIMReady ) - { - // Set UICC as ready so that initialization can start - iBootState.iSIMReady = ETrue; - - // let's cache service table and CPHS information table - iMmUiccMessHandler->InitializeSimServiceTableCache(); - iMmUiccMessHandler->InitializeCphsInformationCache(); - } - } - } - -// ----------------------------------------------------------------------------- -// CMmSecurityMessHandler::UiccInd -// Breaks UICC_IND ISI-message and completes "notify SIM ready" -// to CommonTSY. -// ----------------------------------------------------------------------------- -// -void CMmSecurityMessHandler::UiccInd( const TIsiReceiveC& aIsiMessage ) - { - // Get service type - TUint8 serviceType( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + UICC_IND_OFFSET_SERVICETYPE ) ); - -TFLOGSTRING2("TSY: CMmCustomMessHandler::UiccInd, service type: %d", serviceType ); -OstTraceExt1( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCIND, "CMmSecurityMessHandler::UiccInd;serviceType=%hhu", serviceType ); - - if ( UICC_START_UP_COMPLETE == serviceType ) - { - // Set UICC state to ready - iBootState.iSIMReady = ETrue; - - // let's cache service table and CPHS information table - iMmUiccMessHandler->InitializeSimServiceTableCache(); - iMmUiccMessHandler->InitializeCphsInformationCache(); - } - } // ----------------------------------------------------------------------------- // CMmSecurityMessHandler::UiccCardInd @@ -752,12 +679,12 @@ ISI_HEADER_SIZE + UICC_CARD_IND_OFFSET_SERVICETYPE ) ); TFLOGSTRING2("TSY: CMmCustomMessHandler::UiccCardInd, service type: %d", serviceType ); -OstTraceExt1( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCCARDIND, "CMmSecurityMessHandler::UiccCardInd;serviceType=%hhu", serviceType ); +OstTraceExt1( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCCARDIND_TD, "CMmSecurityMessHandler::UiccCardInd;serviceType=%hhu", serviceType ); if ( UICC_CARD_REMOVED == serviceType ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::UiccCardInd - SIM Removed!"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_UICCCARDIND, "CMmSecurityMessHandler::UiccCardInd - SIM Removed!" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_UICCCARDIND_TD, "CMmSecurityMessHandler::UiccCardInd - SIM Removed!" ); // Change old boot state from TSY to not ready iBootState.iSecReady = EFalse; iBootState.iPinRequired = EFalse; @@ -775,13 +702,13 @@ const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::MtcStateInfoIndL"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MTCSTATEINFOINDL, "CMmSecurityMessHandler::MtcStateInfoIndL" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MTCSTATEINFOINDL_TD, "CMmSecurityMessHandler::MtcStateInfoIndL" ); TUint8 state( aIsiMessage.Get8bit( ISI_HEADER_SIZE + MTC_STATE_INFO_IND_OFFSET_STATE ) ); TUint8 action( aIsiMessage.Get8bit( ISI_HEADER_SIZE + MTC_STATE_INFO_IND_OFFSET_ACTION ) ); TFLOGSTRING3("TSY: CMmSecurityMessHandler::MtcStateInfoIndL action: 0x%02x, state: 0x%02x", action, state); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_MTCSTATEINFOINDL, "CMmSecurityMessHandler::MtcStateInfoIndL;action=%hhx;state=%hhx", action, state ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_MTCSTATEINFOINDL_TD, "CMmSecurityMessHandler::MtcStateInfoIndL;action=%hhx;state=%hhx", action, state ); //1. CMT_STATE_READY _AND_ CURRENT_STATE_NEW if ( ( MTC_NOS_READY == action || MTC_READY == action ) && @@ -790,11 +717,11 @@ iBootState.iMtcCurrentState = state; TFLOGSTRING("NTSY: CMmSecurityMessHandler::MtcStateInfoIndL - CMT state transition occurred"); -OstTrace0( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_MTCSTATEINFOINDL, "CMmSecurityMessHandler::MtcStateInfoIndL, CMT state transition occurred" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_MTCSTATEINFOINDL_TD, "CMmSecurityMessHandler::MtcStateInfoIndL, CMT state transition occurred" ); if ( MTC_NORMAL == state ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::MtcStateInfoIndL - MTC_NORMAL"); -OstTrace0( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_MTCSTATEINFOINDL, "CMmSecurityMessHandler::MtcStateInfoIndL, MTC_NORMAL" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_MTCSTATEINFOINDL_TD, "CMmSecurityMessHandler::MtcStateInfoIndL, MTC_NORMAL" ); iMessageRouter->Complete( EMmTsyBootNotifyModemStatusReadyIPC, KErrNone ); } @@ -817,7 +744,7 @@ else if( ( MTC_NOS_READY == action || MTC_READY == action ) ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::MtcStateInfoIndL - CMT state already active"); -OstTrace0( TRACE_NORMAL, DUP4_CMMSECURITYMESSHANDLER_MTCSTATEINFOINDL, "CMmSecurityMessHandler::MtcStateInfoIndL, CMT state already active" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMSECURITYMESSHANDLER_MTCSTATEINFOINDL_TD, "CMmSecurityMessHandler::MtcStateInfoIndL, CMT state already active" ); } //no else //3. CMT_STATE_NOT_READY - no action done in between state transition } @@ -832,7 +759,7 @@ TUint8 aTransactionId ) const { TFLOGSTRING("TSY: CMmSecurityMessHandler::MtcRfStatusQueryReq"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MTCRFSTATUSQUERYREQ, "CMmSecurityMessHandler::MtcRfStatusQueryReq" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MTCRFSTATUSQUERYREQ_TD, "CMmSecurityMessHandler::MtcRfStatusQueryReq" ); TBuf8<2> fillerData; fillerData.AppendFill( KSecPadding, 2 ); // Padding bytes @@ -853,7 +780,7 @@ const TIsiReceiveC& aIsiMessage ) const { TFLOGSTRING("NTSY: CMmSecurityMessHandler::MtcRfStatusQueryResp" ); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MTCRFSTATUSQUERYRESP, "CMmSecurityMessHandler::MtcRfStatusQueryResp" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MTCRFSTATUSQUERYRESP_TD, "CMmSecurityMessHandler::MtcRfStatusQueryResp" ); TUint8 currentRfState = aIsiMessage.Get8bit( ISI_HEADER_SIZE + MTC_RF_STATUS_QUERY_RESP_OFFSET_CURRENT ); @@ -865,11 +792,11 @@ if( MTC_RF_OFF == currentRfState ) { TFLOGSTRING("NTSY: CMmSecurityMessHandler::MtcRfStatusQueryResp - RF OFF" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_MTCRFSTATUSQUERYRESP, "CMmSecurityMessHandler::MtcRfStatusQueryResp, RF OFF" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_MTCRFSTATUSQUERYRESP_TD, "CMmSecurityMessHandler::MtcRfStatusQueryResp, RF OFF" ); statusInfo = ERfsStateInfoInactive; } TFLOGSTRING2("TSY: OFFLINE MODE IS: %d", statusInfo ); -OstTrace1( TRACE_NORMAL, DUP4_CMMSECURITYMESSHANDLER_MTCRFSTATUSQUERYRESP, "CMmSecurityMessHandler::MtcRfStatusQueryResp;statusInfo=%d", statusInfo ); +OstTrace1( TRACE_NORMAL, DUP4_CMMSECURITYMESSHANDLER_MTCRFSTATUSQUERYRESP_TD, "CMmSecurityMessHandler::MtcRfStatusQueryResp;statusInfo=%d", statusInfo ); CMmDataPackage dataPackage; dataPackage.PackData ( &statusInfo ); @@ -890,7 +817,7 @@ { TFLOGSTRING("TSY: CMmSecurityMessHandler::MtcStateQueryReq called" ); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MTCSTATEQUERYREQ, "CMmSecurityMessHandler::MtcStateQueryReq" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MTCSTATEQUERYREQ_TD, "CMmSecurityMessHandler::MtcStateQueryReq" ); TBuf8<2> fillerData; fillerData.AppendFill( KSecPadding, 2 ); // Padding bytes @@ -910,13 +837,13 @@ const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("NTSY: CMmSecurityMessHandler::MtcStateQueryRespL"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MTCSTATEQUERYRESPL, "CMmSecurityMessHandler::MtcStateQueryRespL" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MTCSTATEQUERYRESPL_TD, "CMmSecurityMessHandler::MtcStateQueryRespL" ); TUint8 currentState = aIsiMessage.Get8bit(ISI_HEADER_SIZE + MTC_STATE_QUERY_RESP_OFFSET_CURRENT); TUint8 nextState = aIsiMessage.Get8bit(ISI_HEADER_SIZE + MTC_STATE_QUERY_RESP_OFFSET_TARGET); TFLOGSTRING3("NTSY: CMmSecurityMessHandler::MtcStateQueryRespL - (current: 0x%02x, next: 0x%02x)",currentState, nextState ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_MTCSTATEQUERYRESPL, "CMmSecurityMessHandler::MtcStateQueryRespL;currentState=%hhx;nextState=%hhx", currentState, nextState ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_MTCSTATEQUERYRESPL_TD, "CMmSecurityMessHandler::MtcStateQueryRespL;currentState=%hhx;nextState=%hhx", currentState, nextState ); //CMT side is ready when state transistion is completed (in all normal cases this should be the case) @@ -924,13 +851,13 @@ if( currentState == nextState && iBootState.iMtcCurrentState != currentState ) { TFLOGSTRING("NTSY: CMmSecurityMessHandler::MtcStateQueryRespL - CMT ready." ); -OstTrace0( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_MTCSTATEQUERYRESPL, "CMmSecurityMessHandler::MtcStateQueryRespL, CMT ready" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_MTCSTATEQUERYRESPL_TD, "CMmSecurityMessHandler::MtcStateQueryRespL, CMT ready" ); iBootState.iMtcCurrentState = currentState; - if( MTC_NORMAL == currentState ) + if( MTC_NORMAL == currentState || MTC_RF_INACTIVE == currentState ) { TFLOGSTRING("NTSY: CMmSecurityMessHandler::MtcStateQueryRespL - EMmTsyBootNotifyModemStatusReadyIPC"); -OstTrace0( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_MTCSTATEQUERYRESPL, "CMmSecurityMessHandler::MtcStateQueryRespL, EMmTsyBootNotifyModemStatusReadyIPC" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_MTCSTATEQUERYRESPL_TD, "CMmSecurityMessHandler::MtcStateQueryRespL, EMmTsyBootNotifyModemStatusReadyIPC" ); iMessageRouter->Complete( EMmTsyBootNotifyModemStatusReadyIPC, KErrNone ); } //to complete EMmTsyBootGetRFStatusIPC @@ -940,7 +867,7 @@ else if ( currentState != nextState ) { TFLOGSTRING("NTSY: CMmSecurityMessHandler::MtcStateQueryRespL - CMT state transition not ready."); -OstTrace0( TRACE_NORMAL, DUP4_CMMSECURITYMESSHANDLER_MTCSTATEQUERYRESPL, "CMmSecurityMessHandler::MtcStateQueryRespL, CMT state transition not ready" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMSECURITYMESSHANDLER_MTCSTATEQUERYRESPL_TD, "CMmSecurityMessHandler::MtcStateQueryRespL, CMT state transition not ready" ); MtcStateQueryReq( KSecurityTransId ); } //no else //3. CMT_STATE_READY _AND_ CURRENT_STATE_OLD - no action needed if state already active @@ -971,7 +898,7 @@ ISI_HEADER_SIZE + MCE_MODEM_STATE_IND_OFFSET_ACTION ) ); TFLOGSTRING3("TSY: CMmSecurityMessHandler::MceModemStateInd action: 0x%02x, state: 0x%02x", action, state); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_MCEMODEMSTATEIND, "CMmSecurityMessHandler::MceModemStateInd;state=%hhx;action=%hhx", state, action ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_MCEMODEMSTATEIND_TD, "CMmSecurityMessHandler::MceModemStateInd;state=%hhx;action=%hhx", state, action ); // Modem is ready and CMT status has been changed if ( MCE_READY == action && iBootState.iMceCurrentState != state ) @@ -979,7 +906,7 @@ iBootState.iMceCurrentState = state; TFLOGSTRING("NTSY: CMmSecurityMessHandler::MceModemStateInd - CMT state transition occurred - MCE_NORMAL"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MCEMODEMSTATEIND, "CMmSecurityMessHandler::MceModemStateInd - CMT state transition occurred - MCE_NORMAL" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MCEMODEMSTATEIND_TD, "CMmSecurityMessHandler::MceModemStateInd - CMT state transition occurred - MCE_NORMAL" ); iMessageRouter->Complete( EMmTsyBootNotifyModemStatusReadyIPC, @@ -996,7 +923,7 @@ else if( MCE_READY == action && iBootState.iMceCurrentState == state ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::MceModemStateInd - CMT state mot changed"); -OstTrace0( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_MCEMODEMSTATEIND, "CMmSecurityMessHandler::MceModemStateInd - CMT state not changed" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_MCEMODEMSTATEIND_TD, "CMmSecurityMessHandler::MceModemStateInd - CMT state not changed" ); } // No else, modem state not ready - no action needed } @@ -1009,7 +936,7 @@ TInt CMmSecurityMessHandler::MceRfStateQueryReq() const { TFLOGSTRING("TSY: CMmSecurityMessHandler::MceRfStateQueryReq"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MCERFSTATEQUERYREQ, "CMmSecurityMessHandler::MceRfStateQueryReq" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MCERFSTATEQUERYREQ_TD, "CMmSecurityMessHandler::MceRfStateQueryReq" ); // Create MCE_RF_STATE_QUERY_REQ message for querying modem state TIsiSend isiMsg( iPhoNetSender->SendBufferDes() ); @@ -1032,7 +959,7 @@ const TIsiReceiveC& aIsiMessage ) const { TFLOGSTRING("NTSY: CMmSecurityMessHandler::MceRfStateQueryResp" ); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MCERFSTATEQUERYRESP, "CMmSecurityMessHandler::MceRfStateQueryResp" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MCERFSTATEQUERYRESP_TD, "CMmSecurityMessHandler::MceRfStateQueryResp" ); TUint8 currentRfState( aIsiMessage.Get8bit( ISI_HEADER_SIZE + MCE_RF_STATE_QUERY_RESP_OFFSET_CURRENT ) ); @@ -1046,7 +973,7 @@ } TFLOGSTRING2("NTSY: CMmSecurityMessHandler::MceRfStateQueryResp: RF State is: %d", statusInfo ); -OstTrace1( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_MCERFSTATEQUERYRESP, "CMmSecurityMessHandler::MceRfStateQueryResp;statusInfo=%d", statusInfo ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_MCERFSTATEQUERYRESP_TD, "CMmSecurityMessHandler::MceRfStateQueryResp;statusInfo=%d", statusInfo ); CMmDataPackage dataPackage; dataPackage.PackData ( &statusInfo ); @@ -1066,7 +993,7 @@ TInt CMmSecurityMessHandler::MceModemStateQueryReq() const { TFLOGSTRING("TSY: CMmSecurityMessHandler::MceModemStateQueryReq" ); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MCEMODEMSTATEQUERYREQ, "CMmSecurityMessHandler::MceModemStateQueryReq" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MCEMODEMSTATEQUERYREQ_TD, "CMmSecurityMessHandler::MceModemStateQueryReq" ); // Create MCE_MODEM_STATE_QUERY_REQ message for querying modem state TIsiSend isiMsg( iPhoNetSender->SendBufferDes() ); @@ -1091,7 +1018,7 @@ const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("NTSY: CMmSecurityMessHandler::MceModemStateQueryResp"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MCEMODEMSTATEQUERYRESP, "CMmSecurityMessHandler::MceModemStateQueryResp" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_MCEMODEMSTATEQUERYRESP_TD, "CMmSecurityMessHandler::MceModemStateQueryResp" ); TUint8 currentState( aIsiMessage.Get8bit( ISI_HEADER_SIZE + MCE_MODEM_STATE_QUERY_RESP_OFFSET_CURRENT ) ); @@ -1099,7 +1026,7 @@ ISI_HEADER_SIZE + MCE_MODEM_STATE_QUERY_RESP_OFFSET_TARGET ) ); TFLOGSTRING3("NTSY: CMmSecurityMessHandler::MceModemStateQueryResp - (current: 0x%02x, next: 0x%02x)",currentState, nextState ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_MCEMODEMSTATEQUERYRESP, "CMmSecurityMessHandler::MceModemStateQueryResp;currentState=%hhx;nextState=%hhx", currentState, nextState ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_MCEMODEMSTATEQUERYRESP_TD, "CMmSecurityMessHandler::MceModemStateQueryResp;currentState=%hhx;nextState=%hhx", currentState, nextState ); // CMT side is ready when state transistion is completed // (in all normal cases this should be the case) @@ -1109,14 +1036,14 @@ iBootState.iMceCurrentState != currentState ) { TFLOGSTRING("NTSY: CMmSecurityMessHandler::MceModemStateQueryResp - CMT ready." ); -OstTrace0( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_MCEMODEMSTATEQUERYRESP, "CMmSecurityMessHandler::MceModemStateQueryResp - CMT ready" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_MCEMODEMSTATEQUERYRESP_TD, "CMmSecurityMessHandler::MceModemStateQueryResp - CMT ready" ); iBootState.iMceCurrentState = currentState; if( MCE_NORMAL == currentState ) { TFLOGSTRING("NTSY: CMmSecurityMessHandler::MceModemStateQueryResp - EMmTsyBootNotifyModemStatusReadyIPC"); -OstTrace0( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_MCEMODEMSTATEQUERYRESP, "CMmSecurityMessHandler::MceModemStateQueryResp- EMmTsyBootNotifyModemStatusReadyIPC" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_MCEMODEMSTATEQUERYRESP_TD, "CMmSecurityMessHandler::MceModemStateQueryResp- EMmTsyBootNotifyModemStatusReadyIPC" ); iMessageRouter->Complete( EMmTsyBootNotifyModemStatusReadyIPC, KErrNone ); @@ -1130,7 +1057,7 @@ else if ( currentState != nextState ) { TFLOGSTRING("NTSY: CMmSecurityMessHandler::MceModemStateQueryResp - CMT state transition not ready."); -OstTrace0( TRACE_NORMAL, DUP4_CMMSECURITYMESSHANDLER_MCEMODEMSTATEQUERYRESP, "CMmSecurityMessHandler::MceModemStateQueryResp -- CMT state transition not ready" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMSECURITYMESSHANDLER_MCEMODEMSTATEQUERYRESP_TD, "CMmSecurityMessHandler::MceModemStateQueryResp -- CMT state transition not ready" ); MceModemStateQueryReq(); } } @@ -1143,7 +1070,7 @@ // void CMmSecurityMessHandler::UiccPinInd( const TIsiReceiveC& aIsiMessage ) { -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCPININD, "CMmSecurityMessHandler::UiccPinInd" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCPININD_TD, "CMmSecurityMessHandler::UiccPinInd" ); TFLOGSTRING("TSY: CMmSecurityMessHandler::UiccPinInd"); // Event to be completed @@ -1224,7 +1151,7 @@ const RMobilePhone::TMobilePassword& aUnblockCode ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::UiccPinReqVerify"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCPINREQ, "CMmSecurityMessHandler::UiccPinReqVerify" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCPINREQ_TD, "CMmSecurityMessHandler::UiccPinReqVerify" ); TUint8 numOfSubblocks( 1 ); // in case of PIN verify TUint8 pinQualifier( UICC_PIN_OLD ); // in case of PIN verify @@ -1310,7 +1237,7 @@ // void CMmSecurityMessHandler::UiccPinResp( const TIsiReceiveC& aIsiMessage ) { -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCPINRESP, "CMmSecurityMessHandler::UiccPinResp" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCPINRESP_TD, "CMmSecurityMessHandler::UiccPinResp" ); TFLOGSTRING("TSY: CMmSecurityMessHandler::UiccPinResp"); // Get service type and status @@ -1325,6 +1252,7 @@ case UICC_PIN_UNBLOCK: { HandleUiccPinVerifyResp( status, aIsiMessage ); + CompleteIfCodeVerified( status ); break; } case UICC_PIN_INFO: @@ -1352,6 +1280,74 @@ } // ----------------------------------------------------------------------------- +// CMmSecurityMessHandler::CompleteIfCodeVerified +// Breaks a UICC_PIN_RESP ISI-message. +// ----------------------------------------------------------------------------- +// +void CMmSecurityMessHandler::CompleteIfCodeVerified( const TUint8 aStatus ) + { +TFLOGSTRING("TSY: CMmSecurityMessHandler::CompleteIfCodeVerified"); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_COMPLETEIFCODEVERIFIED_TD, "CMmSecurityMessHandler::CompleteIfCodeVerified" ); + + RMobilePhone::TMobilePhoneSecurityEvent event( RMobilePhone::ENoICCFound ); + + if ( UICC_STATUS_OK == aStatus ) + { + switch ( iSecurityCode ) + { + case RMobilePhone::ESecurityUniversalPin: + { + event = RMobilePhone::EUniversalPinVerified; + break; + } + case RMobilePhone::ESecurityCodePin1: + { + event = RMobilePhone::EPin1Verified; + break; + } + case RMobilePhone::ESecurityCodePin2: + { + event = RMobilePhone::EPin2Verified; + break; + } + case RMobilePhone::ESecurityUniversalPuk: + { + event = RMobilePhone::EUniversalPukVerified; + break; + } + case RMobilePhone::ESecurityCodePuk1: + { + event = RMobilePhone::EPuk1Verified; + break; + } + case RMobilePhone::ESecurityCodePuk2: + { + event = RMobilePhone::EPuk2Verified; + break; + } + default: + { +OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_COMPLETEIFCODEVERIFIED_TD, "CMmSecurityMessHandler::CompleteIfCodeVerified - Default" ); +TFLOGSTRING("TSY: CMmSecurityMessHandler::CompleteIfCodeVerified - Default!"); + break; + } + + } //end of switch + } + if ( RMobilePhone::ENoICCFound != event ) + { + // Complete notify security event + CMmDataPackage dataPackage; + dataPackage.PackData( &event ); + + iMessageRouter->Complete( + EMobilePhoneNotifySecurityEvent, + &dataPackage, + KErrNone ); + } + } + +// ----------------------------------------------------------------------------- // CMmSecurityMessHandler::UiccPinReqStateQuery // Creates and sends UICC_PIN_REQ ISI message. // ----------------------------------------------------------------------------- @@ -1360,7 +1356,7 @@ const RMobilePhone::TMobilePhoneLock aLock ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::UiccPinReqStateQuery"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCPINREQSTATEQUERY, "CMmSecurityMessHandler::UiccPinReqStateQuery" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCPINREQSTATEQUERY_TD, "CMmSecurityMessHandler::UiccPinReqStateQuery" ); TUint8 pinId( 0 ); @@ -1433,7 +1429,7 @@ const RMobilePhone::TMobilePassword& aNewCode ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::UiccPinReqChange"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCPINREQCHANGE, "CMmSecurityMessHandler::UiccPinReqChange" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCPINREQCHANGE_TD, "CMmSecurityMessHandler::UiccPinReqChange" ); TUint8 pinId( 0 ); if ( RMobilePhone::ESecurityCodePin1 == aType ) @@ -1527,7 +1523,7 @@ const RMobilePhone::TMobilePassword& aCode ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::UiccPinReqChangeState"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCPINREQCHANGESTATE, "CMmSecurityMessHandler::UiccPinReqChangeState" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_UICCPINREQCHANGESTATE_TD, "CMmSecurityMessHandler::UiccPinReqChangeState" ); TInt ret( KErrNone ); TUint8 pinId( KUniversalPinKeyReference ); @@ -1644,7 +1640,7 @@ const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::HandleUiccPinVerifyResp"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_HANDLEUICCPINVERIFYRESP, "CMmSecurityMessHandler::HandleUiccPinVerifyResp" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_HANDLEUICCPINVERIFYRESP_TD, "CMmSecurityMessHandler::HandleUiccPinVerifyResp" ); TInt ret( KErrNone ); @@ -1702,7 +1698,7 @@ const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::HandleUiccPinInfoResp"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_HANDLEUICCPININFORESP, "CMmSecurityMessHandler::HandleUiccPinInfoResp" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_HANDLEUICCPININFORESP_TD, "CMmSecurityMessHandler::HandleUiccPinInfoResp" ); TInt ret( KErrNone ); CMmDataPackage dataPackage; @@ -1809,7 +1805,7 @@ const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::HandleUiccPinChangeResp"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_HANDLEUICCPINCHANGERESP, "CMmSecurityMessHandler::HandleUiccPinChangeResp" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_HANDLEUICCPINCHANGERESP_TD, "CMmSecurityMessHandler::HandleUiccPinChangeResp" ); TInt ret( KErrNone ); if ( UICC_STATUS_OK != aStatus ) @@ -1871,7 +1867,7 @@ const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::HandleUiccPinStateChangeResp"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_HANDLEUICCPINSTATECHANGERESP, "CMmSecurityMessHandler::HandleUiccPinStateChangeResp" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_HANDLEUICCPINSTATECHANGERESP_TD, "CMmSecurityMessHandler::HandleUiccPinStateChangeResp" ); TInt ret( KErrNone ); // Status and setting values are not used in CTSY, set to 'unknown' @@ -1946,7 +1942,7 @@ void CMmSecurityMessHandler::GetIccType() { TFLOGSTRING("TSY: CMmSecurityMessHandler::GetIccType"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_GETICCTYPE, "CMmSecurityMessHandler::GetIccType" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_GETICCTYPE_TD, "CMmSecurityMessHandler::GetIccType" ); TInt ret( KErrNone ); TICCType type ( EICCTypeSimUnknown ); @@ -1980,7 +1976,7 @@ void CMmSecurityMessHandler::GetActivePin() { TFLOGSTRING("TSY: CMmSecurityMessHandler::GetActivePin"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_GETACTIVEPIN, "CMmSecurityMessHandler::GetActivePin" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_GETACTIVEPIN_TD, "CMmSecurityMessHandler::GetActivePin" ); RMobilePhone::TMobilePhoneSecurityCode activePin( iMmUiccMessHandler->GetActivePin()); CMmDataPackage dataPackage; @@ -1999,7 +1995,7 @@ void CMmSecurityMessHandler::GetActiveUsimApplication() { TFLOGSTRING("TSY: CMmSecurityMessHandler::GetActiveUsimApplication"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_GETACTIVEUSIMAPPLICATION, "CMmSecurityMessHandler::GetActiveUsimApplication" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_GETACTIVEUSIMAPPLICATION_TD, "CMmSecurityMessHandler::GetActiveUsimApplication" ); RMobilePhone::TAID aid( iMmUiccMessHandler->GetAid() ); CMmDataPackage dataPackage; @@ -2018,7 +2014,7 @@ TInt CMmSecurityMessHandler::GetPukCodeReq() { TFLOGSTRING("TSY: CMmSecurityMessHandler::GetPukCodeReq"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_GETPUKCODEREQ, "CMmSecurityMessHandler::GetPukCodeReq" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_GETPUKCODEREQ_TD, "CMmSecurityMessHandler::GetPukCodeReq" ); return iPukCodeRequired; } @@ -2030,7 +2026,7 @@ TInt CMmSecurityMessHandler::ReadEfEst( TUiccTrId aTraId ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::ReadEfEst"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_READEFEST, "CMmSecurityMessHandler::ReadEfEst" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_READEFEST_TD, "CMmSecurityMessHandler::ReadEfEst" ); // Set parameters for UICC_APPL_CMD_REQ message TUiccReadTransparent params; @@ -2062,7 +2058,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::ProcessUiccMsg"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_PROCESSUICCMSG, "CMmSecurityMessHandler::ProcessUiccMsg" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_PROCESSUICCMSG_TD, "CMmSecurityMessHandler::ProcessUiccMsg" ); TInt ret( KErrNone ); @@ -2101,7 +2097,7 @@ default: { TFLOGSTRING("TSY: CMmSecurityMessHandler::ProcessUiccMsg - unknown transaction ID" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_PROCESSUICCMSG, "CMmSecurityMessHandler::ProcessUiccMsg - unknown transaction ID" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_PROCESSUICCMSG_TD, "CMmSecurityMessHandler::ProcessUiccMsg - unknown transaction ID" ); break; } } @@ -2118,7 +2114,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::FdnSetReadEfEstResp"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_FDNSETREADEFESTRESP, "CMmSecurityMessHandler::FdnSetReadEfEstResp" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_FDNSETREADEFESTRESP_TD, "CMmSecurityMessHandler::FdnSetReadEfEstResp" ); if( UICC_STATUS_OK == aStatus ) { @@ -2163,14 +2159,14 @@ { // state is already correct, let's just complete the request TFLOGSTRING("TSY: CMmSecurityMessHandler::FdnSetReadEfEstResp: FDN state already correct, let's complete"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_FDNSETREADEFESTRESP, "CMmSecurityMessHandler::FdnSetReadEfEstResp: FDN state already correct, let's complete" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_FDNSETREADEFESTRESP_TD, "CMmSecurityMessHandler::FdnSetReadEfEstResp: FDN state already correct, let's complete" ); iMessageRouter->Complete( EMobilePhoneSetFdnSetting, KErrNone ); } } else { TFLOGSTRING("TSY: CMmSecurityMessHandler::FdnSetReadEfEstResp: FDN state not supported in EFust"); -OstTrace0( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_FDNSETREADEFESTRESP, "CMmSecurityMessHandler::FdnSetReadEfEstResp: FDN state not supported in EFust" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_FDNSETREADEFESTRESP_TD, "CMmSecurityMessHandler::FdnSetReadEfEstResp: FDN state not supported in EFust" ); iMessageRouter->Complete( EMobilePhoneSetFdnSetting, KErrNotSupported ); } } @@ -2178,7 +2174,7 @@ { // error in reading EFest, let's complete the request TFLOGSTRING2("TSY: CMmSecurityMessHandler::FdnSetReadEfEstResp: reading failed, 0x%x", aStatus); -OstTrace1( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_FDNSETREADEFESTRESP, "CMmSecurityMessHandler::FdnSetReadEfEstResp: reading failed, 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_FDNSETREADEFESTRESP_TD, "CMmSecurityMessHandler::FdnSetReadEfEstResp: reading failed, 0x%x", aStatus ); // compete setting of FDN state iMessageRouter->Complete( EMobilePhoneSetFdnSetting, KErrGeneral ); @@ -2195,7 +2191,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::FdnGetReadEfEstResp"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_FDNGETREADEFESTRESP, "CMmSecurityMessHandler::FdnGetReadEfEstResp" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_FDNGETREADEFESTRESP_TD, "CMmSecurityMessHandler::FdnGetReadEfEstResp" ); RMobilePhone::TMobilePhoneFdnStatus fdnSetting( RMobilePhone::EFdnNotActive ); @@ -2227,7 +2223,7 @@ { // error in reading EFest, let's complete the request TFLOGSTRING2("TSY: CMmSecurityMessHandler::FdnGetReadEfEstResp: reading failed, 0x%x", aStatus); -OstTrace1( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_FDNGETREADEFESTRESP, "CMmSecurityMessHandler::FdnGetReadEfEstResp: reading failed, 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_FDNGETREADEFESTRESP_TD, "CMmSecurityMessHandler::FdnGetReadEfEstResp: reading failed, 0x%x", aStatus ); fdnSetting = RMobilePhone::EFdnNotSupported; CMmDataPackage dataPackage; @@ -2245,18 +2241,18 @@ void CMmSecurityMessHandler::WriteEfEstResp( const TInt aStatus ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::WriteEfEstResp"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_WRITEEFESTRESP, "CMmSecurityMessHandler::WriteEfEstResp" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_WRITEEFESTRESP_TD, "CMmSecurityMessHandler::WriteEfEstResp" ); if( UICC_STATUS_OK == aStatus ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::WriteEfEstResp: FDN state set succesfully"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_WRITEEFESTRESP, "CMmSecurityMessHandler::WriteEfEstResp: FDN state set succesfully" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_WRITEEFESTRESP_TD, "CMmSecurityMessHandler::WriteEfEstResp: FDN state set succesfully" ); iMessageRouter->Complete( EMobilePhoneSetFdnSetting, KErrNone ); } else { TFLOGSTRING("TSY: CMmSecurityMessHandler::WriteEfEstResp: FDN state set failed"); -OstTrace0( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_WRITEEFESTRESP, "CMmSecurityMessHandler::WriteEfEstResp: FDN state set failed" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_WRITEEFESTRESP_TD, "CMmSecurityMessHandler::WriteEfEstResp: FDN state set failed" ); iMessageRouter->Complete( EMobilePhoneSetFdnSetting, KErrGeneral ); } } @@ -2270,7 +2266,7 @@ TInt CMmSecurityMessHandler::SendFdnStateCommand() { TFLOGSTRING("TSY: CMmSecurityMessHandler::SendFdnStateCommand"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_SENDFDNSTATECOMMAND, "CMmSecurityMessHandler::SendFdnStateCommand" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_SENDFDNSTATECOMMAND_TD, "CMmSecurityMessHandler::SendFdnStateCommand" ); TInt ret( 0 ); TUiccSendApdu params; @@ -2309,7 +2305,7 @@ else { TFLOGSTRING("TSY: CMmSecurityMessHandler::SendFdnStateCommand: unknown FDN state"); - OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_SENDFDNSTATECOMMAND, "CMmSecurityMessHandler::SendFdnStateCommand: unknown FDN state" ); + OstTrace0( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_SENDFDNSTATECOMMAND_TD, "CMmSecurityMessHandler::SendFdnStateCommand: unknown FDN state" ); ret = KErrArgument; } @@ -2326,7 +2322,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::SendFdnStateCommand"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_FDNSTATECOMMANDRESP, "CMmSecurityMessHandler::FdnStateCommandResp" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_FDNSTATECOMMANDRESP_TD, "CMmSecurityMessHandler::FdnStateCommandResp" ); if( UICC_STATUS_OK == aStatus ) { @@ -2335,7 +2331,7 @@ TUint8 sw2( aFileData[aFileData.Length() - KSw2Position] ); TFLOGSTRING3("TSY: CMmSecurityMessHandler::SendFdnStateCommand: sw1: 0x%x, sw2: 0x%x", sw1, sw2); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_FDNSTATECOMMANDRESP, "CMmSecurityMessHandler::FdnStateCommandResp: sw1: 0x%x, sw2: 0x%x", sw1, sw2 ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_FDNSTATECOMMANDRESP_TD, "CMmSecurityMessHandler::FdnStateCommandResp: sw1: 0x%x, sw2: 0x%x", sw1, sw2 ); TInt ret( KErrGeneral ); @@ -2353,7 +2349,7 @@ else { TFLOGSTRING2("TSY: CMmSecurityMessHandler::SendFdnStateCommand, Fdn state set failed: 0x%x", aStatus); -OstTrace1( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_FDNSTATECOMMANDRESP, "CMmSecurityMessHandler::FdnStateCommandResp, Fdn state set failed: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_FDNSTATECOMMANDRESP_TD, "CMmSecurityMessHandler::FdnStateCommandResp, Fdn state set failed: 0x%x", aStatus ); iMessageRouter->Complete( EMobilePhoneSetFdnSetting, KErrGeneral ); } } @@ -2366,7 +2362,7 @@ TInt CMmSecurityMessHandler::ReadEfAdnFileInfo( TUiccTrId aTraId ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::ReadEfAdnFileInfo"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_READEFADNFILEINFO, "CMmSecurityMessHandler::ReadEfAdnFileInfo" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_READEFADNFILEINFO_TD, "CMmSecurityMessHandler::ReadEfAdnFileInfo" ); TUiccApplFileInfo params; params.messHandlerPtr = static_cast( this ); @@ -2392,7 +2388,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::FdnSetReadEfAdnFileInfoResp"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_FDNSETREADEFADNFILEINFORESP, "CMmSecurityMessHandler::FdnSetReadEfAdnFileInfoResp" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_FDNSETREADEFADNFILEINFORESP_TD, "CMmSecurityMessHandler::FdnSetReadEfAdnFileInfoResp" ); if( UICC_STATUS_OK == aStatus ) { @@ -2414,7 +2410,7 @@ // Current FDN state is already correct, so we can // complete the request TFLOGSTRING("TSY: CMmSecurityMessHandler::FdnSetReadEfAdnFileInfoResp: FDN state already correct, let's complete"); -OstTrace0( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_FDNSETREADEFADNFILEINFORESP, "CMmSecurityMessHandler::FdnSetReadEfAdnFileInfoResp: FDN state already correct, let's complete" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSECURITYMESSHANDLER_FDNSETREADEFADNFILEINFORESP_TD, "CMmSecurityMessHandler::FdnSetReadEfAdnFileInfoResp: FDN state already correct, let's complete" ); iMessageRouter->Complete( EMobilePhoneSetFdnSetting, KErrNone ); } else @@ -2426,7 +2422,7 @@ else { TFLOGSTRING("TSY: CMmSecurityMessHandler::FdnSetReadEfAdnFileInfoResp: FDN or ADN not supported in EFsst"); -OstTrace0( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_FDNSETREADEFADNFILEINFORESP, "CMmSecurityMessHandler::FdnSetReadEfAdnFileInfoResp: FDN or ADN not supported in EFsst" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMSECURITYMESSHANDLER_FDNSETREADEFADNFILEINFORESP_TD, "CMmSecurityMessHandler::FdnSetReadEfAdnFileInfoResp: FDN or ADN not supported in EFsst" ); iMessageRouter->Complete( EMobilePhoneSetFdnSetting, KErrNotSupported ); } @@ -2434,7 +2430,7 @@ else { TFLOGSTRING2("TSY: CMmSecurityMessHandler::FdnSetReadEfAdnFileInfoResp: reading failed: 0x%x", aStatus); -OstTrace1( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_FDNSETREADEFADNFILEINFORESP, "CMmSecurityMessHandler::FdnSetReadEfAdnFileInfoResp: reading failed: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_FDNSETREADEFADNFILEINFORESP_TD, "CMmSecurityMessHandler::FdnSetReadEfAdnFileInfoResp: reading failed: 0x%x", aStatus ); iMessageRouter->Complete( EMobilePhoneSetFdnSetting, KErrNotSupported ); } @@ -2451,7 +2447,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmSecurityMessHandler::FdnGetReadEfAdnFileInfoResp"); -OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_FDNGETREADEFADNFILEINFORESP, "CMmSecurityMessHandler::FdnGetReadEfAdnFileInfoResp" ); +OstTrace0( TRACE_NORMAL, CMMSECURITYMESSHANDLER_FDNGETREADEFADNFILEINFORESP_TD, "CMmSecurityMessHandler::FdnGetReadEfAdnFileInfoResp" ); RMobilePhone::TMobilePhoneFdnStatus fdnSetting( RMobilePhone::EFdnNotActive ); @@ -2483,7 +2479,7 @@ else { TFLOGSTRING2("TSY: CMmSecurityMessHandler::FdnGetReadEfAdnFileInfoResp: reading failed: 0x%x", aStatus); -OstTrace1( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_FDNGETREADEFADNFILEINFORESP, "CMmSecurityMessHandler::FdnGetReadEfAdnFileInfoResp: reading failed: 0x%x", aStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSECURITYMESSHANDLER_FDNGETREADEFADNFILEINFORESP_TD, "CMmSecurityMessHandler::FdnGetReadEfAdnFileInfoResp: reading failed: 0x%x", aStatus ); fdnSetting = RMobilePhone::EFdnNotSupported; CMmDataPackage dataPackage; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmsmscache.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmsmscache.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmsmscache.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -62,7 +62,7 @@ CMmSmsCache::CMmSmsCache() { TFLOGSTRING("TSY: CMmSmsCache::CMmSmsCache"); -OstTrace0( TRACE_NORMAL, CMMSMSCACHE_CMMSMSCACHE, "CMmSmsCache::CMmSmsCache" ); +OstTrace0( TRACE_NORMAL, CMMSMSCACHE_CMMSMSCACHE_TD, "CMmSmsCache::CMmSmsCache" ); Reset(); // If SIM is offline,then won't get // sim ready completion and cache error state stays as @@ -79,7 +79,7 @@ CMmSmsCache::~CMmSmsCache() { TFLOGSTRING("TSY: CMmSmsCache::~CMmSmsCache"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSCACHE_CMMSMSCACHE, "CMmSmsCache::~CMmSmsCache" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSCACHE_CMMSMSCACHE_TD, "CMmSmsCache::~CMmSmsCache" ); Reset(); } @@ -91,7 +91,7 @@ void CMmSmsCache::Reset() { TFLOGSTRING("TSY: CMmSmsCache::Reset"); -OstTrace0( TRACE_NORMAL, CMMSMSCACHE_RESET, "CMmSmsCache::Reset" ); +OstTrace0( TRACE_NORMAL, CMMSMSCACHE_RESET_TD, "CMmSmsCache::Reset" ); iError = KErrNotReady; iDeleteLocation = 0; @@ -112,7 +112,7 @@ TInt CMmSmsCache::UsedEntries() { TFLOGSTRING("TSY: CMmSmsCache::UsedEntries"); -OstTrace0( TRACE_NORMAL, CMMSMSCACHE_USEDENTRIES, "CMmSmsCache::UsedEntries" ); +OstTrace0( TRACE_NORMAL, CMMSMSCACHE_USEDENTRIES_TD, "CMmSmsCache::UsedEntries" ); TInt count( 0 ); for ( TInt i = 0; i < iElements.Count(); i++ ) { @@ -132,7 +132,7 @@ TInt CMmSmsCache::TotalEntries() { TFLOGSTRING2("TSY: CMmSmsCache::TotalEntries: %d",iElements.Count()); -OstTrace1( TRACE_NORMAL, CMMSMSCACHE_TOTALENTRIES, "CMmSmsCache::TotalEntries;iElements.Count=%d", iElements.Count() ); +OstTrace1( TRACE_NORMAL, CMMSMSCACHE_TOTALENTRIES_TD, "CMmSmsCache::TotalEntries;iElements.Count=%d", iElements.Count() ); return iElements.Count(); } @@ -146,7 +146,7 @@ TInt CMmSmsCache::Status() { TFLOGSTRING("TSY: CMmSmsCache::Status"); -OstTrace0( TRACE_NORMAL, CMMSMSCACHE_STATUS, "CMmSmsCache::Status" ); +OstTrace0( TRACE_NORMAL, CMMSMSCACHE_STATUS_TD, "CMmSmsCache::Status" ); return iError; } @@ -158,7 +158,7 @@ void CMmSmsCache::SetStatus( TInt aError ) { TFLOGSTRING2("TSY: CMmSmsCache::SetStatus %d", aError); -OstTrace1( TRACE_NORMAL, CMMSMSCACHE_SETSTATUS, "CMmSmsCache::SetStatus;aError=%d", aError ); +OstTrace1( TRACE_NORMAL, CMMSMSCACHE_SETSTATUS_TD, "CMmSmsCache::SetStatus;aError=%d", aError ); iError = aError; } @@ -171,7 +171,7 @@ void CMmSmsCache::SetTotalEntriesL( TInt aTotal ) { TFLOGSTRING2("TSY: CMmSmsCache::SetTotalEntriesL %d", aTotal); -OstTrace1( TRACE_NORMAL, CMMSMSCACHE_SETTOTALENTRIESL, "CMmSmsCache::SetTotalEntriesL;aTotal=%d", aTotal ); +OstTrace1( TRACE_NORMAL, CMMSMSCACHE_SETTOTALENTRIESL_TD, "CMmSmsCache::SetTotalEntriesL;aTotal=%d", aTotal ); RMobileSmsStore::TMobileGsmSmsEntryV1* element = NULL; for ( TInt i = 0; i < aTotal; i++ ) @@ -193,7 +193,7 @@ const TUint8 aRecordId ) { TFLOGSTRING("TSY: CMmSmsCache::AddEntryL"); -OstTrace0( TRACE_NORMAL, CMMSMSCACHE_ADDENTRYL, "CMmSmsCache::AddEntryL" ); +OstTrace0( TRACE_NORMAL, CMMSMSCACHE_ADDENTRYL_TD, "CMmSmsCache::AddEntryL" ); if ( 0 < iElements.Count() ) { @@ -229,7 +229,7 @@ RMobileSmsStore::TMobileGsmSmsEntryV1* CMmSmsCache::GetEntry( TInt aLocation ) { TFLOGSTRING2("TSY: CMmSmsCache::GetEntry - location: %d", aLocation); -OstTrace1( TRACE_NORMAL, CMMSMSCACHE_GETENTRY, "CMmSmsCache::GetEntry;aLocation=%d", aLocation ); +OstTrace1( TRACE_NORMAL, CMMSMSCACHE_GETENTRY_TD, "CMmSmsCache::GetEntry;aLocation=%d", aLocation ); RMobileSmsStore::TMobileGsmSmsEntryV1* smsData = NULL; if ( aLocation <= iElements.Count() && aLocation >= 1 ) { @@ -252,7 +252,7 @@ TUint CMmSmsCache::FirstFreeLocation() { TFLOGSTRING("TSY: CMmSmsCache::FirstFreeLocation"); -OstTrace0( TRACE_NORMAL, CMMSMSCACHE_FIRSTFREELOCATION, "CMmSmsCache::FirstFreeLocation" ); +OstTrace0( TRACE_NORMAL, CMMSMSCACHE_FIRSTFREELOCATION_TD, "CMmSmsCache::FirstFreeLocation" ); TInt location( 0 ); for ( TInt i = 0; i < iElements.Count(); i++ ) { @@ -263,7 +263,7 @@ } } TFLOGSTRING2("TSY: CMmSmsCache::FirstFreeLocation - found location: %d", location); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSCACHE_FIRSTFREELOCATION, "CMmSmsCache::FirstFreeLocation" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSCACHE_FIRSTFREELOCATION_TD, "CMmSmsCache::FirstFreeLocation" ); return location; } @@ -275,7 +275,7 @@ void CMmSmsCache::SetDeleteLocation( TInt aLocation ) { TFLOGSTRING2("TSY: CMmSmsCache::SetDeleteLocation %d", aLocation); -OstTrace1( TRACE_NORMAL, CMMSMSCACHE_SETDELETELOCATION, "CMmSmsCache::SetDeleteLocation;aLocation=%d", aLocation ); +OstTrace1( TRACE_NORMAL, CMMSMSCACHE_SETDELETELOCATION_TD, "CMmSmsCache::SetDeleteLocation;aLocation=%d", aLocation ); iDeleteLocation = aLocation; } @@ -287,7 +287,7 @@ void CMmSmsCache::Delete() { TFLOGSTRING("TSY: CMmSmsCache::Delete"); -OstTrace0( TRACE_NORMAL, CMMSMSCACHE_DELETE, "CMmSmsCache::Delete" ); +OstTrace0( TRACE_NORMAL, CMMSMSCACHE_DELETE_TD, "CMmSmsCache::Delete" ); if ( iDeleteLocation!=0 ) { Delete( iDeleteLocation ); @@ -303,7 +303,7 @@ void CMmSmsCache::Delete( TInt aLocation ) { TFLOGSTRING2("TSY: CMmSmsCache::Delete %d", aLocation); -OstTrace1( TRACE_NORMAL, DUP1_CMMSMSCACHE_DELETE, "CMmSmsCache::Delete;aLocation=%d", aLocation ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSMSCACHE_DELETE_TD, "CMmSmsCache::Delete;aLocation=%d", aLocation ); if ( aLocation <= iElements.Count() && aLocation >= 1 ) { @@ -320,7 +320,7 @@ void CMmSmsCache::DeleteAll() { TFLOGSTRING("TSY: CMmSmsCache::DeleteAll"); -OstTrace0( TRACE_NORMAL, CMMSMSCACHE_DELETEALL, "CMmSmsCache::DeleteAll" ); +OstTrace0( TRACE_NORMAL, CMMSMSCACHE_DELETEALL_TD, "CMmSmsCache::DeleteAll" ); for ( TInt i = 0; i < iElements.Count(); i++ ) { delete iElements[i]; @@ -338,7 +338,7 @@ RMobileSmsStore::TMobileSmsStoreStatus aMsgStatus ) { TFLOGSTRING2("TSY: CMmSmsCache::SetStorageStatus(loc=%d)", aLocation); -OstTrace1( TRACE_NORMAL, CMMSMSCACHE_SETSTORAGESTATUS, "CMmSmsCache::SetStorageStatus;aLocation=%d", aLocation ); +OstTrace1( TRACE_NORMAL, CMMSMSCACHE_SETSTORAGESTATUS_TD, "CMmSmsCache::SetStorageStatus;aLocation=%d", aLocation ); if ( aLocation <= iElements.Count() && aLocation >= 1 diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmsmsgsmaddress.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmsmsgsmaddress.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmsmsgsmaddress.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -64,7 +64,7 @@ ) { TFLOGSTRING("TSY: CMmSmsGsmAddress::CMmSmsGsmAddress"); -OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_CMMSMSGSMADDRESS, "CMmSmsGsmAddress::CMmSmsGsmAddress" ); +OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_CMMSMSGSMADDRESS_TD, "CMmSmsGsmAddress::CMmSmsGsmAddress" ); //none } @@ -84,7 +84,7 @@ ) { TFLOGSTRING("TSY: CMmSmsGsmAddress::GsmConvUnicodeTo0340Addr"); -OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMCONVUNICODETO0340ADDR, "CMmSmsGsmAddress::GsmConvUnicodeTo0340Addr" ); +OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMCONVUNICODETO0340ADDR_TD, "CMmSmsGsmAddress::GsmConvUnicodeTo0340Addr" ); if ( 0 != aSource.Length() ) { @@ -115,7 +115,7 @@ ) { TFLOGSTRING("TSY: CMmSmsGsmAddress::GsmConv0340AddrToUnicode"); -OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMCONV0340ADDRTOUNICODE, "CMmSmsGsmAddress::GsmConv0340AddrToUnicode" ); +OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMCONV0340ADDRTOUNICODE_TD, "CMmSmsGsmAddress::GsmConv0340AddrToUnicode" ); if ( KAddressMinLength <= aSource.Length() ) { @@ -147,7 +147,7 @@ ) { TFLOGSTRING("TSY: CMmSmsGsmAddress::GsmConvUnicodeTo0411Addr"); -OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMCONVUNICODETO0411ADDR, "CMmSmsGsmAddress::GsmConvUnicodeTo0411Addr" ); +OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMCONVUNICODETO0411ADDR_TD, "CMmSmsGsmAddress::GsmConvUnicodeTo0411Addr" ); if ( 0 != aSource.Length() ) { @@ -175,7 +175,7 @@ ) { TFLOGSTRING("TSY: CMmSmsGsmAddress::GsmConv0411AddrToUnicode"); -OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMCONV0411ADDRTOUNICODE, "CMmSmsGsmAddress::GsmConv0411AddrToUnicode" ); +OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMCONV0411ADDRTOUNICODE_TD, "CMmSmsGsmAddress::GsmConv0411AddrToUnicode" ); if ( KAddressMinLength <= aSource.Length() ) { @@ -208,9 +208,9 @@ ) { TFLOGSTRING4("TSY: CMmSmsGsmAddress::GsmConvUnicodeToAddr - number type: %d, numbering plan: %d, number: %S", aTon, aNpi, &aSource); -OstTraceExt3( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMCONVUNICODETOADDR, "CMmSmsGsmAddress::GsmConvUnicodeToAddr;aTon=%hhu;aNpi=%hhu;aSource=%S", aTon, aNpi, aSource ); +OstTraceExt3( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMCONVUNICODETOADDR_TD, "CMmSmsGsmAddress::GsmConvUnicodeToAddr;aTon=%hhu;aNpi=%hhu;aSource=%S", aTon, aNpi, aSource ); TFLOGSTRING2("TSY: CMmSmsGsmAddress::GsmConvUnicodeToAddr - GSM 03.40 address: %d", a0340Address); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSGSMADDRESS_GSMCONVUNICODETOADDR, "CMmSmsGsmAddress::GsmConvUnicodeToAddr;a0340Address=%hhu", a0340Address ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSGSMADDRESS_GSMCONVUNICODETOADDR_TD, "CMmSmsGsmAddress::GsmConvUnicodeToAddr;a0340Address=%hhu", a0340Address ); //get address length (always < 255) TUint8 numberLength( static_cast< TUint8 >( aSource.Length() ) ); @@ -357,7 +357,7 @@ ) { TFLOGSTRING("TSY: CMmSmsGsmAddress::GsmConvAddrToUnicode"); -OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMCONVADDRTOUNICODE, "CMmSmsGsmAddress::GsmConvAddrToUnicode" ); +OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMCONVADDRTOUNICODE_TD, "CMmSmsGsmAddress::GsmConvAddrToUnicode" ); TUint8 addrDataLength( 0 ); TBool halfs( ETrue ); @@ -452,9 +452,9 @@ } // while } TFLOGSTRING4("TSY: CMmSmsGsmAddress::GsmConvAddrToUnicode - result: number type: %d, numbering plan: %d, number: %S", aTon, aNpi, &aDest); -OstTraceExt3( TRACE_NORMAL, DUP1_CMMSMSGSMADDRESS_GSMCONVADDRTOUNICODE, "CMmSmsGsmAddress::GsmConvAddrToUnicode;aTon=%d;aNpi=%d;aDest=%S", aTon, aNpi, aDest ); +OstTraceExt3( TRACE_NORMAL, DUP1_CMMSMSGSMADDRESS_GSMCONVADDRTOUNICODE_TD, "CMmSmsGsmAddress::GsmConvAddrToUnicode;aTon=%d;aNpi=%d;aDest=%S", aTon, aNpi, aDest ); TFLOGSTRING2("TSY: CMmSmsGsmAddress::GsmConvAddrToUnicode - GSM 03.40 address", a0340Address); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMSMSGSMADDRESS_GSMCONVADDRTOUNICODE, "CMmSmsGsmAddress::GsmConvAddrToUnicode;a0340Address=%hhu", a0340Address ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMSMSGSMADDRESS_GSMCONVADDRTOUNICODE_TD, "CMmSmsGsmAddress::GsmConvAddrToUnicode;a0340Address=%hhu", a0340Address ); } // ----------------------------------------------------------------------------- @@ -472,7 +472,7 @@ ) { TFLOGSTRING2("TSY: CMmSmsGsmAddress::GsmFindOutTonAndNpi - address type: %d", typeOfAddress); -OstTraceExt1( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMFINDOUTTONANDNPI, "CMmSmsGsmAddress::GsmFindOutTonAndNpi;typeOfAddress=%hhu", typeOfAddress ); +OstTraceExt1( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMFINDOUTTONANDNPI_TD, "CMmSmsGsmAddress::GsmFindOutTonAndNpi;typeOfAddress=%hhu", typeOfAddress ); TUint8 numberingPlanIdentification( static_cast< TUint8 >( typeOfAddress & 0x0F ) ); @@ -515,7 +515,7 @@ default: { TFLOGSTRING("TSY: CMmSmsGsmAddress::GsmFindOutTonAndNpi - unknown type of number"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSGSMADDRESS_GSMFINDOUTTONANDNPI, "CMmSmsGsmAddress::GsmFindOutTonAndNpi, unknown type of number" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSGSMADDRESS_GSMFINDOUTTONANDNPI_TD, "CMmSmsGsmAddress::GsmFindOutTonAndNpi, unknown type of number" ); *ton = RMobilePhone::EUnknownNumber; break; } @@ -567,7 +567,7 @@ default: { TFLOGSTRING("TSY: CMmSmsGsmAddress::GsmFindOutTonAndNpi - unknown numbering plan"); -OstTrace0( TRACE_NORMAL, DUP2_CMMSMSGSMADDRESS_GSMFINDOUTTONANDNPI, "CMmSmsGsmAddress::GsmFindOutTonAndNpi, unknown numbering plan" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSMSGSMADDRESS_GSMFINDOUTTONANDNPI_TD, "CMmSmsGsmAddress::GsmFindOutTonAndNpi, unknown numbering plan" ); *npi = RMobilePhone::EUnknownNumberingPlan; break; } @@ -586,7 +586,7 @@ ) { TFLOGSTRING2("TSY: CMmSmsGsmAddress::GsmMapTonToTUint8 - type of number: %d", aTon); -OstTrace1( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMMAPTONTOTUINT8, "CMmSmsGsmAddress::GsmMapTonToTUint8;aTon=%d", aTon ); +OstTrace1( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMMAPTONTOTUINT8_TD, "CMmSmsGsmAddress::GsmMapTonToTUint8;aTon=%d", aTon ); TUint8 typeOfNumber( 0 ); switch ( aTon ) @@ -625,7 +625,7 @@ default: { TFLOGSTRING2("TSY: CMmSmsGsmAddress::GsmMapTonToTUint8 - unknown type of number: %d", aTon); -OstTrace1( TRACE_NORMAL, DUP1_CMMSMSGSMADDRESS_GSMMAPTONTOTUINT8, "CMmSmsGsmAddress::GsmMapTonToTUint8;unknown type of number aTon=%d", aTon ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSMSGSMADDRESS_GSMMAPTONTOTUINT8_TD, "CMmSmsGsmAddress::GsmMapTonToTUint8;unknown type of number aTon=%d", aTon ); typeOfNumber = KTonUnknown; } } @@ -645,7 +645,7 @@ ) { TFLOGSTRING2("TSY: CMmSmsGsmAddress::GsmMapNpiToTUint8 - numbering plan identification: %d", aNpi); -OstTrace1( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMMAPNPITOTUINT8, "CMmSmsGsmAddress::GsmMapNpiToTUint8;aNpi=%d", aNpi ); +OstTrace1( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMMAPNPITOTUINT8_TD, "CMmSmsGsmAddress::GsmMapNpiToTUint8;aNpi=%d", aNpi ); TUint8 numPlanIdentification( 0 ); @@ -695,7 +695,7 @@ default: { TFLOGSTRING2("TSY: CMmSmsGsmAddress::GsmMapNpiToTUint8 - unknown numbering plan identification: %d", aNpi); -OstTrace1( TRACE_NORMAL, DUP1_CMMSMSGSMADDRESS_GSMMAPNPITOTUINT8, "CMmSmsGsmAddress::GsmMapNpiToTUint8;unknown numbering plan identification aNpi=%d", aNpi ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSMSGSMADDRESS_GSMMAPNPITOTUINT8_TD, "CMmSmsGsmAddress::GsmMapNpiToTUint8;unknown numbering plan identification aNpi=%d", aNpi ); numPlanIdentification = KNpiUnknown; } } @@ -727,7 +727,7 @@ { TFLOGSTRING2("TSY: CMmSmsGsmAddress::GsmUnicodeAddrToAlphanumericAddr - source address: %S", &aSource); -OstTraceExt1( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMUNICODEADDRTOALPHANUMERICADDR, "CMmSmsGsmAddress::GsmUnicodeAddrToAlphanumericAddr;aSource=%S", aSource ); +OstTraceExt1( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMUNICODEADDRTOALPHANUMERICADDR_TD, "CMmSmsGsmAddress::GsmUnicodeAddrToAlphanumericAddr;aSource=%S", aSource ); TUint16 j( 0 ); TUint16 i( 0 ); @@ -824,7 +824,7 @@ ) { TFLOGSTRING("TSY: CMmSmsGsmAddress::GsmAlphanumericAddrToUnicodeAddr"); -OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMALPHANUMERICADDRTOUNICODEADDR, "CMmSmsGsmAddress::GsmAlphanumericAddrToUnicodeAddr" ); +OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMALPHANUMERICADDRTOUNICODEADDR_TD, "CMmSmsGsmAddress::GsmAlphanumericAddrToUnicodeAddr" ); //Maximum length of address data is 10 bytes. These bytes can contain //11 packed 7-bit characters. @@ -926,7 +926,7 @@ ) { TFLOGSTRING("TSY: CMmSmsGsmAddress::GsmLibPackAlphanumericAddress"); -OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMLIBPACKALPHANUMERICADDRESS, "CMmSmsGsmAddress::GsmLibPackAlphanumericAddress" ); +OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMLIBPACKALPHANUMERICADDRESS_TD, "CMmSmsGsmAddress::GsmLibPackAlphanumericAddress" ); TUint8 si( 0 ); TUint8 di( 0 ); TUint tempModulo( 0 ); @@ -998,7 +998,7 @@ ) { TFLOGSTRING("TSY: CMmSmsGsmAddress::GsmLibUnpackAlphanumericAddress"); -OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMLIBUNPACKALPHANUMERICADDRESS, "CMmSmsGsmAddress::GsmLibUnpackAlphanumericAddress" ); +OstTrace0( TRACE_NORMAL, CMMSMSGSMADDRESS_GSMLIBUNPACKALPHANUMERICADDRESS_TD, "CMmSmsGsmAddress::GsmLibUnpackAlphanumericAddress" ); TUint8 di( 0 ); TUint8 si( 0 ); TUint tempModulo( 0 ); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmsmsmesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmsmsmesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmsmsmesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 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" @@ -22,8 +22,7 @@ // Include Files #include #include -// Temporarily removed for Bridge camp! -//#include +#include #include // for sat mo sm control error values #include // for sat mo sm control error values #include @@ -39,6 +38,7 @@ #include "cmmphonemesshandler.h" #include "tsylogger.h" #include "cmmphonetsender.h" + #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #include "cmmsmsmesshandlerTraces.h" @@ -94,6 +94,9 @@ const TUint8 KSmsParamsValidityPeriodOffset( 27 ); const TUint8 KSizeOfAlphaTag( 62 ); +const TUint8 KShift8( 8 ); +const TUint16 KSmsResIdMoSmInitDisable( 0 ); // SMS_RES_ID_MO_SM_INIT_DISABLE + // MODULE DATA STRUCTURES // Local Data Structures @@ -118,7 +121,7 @@ CMmSmsMessHandler::CMmSmsMessHandler() { TFLOGSTRING("TSY: CMmSmsMessHandler::CMmSmsMessHandler: constructor."); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_CMMSMSMESSHANDLER, "CMmSmsMessHandler::CMmSmsMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_CMMSMSMESSHANDLER_TD, "CMmSmsMessHandler::CMmSmsMessHandler" ); } // ----------------------------------------------------------------------------- @@ -129,7 +132,7 @@ CMmSmsMessHandler::~CMmSmsMessHandler() { TFLOGSTRING("TSY: CMmSmsMessHandler::CMmSmsMessHandler: destructor."); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_CMMSMSMESSHANDLER, "CMmSmsMessHandler::~CMmSmsMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_CMMSMSMESSHANDLER_TD, "CMmSmsMessHandler::~CMmSmsMessHandler" ); // Delete arrays if( iSmsListArray ) { @@ -157,11 +160,12 @@ ) { TFLOGSTRING("TSY: CMmSmsMessHandler::NewL"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_NEWL, "CMmSmsMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_NEWL_TD, "CMmSmsMessHandler::NewL" ); CMmSmsMessHandler* smsMessHandler = new ( ELeave ) CMmSmsMessHandler(); CleanupStack::PushL( smsMessHandler ); smsMessHandler->iPhoNetSender = aPhoNetSender; + smsMessHandler->iPhonetReceiver = aPhoNetReceiver; smsMessHandler->iMessageRouter = aMessageRouter; smsMessHandler->iMmUiccMessHandler = aUiccMessHandler; smsMessHandler->ConstructL(); @@ -179,7 +183,7 @@ void CMmSmsMessHandler::ConstructL() { TFLOGSTRING("TSY: CMmSmsMessHandler::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_CONSTRUCTL, "CMmSmsMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_CONSTRUCTL_TD, "CMmSmsMessHandler::ConstructL" ); iSmsListArray = new ( ELeave ) CArrayPtrFlat( 1 ); iSmspListArray = new ( ELeave ) CArrayPtrFlat( 1 ); @@ -187,8 +191,6 @@ // default bearer setting is "CS preferred" iMobileSmsBearer = RMobileSmsMessaging::ESmsBearerCircuitPreferred; - iMemoryCapacityExceeded = EFalse; - // Reading of SMSP entries starts from record 1 iSmspRecordNumber = 1; } @@ -204,7 +206,7 @@ TUint8 messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); TFLOGSTRING3("TSY: CMmSmsMessHandler::ReceiveMessageL - resource: %d, msgId: %d", resource, messageId); -OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_RECEIVEMESSAGEL,"CMmSmsMessHandler::ReceiveMessageL;resource=%hhu;messageId=%hhu", resource, messageId ); +OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_RECEIVEMESSAGEL_TD,"CMmSmsMessHandler::ReceiveMessageL;resource=%hhu;messageId=%hhu", resource, messageId ); switch ( resource ) { @@ -237,7 +239,7 @@ else { TFLOGSTRING2("TSY:CMmSmsMessHandler::ReceiveMessageL:Unexpected transId=%d in SMS_MESSAGE_SEND_RESP.",traId); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_RECEIVEMESSAGEL, "CMmSmsMessHandler::ReceiveMessageL;traId=%hhu", traId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmSmsMessHandler::ReceiveMessageL;traId=%hhu", traId ); } break; } @@ -261,10 +263,15 @@ SmsSettingsUpdateResp( aIsiMessage ); break; } + case SMS_RESOURCE_CONF_IND: + { + SmsResourceConfInd( aIsiMessage ); + break; + } default: { TFLOGSTRING2("TSY: CMmSmsMessHandler::ReceiveMessageL - PN_SMS - unknown msgId: %d", messageId); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_RECEIVEMESSAGEL, "CMmSmsMessHandler::ReceiveMessageL;messageId=%hhu", messageId ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmSmsMessHandler::ReceiveMessageL;messageId=%hhu", messageId ); // No handler methods for ISI-message found. break; } @@ -274,7 +281,7 @@ default: { TFLOGSTRING2("TSY: CMmSmsMessHandler::ReceiveMessageL - unknown resource: %d", resource); -OstTraceExt1( TRACE_NORMAL, DUP6_CMMSMSMESSHANDLER_RECEIVEMESSAGEL, "CMmSmsMessHandler::ReceiveMessageL;resource=%hhu", resource ); +OstTraceExt1( TRACE_NORMAL, DUP6_CMMSMSMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmSmsMessHandler::ReceiveMessageL;resource=%hhu", resource ); // No handler methods for ISI-message found. break; } @@ -294,7 +301,7 @@ { TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsMessageSendReq. Transaction ID: %d", aTransactionId); -OstTraceExt1( TRACE_NORMAL,DUP18_CMMSMSMESSHANDLER_SMSMESSAGESENDREQ,"CMmSmsMessHandler::SmsMessageSendReq;aTransactionId=%hhu", aTransactionId ); +OstTraceExt1( TRACE_NORMAL,DUP18_CMMSMSMESSHANDLER_SMSMESSAGESENDREQ_TD,"CMmSmsMessHandler::SmsMessageSendReq;aTransactionId=%hhu", aTransactionId ); TInt ret( KErrNone ); TUint8 subBlockId( 0 ); @@ -331,7 +338,7 @@ KErrArgument, KErrGsmSMSTpduNotSupported ); TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsMessageSendReq. Error! SMS type not supported: %d", tpMti); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_SMSMESSAGESENDREQ, "CMmSmsMessHandler::SmsMessageSendReq.Error! SMS type not supported;tpMti=%hhu", tpMti ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_SMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::SmsMessageSendReq.Error! SMS type not supported;tpMti=%hhu", tpMti ); } } else @@ -341,7 +348,7 @@ KErrArgument, KErrGsmSMSTpduNotSupported ); TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsMessageSendReq. Error! TPDU too long: %d", sendData.iMsgData->Length()); -OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSMESSAGESENDREQ, "CMmSmsMessHandler::SmsMessageSendReq.Error! TPDU too long;sendData.iMsgData->Length()=%d", sendData.iMsgData->Length() ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::SmsMessageSendReq.Error! TPDU too long;sendData.iMsgData->Length()=%d", sendData.iMsgData->Length() ); } // Check the format of TPDU and data buffer @@ -352,7 +359,7 @@ KErrArgument, KErrGsmSMSTpduNotSupported ); TFLOGSTRING3("TSY: CMmSmsMessHandler::SmsMessageSendReq. Error! Invalid TPDU format (%d) or data buffer format (%d)", msgAttr->iFlags, msgAttr->iDataFormat ); -OstTraceExt2( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_SMSMESSAGESENDREQ, "CMmSmsMessHandler::SmsMessageSendReq.Error!;msgAttr->iFlags=%d;msgAttr->iDataFormat=%hhu", msgAttr->iFlags, msgAttr->iDataFormat ); +OstTraceExt2( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_SMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::SmsMessageSendReq.Error!;msgAttr->iFlags=%d;msgAttr->iDataFormat=%hhu", msgAttr->iFlags, msgAttr->iDataFormat ); } #if (NCP_COMMON_S60_VERSION_SUPPORT>S60_VERSION_32) @@ -361,7 +368,7 @@ { ret = KErrServerBusy; TFLOGSTRING("TSY: CMmSmsMessHandler::SmsMessageSendReq. SMS sending failed, server busy!" ); -OstTrace0( TRACE_NORMAL, DUP17_CMMSMSMESSHANDLER_SMSMESSAGESENDREQ, "CMmSmsMessHandler::SmsMessageSendReq. SMS sending failed, server busy!" ); +OstTrace0( TRACE_NORMAL, DUP17_CMMSMSMESSHANDLER_SMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::SmsMessageSendReq. SMS sending failed, server busy!" ); } #endif // NCP_COMMON_S60_VERSION_SUPPORT @@ -421,7 +428,7 @@ // |- SMS_SB_USER_DATA (optional, max. 174 bytes) TFLOGSTRING2("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. Subblock ID: %d", aSubblockId); -OstTraceExt1( TRACE_NORMAL, DUP9_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ, "CMmSmsMessHandler::CreateSmsMessageSendReq;aSubblockId=%hhu", aSubblockId ); +OstTraceExt1( TRACE_NORMAL, DUP9_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::CreateSmsMessageSendReq;aSubblockId=%hhu", aSubblockId ); TInt ret( KErrNone ); TUint8 addressLength( 0 ); @@ -434,7 +441,6 @@ TUint8 smsRoute( SMS_ROUTE_DEFAULT ); TUint8 tpVpLength( 0 ); TUint8 tpVpf( 0 ); - TUint8 tpVpSubblockLength( SIZE_SMS_SB_VALIDITY_PERIOD ); TUint8 tpUdl( 0 ); TUint8 tpUserDataLengthIndex( KTpduSubmitIndexUserDataLengthIfNoTpVp ); TUint8 tpUserDataIndex( 0 ); @@ -442,8 +448,6 @@ TUint8 tpDcs( 0 ); TUint8 msgOffset( ISI_HEADER_SIZE + SIZE_SMS_MESSAGE_SEND_REQ ); TUint8 numOfSubblocks( 3 ); // 3 mandatory subblocks - TUint8 lengthOfAddressSb( 0 ); - TUint8 lengthOfSMSUserDataSb( 0 ); TBool defaultAlphabet( EFalse ); // Data coding type, true if 7-bit // Check if more to send parameter is included @@ -493,15 +497,14 @@ TFLOGSTRING2("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_MESSAGE_SEND_REQ created. Message offset: %d", msgOffset ); TFLOGSTRING2("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. More messages to be sent: %d", moreMsgToSend); TFLOGSTRING2("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. SMS route: %d", smsRoute); -OstTraceExt3( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ, "CMmSmsMessHandler::CreateSmsMessageSendReq;msgOffset=%hhu;moreMsgToSend=%hhu;smsRoute=%hhu", msgOffset, moreMsgToSend, smsRoute ); +OstTraceExt3( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::CreateSmsMessageSendReq;msgOffset=%hhu;moreMsgToSend=%hhu;smsRoute=%hhu", msgOffset, moreMsgToSend, smsRoute ); // Create SMS_SB_SUBMIT subblock if ( SMS_SB_SUBMIT == aSubblockId ) { - BuildSmsSbSubmit( aMsgData, isiMsg, msgOffset, addressLength ); - msgOffset += SIZE_SMS_SB_SUBMIT; + msgOffset += BuildSmsSbSubmit( aMsgData, isiMsg, addressLength, msgOffset ); TFLOGSTRING2("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_SUBMIT created. Message offset: %d", msgOffset ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ, "CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_SUBMIT created.;msgOffset=%hhu", msgOffset ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_SUBMIT created.;msgOffset=%hhu", msgOffset ); // Set needed TPDU index values that depends on SMS type, VP existence // and destination address length. Those parameters are needed when // creating subblocks SMS_DESTINATION_ADDRESS, SMS_SB_VALIDITY_PERIOD @@ -522,7 +525,6 @@ else { tpVpLength = SMS_VPF_ABSOLUTE_OR_ENHANCED; - tpVpSubblockLength = 12; tpUserDataLengthIndex = KTpduSubmitIndexUserDataLengthVpfAbsoluteEnchanced; } @@ -532,39 +534,35 @@ } else // Create SMS_SB_COMMAND subblock { - BuildSmsSbCommand( aMsgData, isiMsg, msgOffset ); - msgOffset += SIZE_SMS_SB_COMMAND; + msgOffset += BuildSmsSbCommand( aMsgData, isiMsg, msgOffset ); TFLOGSTRING2("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_COMMAND created. Message offset: %d", msgOffset ); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ, "CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_COMMAND created.;msgOffset=%hhu", msgOffset ); - +OstTraceExt1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_COMMAND created.;msgOffset=%hhu", msgOffset ); tpDaIndex = KTpduCommandIndexDestinationAddressLength; tpUserDataLengthIndex = KTpduCommandIndexUserDataLength; } TFLOGSTRING2("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. Validity period format: %d", tpVpf); TFLOGSTRING2("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. User data length index: %d", tpUserDataLengthIndex); -OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ, "CMmSmsMessHandler::CreateSmsMessageSendReq;tpVpf=%hhu;tpUserDataLengthIndex=%hhu", tpVpf, tpUserDataLengthIndex ); +OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::CreateSmsMessageSendReq;tpVpf=%hhu;tpUserDataLengthIndex=%hhu", tpVpf, tpUserDataLengthIndex ); // Create SMS_SB_ADDRESS subblock for destination address // TP-DA length = Length (1 byte) + TON/NPI (1 byte) + address data TPtrC8 addressData( aMsgData.Mid( tpDaIndex, ( addressLength + 2 ) ) ); - lengthOfAddressSb = BuildSmsSbAddress( + msgOffset += BuildSmsSbAddress( addressData, isiMsg, SMS_DESTINATION_ADDRESS, msgOffset ); - msgOffset += lengthOfAddressSb; TFLOGSTRING2("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_ADDRESS created for destination address. Message offset: %d", msgOffset ); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ, "CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_ADDRESS created for destination address.;msgOffset=%hhu", msgOffset ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_ADDRESS created for destination address.;msgOffset=%hhu", msgOffset ); // Create SMS_SB_ADDRESS subblock for service center address TBuf8 scAddr; BuildScAddress( aMsgAttr->iGsmServiceCentre, scAddr ); - lengthOfAddressSb = + msgOffset += BuildSmsSbAddress( scAddr, isiMsg, SMS_SMSC_ADDRESS, msgOffset ); - msgOffset += lengthOfAddressSb; TFLOGSTRING2("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_ADDRESS created for SC address. Message offset: %d", msgOffset ); -OstTraceExt1( TRACE_NORMAL, DUP5_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ, "CMmSmsMessHandler::CreateSmsMessageSendReq.SMS_SB_ADDRESS created for SC address.;msgOffset=%hhu", msgOffset ); +OstTraceExt1( TRACE_NORMAL, DUP5_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::CreateSmsMessageSendReq.SMS_SB_ADDRESS created for SC address.;msgOffset=%hhu", msgOffset ); // Create SMS_SB_VALIDITY_PERIOD subblock (optional, used only in // case of SMS_SB_SUBMIT) @@ -572,17 +570,15 @@ { TUint8 tpVpIndex( KTpduSubmitIndexValidityperiod + addressLength ); - BuildSmsSbValidityPeriod( + msgOffset += BuildSmsSbValidityPeriod( aMsgData, isiMsg, tpVpIndex, tpVpLength, msgOffset ); - // Udate message offset according to validity period length - msgOffset += tpVpSubblockLength; numOfSubblocks++; TFLOGSTRING2("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_VALIDITY_PERIOD created. Message offset: %d", msgOffset ); -OstTraceExt1( TRACE_NORMAL, DUP6_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ, "CMmSmsMessHandler::CreateSmsMessageSendReq.SMS_SB_VALIDITY_PERIOD created.;msgOffset=%hhu", msgOffset ); +OstTraceExt1( TRACE_NORMAL, DUP6_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::CreateSmsMessageSendReq.SMS_SB_VALIDITY_PERIOD created.;msgOffset=%hhu", msgOffset ); } // Create SMS_SB_USER_DATA subblock if user data exists @@ -591,7 +587,7 @@ tpUserDataLengthIndex += addressLength; tpUdl = aMsgData[tpUserDataLengthIndex]; TFLOGSTRING2("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. User data length from TPDU: %d", tpUdl); -OstTrace1( TRACE_NORMAL, DUP10_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ, "CMmSmsMessHandler::CreateSmsMessageSendReq;tpUdl=%d", tpUdl ); +OstTrace1( TRACE_NORMAL, DUP10_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::CreateSmsMessageSendReq;tpUdl=%d", tpUdl ); if ( tpUdl ) { @@ -602,7 +598,7 @@ tpDcs = aMsgData[ KTpduSubmitIndexDataCodingScheme + addressLength ]; defaultAlphabet = IsDataCodingScheme7Bit( tpDcs ); } - lengthOfSMSUserDataSb = BuildSmsSbUserData( + msgOffset += BuildSmsSbUserData( aMsgData, isiMsg, tpUdl, @@ -610,9 +606,8 @@ defaultAlphabet, msgOffset ); numOfSubblocks++; - msgOffset += lengthOfSMSUserDataSb; TFLOGSTRING2("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_USER_DATA created. Message offset: %d", msgOffset ); -OstTraceExt1( TRACE_NORMAL, DUP7_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ, "CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_USER_DATA created.;msgOffset=%hhu", msgOffset ); +OstTraceExt1( TRACE_NORMAL, DUP7_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_USER_DATA created.;msgOffset=%hhu", msgOffset ); } // Create SMS_SB_CHECK_INFO subblock if user data exists @@ -620,12 +615,12 @@ // length index if ( aSmsCheckDisableFdn ) { - BuildSmsCheckInfo( + msgOffset += BuildSmsCheckInfo( isiMsg, msgOffset ); numOfSubblocks++; TFLOGSTRING("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_CHECK_INFO created." ); -OstTrace0( TRACE_NORMAL, DUP11_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ, "CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_CHECK_INFO created." ); +OstTrace0( TRACE_NORMAL, DUP11_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_SB_CHECK_INFO created." ); } @@ -640,7 +635,7 @@ ret = iPhoNetSender->Send( isiMsg.Complete() ); TFLOGSTRING3("TSY: CMmSmsMessHandler::CreateSmsMessageSendReq. SMS_MESSAGE_SEND_REQ was sent. Number of subblocks in message: %d, ret = %d", numOfSubblocks, ret ); -OstTraceExt2( TRACE_NORMAL, DUP8_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ, "CMmSmsMessHandler::CreateSmsMessageSendReq.SMS_MESSAGE_SEND_REQ was sent.;numOfSubblocks=%hhu;ret=%d", numOfSubblocks, ret ); +OstTraceExt2( TRACE_NORMAL, DUP8_CMMSMSMESSHANDLER_CREATESMSMESSAGESENDREQ_TD, "CMmSmsMessHandler::CreateSmsMessageSendReq.SMS_MESSAGE_SEND_REQ was sent.;numOfSubblocks=%hhu;ret=%d", numOfSubblocks, ret ); } // End of if destination address is OK return ret; @@ -656,7 +651,7 @@ TInt CMmSmsMessHandler::SmsReceiveMessageReq( TUint8 aAction ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsReceiveMessageReq. Action = %d",aAction ); -OstTraceExt1( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSRECEIVEMESSAGEREQ, "CMmSmsMessHandler::SmsReceiveMessageReq;aAction=%hhu", aAction ); +OstTraceExt1( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSRECEIVEMESSAGEREQ_TD, "CMmSmsMessHandler::SmsReceiveMessageReq;aAction=%hhu", aAction ); TUint8 trId( 0 ); if ( SMS_RECEPTION_STORAGE_STATUS_UPDATE == aAction ) @@ -703,7 +698,7 @@ // + padding = 168 bytes) TFLOGSTRING3("TSY: CMmSmsMessHandler::SmsReceivedMsgReportReq - traId: %d, RP cause value: %d", aTransactionId, aRpCause); -OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSRECEIVEDPPREPORTREQ, "CMmSmsMessHandler::SmsReceivedMsgReportReq;aTransactionId=%hhu;aRpCause=%d", aTransactionId, aRpCause ); +OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSRECEIVEDPPREPORTREQ_TD, "CMmSmsMessHandler::SmsReceivedMsgReportReq;aTransactionId=%hhu;aRpCause=%d", aTransactionId, aRpCause ); TInt ret( KErrNone ); TUint8 numOfSubblocks( 0 ); // All subblocks are optional @@ -755,7 +750,7 @@ if ( NULL != aMsgData && 0 < aMsgData->Length() ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsReceivedMsgReportReq. Message data availabe, length %d", aMsgData->Length()); -OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSRECEIVEDMSGREPORTREQ, "CMmSmsMessHandler::SmsReceivedMsgReportReq;aMsgData->Length()=%d", aMsgData->Length() ); +OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSRECEIVEDMSGREPORTREQ_TD, "CMmSmsMessHandler::SmsReceivedMsgReportReq;aMsgData->Length()=%d", aMsgData->Length() ); TUint8 ind( 0 ); @@ -805,7 +800,7 @@ if ( SMS_PARAM_INDICATOR_MAX_LEN < paramIndCount ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsReceivedMsgReportReq. Error! Too mamy TP-PI parameters: %d", paramIndCount ); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_SMSRECEIVEDMSGREPORTREQ, "CMmSmsMessHandler::SmsReceivedMsgReportReq. Error!;paramIndCount=%hhu", paramIndCount ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_SMSRECEIVEDMSGREPORTREQ_TD, "CMmSmsMessHandler::SmsReceivedMsgReportReq. Error!;paramIndCount=%hhu", paramIndCount ); ret = KErrArgument; moreParamInd = EFalse; } @@ -841,7 +836,7 @@ tpUdl = ( *aMsgData )[ind++]; } TFLOGSTRING4("TSY: CMmSmsMessHandler::SmsReceivedMsgReportReq. protocolInd: %d, dcs: %d, tpUdl: %d", protocolInd, dcs, tpUdl ); -OstTraceExt3( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_SMSRECEIVEDMSGREPORTREQ, "CMmSmsMessHandler::SmsReceivedMsgReportReq;protocolInd=%hhu;dcs=%hhu;tpUdl=%hhu", protocolInd, dcs, tpUdl ); +OstTraceExt3( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_SMSRECEIVEDMSGREPORTREQ_TD, "CMmSmsMessHandler::SmsReceivedMsgReportReq;protocolInd=%hhu;dcs=%hhu;tpUdl=%hhu", protocolInd, dcs, tpUdl ); // If user data exists, fill SMS_SB_USER_DATA and // SMS_SB_PARAM_INDICATOR subblocks @@ -884,14 +879,14 @@ // TP-MTI is other than SMS_GSM_DELIVER_REPORT, message is not sent { TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsReceivedMsgReportReq. Error! Invalid message type indicator: %d", tpMti); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSRECEIVEDMSGREPORTREQ, "CMmSmsMessHandler::SmsReceivedMsgReportReq;tpMti=%hhu", tpMti ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSRECEIVEDMSGREPORTREQ_TD, "CMmSmsMessHandler::SmsReceivedMsgReportReq;tpMti=%hhu", tpMti ); ret = KErrArgument; } } // end of if ( NULL != aMsgData && 0 < aMsgData->Length() ) else { TFLOGSTRING("TSY: CMmSmsMessHandler::SmsReceivedMsgReportReq. No message data availabe!"); -OstTrace0( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_SMSRECEIVEDMSGREPORTREQ, "CMmSmsMessHandler::SmsReceivedMsgReportReq. No message data available" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_SMSRECEIVEDMSGREPORTREQ_TD, "CMmSmsMessHandler::SmsReceivedMsgReportReq. No message data available" ); // If memory capacity exceeded -> gsmTpfailureCause is 0 if ( 0 != aRpCause && SMS_EXT_ERR_MEMORY_CAPACITY_EXC != smsCause ) { @@ -957,7 +952,7 @@ TUint8 CMmSmsMessHandler::SmsMapCause ( TInt aRpCause ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsReceivedPpReportReq - aRpCause: %d", aRpCause); -OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSMAPCAUSE, "CMmSmsMessHandler::SmsMapCause;aRpCause=%d", aRpCause ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSMAPCAUSE_TD, "CMmSmsMessHandler::SmsMapCause;aRpCause=%d", aRpCause ); //initialization of the Sms Cause value is 0x00 (SMS_CAUSE_OK) TUint8 retSmsCause( 0 ); @@ -1017,7 +1012,7 @@ default: { TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsReceivedPpReportReq - unknown RpCause: %d", aRpCause); -OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSMAPCAUSE, "CMmSmsMessHandler::SmsMapCause;unknown aRpCause=%d", aRpCause ); +OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSMAPCAUSE_TD, "CMmSmsMessHandler::SmsMapCause;unknown aRpCause=%d", aRpCause ); retSmsCause = SMS_EXT_ERR_PROTOCOL_ERROR; break; } @@ -1037,7 +1032,7 @@ TInt aIpc ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsMessageSendResp - IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSMESSAGESENDRESP, "CMmSmsMessHandler::SmsMessageSendResp;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSMESSAGESENDRESP_TD, "CMmSmsMessHandler::SmsMessageSendResp;aIpc=%d", aIpc ); TInt epocCause( KErrNone ); TUint16 msgRef( 0 ); @@ -1058,7 +1053,7 @@ if ( EMobileSmsMessagingSendMessage == aIpc ) { TFLOGSTRING("TSY: CMmSmsMessHandler::SmsMessageSendResp - server cause: SMS_ERR_RC_REJECTED"); -OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_SMSMESSAGESENDRESP, "CMmSmsMessHandler::SmsMessageSendResp, server cause: SMS_ERR_RC_REJECTED" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_SMSMESSAGESENDRESP_TD, "CMmSmsMessHandler::SmsMessageSendResp, server cause: SMS_ERR_RC_REJECTED" ); // This is an ETel MM-initiated SMS, barred by SAT. epocCause = CMmStaticUtility::EpocErrorCode( KErrAccessDenied, @@ -1067,7 +1062,7 @@ else if ( EMmTsySmsSendSatMessage == aIpc ) { TFLOGSTRING("TSY: CMmSmsMessHandler::SmsMessageSendResp - server cause: SMS_ERR_RC_REJECTED"); -OstTrace0( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_SMSMESSAGESENDRESP, "CMmSmsMessHandler::SmsMessageSendResp, server cause: SMS_ERR_RC_REJECTED" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_SMSMESSAGESENDRESP_TD, "CMmSmsMessHandler::SmsMessageSendResp, server cause: SMS_ERR_RC_REJECTED" ); // This is a SAT-initiated SMS, barred by SAT. epocCause = KErrSatMoSmControlBarred; } @@ -1090,7 +1085,7 @@ else // Invalid cause type { TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsMessageSendResp: Unknown cause type %d.", smsServerCauseType ); -OstTraceExt1( TRACE_NORMAL, DUP5_CMMSMSMESSHANDLER_SMSMESSAGESENDRESP, "CMmSmsMessHandler::SmsMessageSendResp;smsServerCauseType=%hhu", smsServerCauseType ); +OstTraceExt1( TRACE_NORMAL, DUP5_CMMSMSMESSHANDLER_SMSMESSAGESENDRESP_TD, "CMmSmsMessHandler::SmsMessageSendResp;smsServerCauseType=%hhu", smsServerCauseType ); TF_ASSERT_NOT_REACHED(); } } @@ -1176,18 +1171,15 @@ iMessageRouter->Complete( EMmTsySmsSendSatMessage, epocCause ); #else #ifdef __WINSCW__ - // for simatktsy testtool - // Temporarily removed for Bridge camp! - /*if ( iMessageRouter->iSatMessaging ) - { - iMessageRouter->iSatMessaging->CompleteSendSmsMessage ( epocCause ); - } + // for simatktsy testtool + if ( iMessageRouter->iSatMessaging ) + { + iMessageRouter->iSatMessaging->CompleteSendSmsMessage ( epocCause ); + } // for nokiatsy testtool - */ - iMessageRouter->Complete ( EMmTsySmsSendSatMessage, epocCause ); + iMessageRouter->Complete ( EMmTsySmsSendSatMessage, epocCause ); #else // __WINSCW__ - // Temporarily removed for Bridge camp! - //iMessageRouter->iSatMessaging->CompleteSendSmsMessage ( epocCause ); + iMessageRouter->iSatMessaging->CompleteSendSmsMessage ( epocCause ); #endif // __WINSCW__ iSMSSendingOngoing = EFalse; #endif //NCP_COMMON_S60_VERSION_SUPPORT @@ -1195,7 +1187,7 @@ else { TFLOGSTRING2("TSY:CMmSmsMessHandler::SmsMessageSendResp:Unexpected IPC %d.",aIpc); -OstTrace1( TRACE_NORMAL, DUP6_CMMSMSMESSHANDLER_SMSMESSAGESENDRESP, "CMmSmsMessHandler::SmsMessageSendResp;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP6_CMMSMSMESSHANDLER_SMSMESSAGESENDRESP_TD, "CMmSmsMessHandler::SmsMessageSendResp;aIpc=%d", aIpc ); } } @@ -1208,7 +1200,7 @@ void CMmSmsMessHandler::SmsReceiveMessageResp( const TIsiReceiveC& aIsiMsg ) { TFLOGSTRING("TSY: CMmSmsMessHandler::SmsReceiveMessageResp"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSPPROUTINGRESP, "CMmSmsMessHandler::SmsReceiveMessageResp" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSPPROUTINGRESP_TD, "CMmSmsMessHandler::SmsReceiveMessageResp" ); // Get transaction ID for completing with correct IPC TUint8 trId( aIsiMsg.Get8bit( @@ -1230,15 +1222,6 @@ smsServerCauseType, smsServerCauseValue ) ); - if ( KErrNone == epocError ) - { - // even if client deactivates reception, next time it is activated - // SMS server will ask network to resend all NACKed MT SMs - // only query status does not affect this flag, but this action - // is not used - iMemoryCapacityExceeded = EFalse; - } - // Compete active reception status if ( SMS_RECEPTION_ACTIVE == receptionStatus ) { @@ -1281,7 +1264,7 @@ TUint8& aSmsClass2ReplaceTpPid ) // TP-PID to replace (set by this function) { TFLOGSTRING("TSY: CMmSmsMessHandler::IsSmsClass2"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_ISSMSCLASS2, "CMmSmsMessHandler::IsSmsClass2" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_ISSMSCLASS2_TD, "CMmSmsMessHandler::IsSmsClass2" ); TBool smsClass2( EFalse ); TBool cphsCase( EFalse ); @@ -1339,7 +1322,7 @@ cphsCase = ETrue; smsClass2 = EFalse; TFLOGSTRING("TSY: CMmSmsMessHandler::IsSmsClass2: CPHS message"); -OstTrace0( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_ISSMSCLASS2, "CMmSmsMessHandler::IsSmsClass2. CPHS message" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_ISSMSCLASS2_TD, "CMmSmsMessHandler::IsSmsClass2. CPHS message" ); } } } @@ -1376,7 +1359,7 @@ { // Yes, this is a "replace type" message TFLOGSTRING2("TSY: CMmSmsMessHandler::IsSmsClass2: Replace type message, protocol ID: %d", protocolId ); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_ISSMSCLASS2, "CMmSmsMessHandler::IsSmsClass2. Replace type message;protocolId=%hhu", protocolId ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_ISSMSCLASS2_TD, "CMmSmsMessHandler::IsSmsClass2. Replace type message;protocolId=%hhu", protocolId ); aSmsClass2ReplaceTpPid = protocolId; } @@ -1416,7 +1399,7 @@ if ( smsClass2 ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsClass: Received class 2 message has TP-PID 0x%x", aSmsClass2ReplaceTpPid); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_ISSMSCLASS2, "CMmSmsMessHandler::IsSmsClass2;aSmsClass2ReplaceTpPid=%hhx", aSmsClass2ReplaceTpPid ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_ISSMSCLASS2_TD, "CMmSmsMessHandler::IsSmsClass2;aSmsClass2ReplaceTpPid=%hhx", aSmsClass2ReplaceTpPid ); } else { @@ -1435,53 +1418,40 @@ void CMmSmsMessHandler::SmsReceivedMsgInd( const TIsiReceiveC& aIsiMsg ) { TFLOGSTRING("TSY: CMmSmsMessHandler::SmsReceivedMsgInd"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSPPROUTINGNTF, "CMmSmsMessHandler::SmsReceivedMsgInd" ); - - if ( iMemoryCapacityExceeded ) +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSPPROUTINGNTF_TD, "CMmSmsMessHandler::SmsReceivedMsgInd" ); + + TInt ret( KErrNone ); + // Create a package + CMmDataPackage package; + + TUint8 replaceTpPid( 0 ); // IsSmsClass2 also fills this + TBool receivedSmsClass2( IsSmsClass2( aIsiMsg, replaceTpPid ) ); + + // SIM SMS cache: incoming class 2 SMS + if ( receivedSmsClass2 ) { -TFLOGSTRING("TSY: CMmSmsMessHandler::SmsReceivedMsgInd no storage - internal NACK"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSRECEIVEDMSGIND, "CMmSmsMessHandler::SmsReceivedMsgInd no storage - internal NACK" ); - // error is ignored - SmsReceivedMsgReportReq( - EInternalNack, - NULL, - KErrGsmSMSMemoryCapacityExceeded ); + ret = SmsClass2ReceivedMsgInd( aIsiMsg, replaceTpPid ); } + // Received SMS is not a class 2 SMS (it is a normal SMS) else { - TInt ret( KErrNone ); - // Create a package - CMmDataPackage package; - - TUint8 replaceTpPid( 0 ); // IsSmsClass2 also fills this - TBool receivedSmsClass2( IsSmsClass2( aIsiMsg, replaceTpPid ) ); - - // SIM SMS cache: incoming class 2 SMS - if ( receivedSmsClass2 ) - { - ret = SmsClass2ReceivedMsgInd( aIsiMsg, replaceTpPid ); - } - // Received SMS is not a class 2 SMS (it is a normal SMS) - else - { - ret = SmsClass1ReceivedMsgInd( aIsiMsg ); - } - // There was an error, complete to upper level - if ( KErrNone != ret ) - { + ret = SmsClass1ReceivedMsgInd( aIsiMsg ); + } + // There was an error, complete to upper level + if ( KErrNone != ret ) + { TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsReceivedMsgInd;ret=%d", ret); -OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSPPROUTINGNTF, "CMmSmsMessHandler::SmsReceivedMsgInd;ret=%d", ret ); - TBool smsInd( ETrue ); - TSmsMsg* nullSms = NULL; - - package.PackData( &smsInd, &nullSms ); - - // Complete request to client - iMessageRouter->Complete( - EMobileSmsMessagingReceiveMessage, - &package, - ret ); - } +OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSPPROUTINGNTF_TD, "CMmSmsMessHandler::SmsReceivedMsgInd;ret=%d", ret ); + TBool smsInd( ETrue ); + TSmsMsg* nullSms = NULL; + + package.PackData( &smsInd, &nullSms ); + + // Complete request to client + iMessageRouter->Complete( + EMobileSmsMessagingReceiveMessage, + &package, + ret ); } } @@ -1499,56 +1469,38 @@ + SMS_RECEIVED_MSG_REPORT_RESP_OFFSET_SMSCAUSE ) ); TFLOGSTRING3("TSY: CMmSmsMessHandler::SmsReceivedPpReportResp - traId: %d, cause: %d", traId, cause); -OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSRECEIVEDPPREPORTRESP, "CMmSmsMessHandler::SmsReceivedPpReportResp;traId=%hhu;cause=%hhu", traId, cause ); - - if ( iMemoryCapacityExceeded ) +OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSRECEIVEDPPREPORTRESP_TD, "CMmSmsMessHandler::SmsReceivedPpReportResp;traId=%hhu;cause=%hhu", traId, cause ); + + // Response for SmsReceivedPpReportReq (Ack) + if ( ESmsMessagingAckSmsStored == traId ) { - // ignore the response, this is response to self-NACK - // caused by client not having anymore storage space -TFLOGSTRING("TSY: CMmSmsMessHandler::SmsReceivedPpReportResp - self-NACK"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSRECEIVEDMSGREPORTRESP, "CMmSmsMessHandler::SmsReceivedPpReportResp - self-NACK" ); + iMessageRouter->Complete( + EMobileSmsMessagingAckSmsStored, + CMmStaticUtility::CSCauseToEpocError( + PN_SMS, + SMS_CAUSE_TYPE_COMMON, + cause ) ); + } + // Response for SmsReceivedPpReportReq (Nack) + else if ( ESmsMessagingNackSmsStored == traId ) + { + iMessageRouter->Complete( + EMobileSmsMessagingNackSmsStored, + CMmStaticUtility::CSCauseToEpocError( + PN_SMS, + SMS_CAUSE_TYPE_COMMON, + cause ) ); } else { - // Response for SmsReceivedPpReportReq (Ack) - if ( ESmsMessagingAckSmsStored == traId ) - { - iMessageRouter->Complete( - EMobileSmsMessagingAckSmsStored, - CMmStaticUtility::CSCauseToEpocError( - PN_SMS, - SMS_CAUSE_TYPE_COMMON, - cause ) ); - } - // Response for SmsReceivedPpReportReq (Nack) - else if ( ESmsMessagingNackSmsStored == traId || - ESmsMessagingNackSmsStoredCapacityExceeded == traId ) - { - iMessageRouter->Complete( - EMobileSmsMessagingNackSmsStored, - CMmStaticUtility::CSCauseToEpocError( - PN_SMS, - SMS_CAUSE_TYPE_COMMON, - cause ) ); - } - else - { TFLOGSTRING2("TSY:CMmSmsMessHandler::SmsReceivedPpReportResp:Unexpected transaction ID %d.",traId); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSRECEIVEDPPREPORTRESP, "CMmSmsMessHandler::SmsReceivedPpReportResp;Unexpected transaction ID=%hhu", traId ); - } - - if ( SMS_OK != cause ) - { - //Acknowledging failed. - iMemoryCapacityExceeded = EFalse; - iSmsSlotLocation = 0; - } - else if ( ESmsMessagingNackSmsStoredCapacityExceeded == traId ) - { - // client succeeded NACKing MT SM - // it wont receive any further MT SM indications - iMemoryCapacityExceeded = ETrue; - } +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSRECEIVEDPPREPORTRESP_TD, "CMmSmsMessHandler::SmsReceivedPpReportResp;Unexpected transaction ID=%hhu", traId ); + } + + if ( SMS_OK != cause ) + { + //Acknowledging failed. + iSmsSlotLocation = 0; } } @@ -1562,7 +1514,7 @@ TDes8 &aScAddress ) const //Service center address { TFLOGSTRING("TSY: CMmSmsMessHandler::BuildScAddress"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDSCADDRESS, "CMmSmsMessHandler::BuildScAddress" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDSCADDRESS_TD, "CMmSmsMessHandler::BuildScAddress" ); //get type of number from attributes RMobilePhone::TMobileTON ton( scPtr.iTypeOfNumber ); //map type of number from TMobileTON to TUint8 @@ -1592,7 +1544,7 @@ TDes8 &aDeAddress ) const // Destination address { TFLOGSTRING("TSY: CMmSmsMessHandler::BuildDeAddress"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDDEADDRESS, "CMmSmsMessHandler::BuildDeAddress" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDDEADDRESS_TD, "CMmSmsMessHandler::BuildDeAddress" ); //get type of number from attributes RMobilePhone::TMobileTON ton( scPtr.iTypeOfNumber ); @@ -1625,7 +1577,7 @@ TBool CMmSmsMessHandler::IsDataCodingScheme7Bit( TUint8 aDcs ) const { TFLOGSTRING("TSY: CMmSmsMessHandler::IsDataCodingScheme7Bit"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_ISDATACODINGSCHEME7BIT, "CMmSmsMessHandler::IsDataCodingScheme7Bit" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_ISDATACODINGSCHEME7BIT_TD, "CMmSmsMessHandler::IsDataCodingScheme7Bit" ); TUint8 codingGroup( static_cast( 0xf0 & aDcs ) ); // 11110000 TUint8 lowerBits( static_cast( 0x0f & aDcs ) ); // 00001111 @@ -1690,7 +1642,7 @@ TPtrC8 const & aUserData ) const //User data { TFLOGSTRING3("TSY: CMmSmsMessHandler::CalculateNumberOfCharsInUserData - char amount (from ISI): %d, data length (from ISI): %d", aCharacterAmount, aDataLength); -OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_CALCULATENUMBEROFCHARSINUSERDATA, "CMmSmsMessHandler::CalculateNumberOfCharsInUserData;aCharacterAmount=%hhu;aDataLength=%hhu", aCharacterAmount, aDataLength ); +OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_CALCULATENUMBEROFCHARSINUSERDATA_TD, "CMmSmsMessHandler::CalculateNumberOfCharsInUserData;aCharacterAmount=%hhu;aDataLength=%hhu", aCharacterAmount, aDataLength ); TUint16 characterAmount; @@ -1729,7 +1681,7 @@ const CMmDataPackage* aDataPackage ) // Data package { TFLOGSTRING2("TSY: CMmSmsMessHandler::ExtFuncL: IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_EXTFUNCL, "CMmSmsMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_EXTFUNCL_TD, "CMmSmsMessHandler::ExtFuncL;aIpc=%d", aIpc ); TInt ret( KErrNone ); @@ -1745,7 +1697,7 @@ { #if defined( INTERNAL_TESTING_SMS_WITH_EMULATOR ) && ( ! defined( __WINS__ ) ) TFLOGSTRING("TSY: CMmSmsMessHandler::ExtFuncL: SMS routing deactivated with flag INTERNAL_TESTING_SMS_WITH_EMULATOR"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_EXTFUNCL, "CMmSmsMessHandler::ExtFuncL, SMS routing deactivated with flag INTERNAL_TESTING_SMS_WITH_EMULATOR" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_EXTFUNCL_TD, "CMmSmsMessHandler::ExtFuncL, SMS routing deactivated with flag INTERNAL_TESTING_SMS_WITH_EMULATOR" ); #else ret = SmsReceiveMessageReq( SMS_RECEPTION_ACTIVATE ); #endif // defined( INTERNAL_TESTING_SMS_WITH_EMULATOR ) && ( ! defined( __WINS__ ) ) @@ -1811,7 +1763,7 @@ if ( NULL == msgData ) { TFLOGSTRING("TSY: CMmSmsMessHandler::ExtFuncL.Internal Ack handling started" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_EXTFUNCL, "CMmSmsMessHandler::ExtFuncL, Internal Ack handling started" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_EXTFUNCL_TD, "CMmSmsMessHandler::ExtFuncL, Internal Ack handling started" ); } ret = SmsReceivedMsgReportReq( ESmsMessagingAckSmsStored, @@ -1830,15 +1782,11 @@ if ( NULL == msgData ) { TFLOGSTRING("TSY: CMmSmsMessHandler::ExtFuncL.Internal Nack handling started" ); -OstTrace0( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_EXTFUNCL, "CMmSmsMessHandler::ExtFuncL, Internal Nack handling started" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_EXTFUNCL_TD, "CMmSmsMessHandler::ExtFuncL, Internal Nack handling started" ); } - // NACK due to lack of storage space causes NTSY to reject further - // MT SMs until client resumes SMS reception - TUint8 traId = KErrGsmSMSMemoryCapacityExceeded == rpCause ? - ESmsMessagingNackSmsStoredCapacityExceeded : ESmsMessagingNackSmsStored; ret = SmsReceivedMsgReportReq( - traId, + ESmsMessagingNackSmsStored, msgData, rpCause ); break; @@ -1885,7 +1833,7 @@ case ECustomSetSimMessageStatusReadIPC: { TFLOGSTRING("TSY: CMmSmsMessHandler::ExtFuncL - ECustomSetSimMessageStatusReadIPC starts."); -OstTrace0( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_EXTFUNCL, "CMmSmsMessHandler::ExtFuncL, ECustomSetSimMessageStatusReadIPC starts" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_EXTFUNCL_TD, "CMmSmsMessHandler::ExtFuncL, ECustomSetSimMessageStatusReadIPC starts" ); TTime scTime; TInt timezoneDiff; aDataPackage->UnPackData( scTime, timezoneDiff ); @@ -1912,7 +1860,7 @@ currentSlot++; } TFLOGSTRING("TSY: CMmSmsMessHandler::ExtFuncL - ECustomSetSimMessageStatusReadIPC done."); -OstTrace0( TRACE_NORMAL, DUP5_CMMSMSMESSHANDLER_EXTFUNCL, "CMmSmsMessHandler::ExtFuncL, ECustomSetSimMessageStatusReadIPC done" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMSMSMESSHANDLER_EXTFUNCL_TD, "CMmSmsMessHandler::ExtFuncL, ECustomSetSimMessageStatusReadIPC done" ); ret = KErrNone; break; } @@ -1926,7 +1874,7 @@ default: { TFLOGSTRING2("TSY: CMmSmsMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP6_CMMSMSMESSHANDLER_EXTFUNCL, "CMmSmsMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP6_CMMSMSMESSHANDLER_EXTFUNCL_TD, "CMmSmsMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc ); ret = KErrArgument; break; } @@ -1947,7 +1895,7 @@ RMobileSmsStore::TMobileGsmSmsEntryV1* aSMSOnSIM ) //SMS stored on SIM { TFLOGSTRING2("TSY: CMmSmsMessHandler::CheckTpPidAndSenderAndServiceCenter, aReceivedTpPid = %d", aReceivedTpPid); -OstTraceExt1( TRACE_NORMAL, CMMSMSMESSHANDLER_CHECKTPPIDANDSENDERANDSERVICECENTER, "CMmSmsMessHandler::CheckTpPidAndSenderAndServiceCenter;aReceivedTpPid=%hhu", aReceivedTpPid ); +OstTraceExt1( TRACE_NORMAL, CMMSMSMESSHANDLER_CHECKTPPIDANDSENDERANDSERVICECENTER_TD, "CMmSmsMessHandler::CheckTpPidAndSenderAndServiceCenter;aReceivedTpPid=%hhu", aReceivedTpPid ); TBool matchFound( EFalse ); @@ -2014,7 +1962,7 @@ else // could not extract data from received message { TFLOGSTRING("TSY: CMmSmsMessHandler::CheckTpPidAndSenderAndServiceCenter: Could not extract data from received message"); - OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_CHECKTPPIDANDSENDERANDSERVICECENTER, "CMmSmsMessHandler::CheckTpPidAndSenderAndServiceCenter: Could not extract data from received message" ); + OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_CHECKTPPIDANDSENDERANDSERVICECENTER_TD, "CMmSmsMessHandler::CheckTpPidAndSenderAndServiceCenter: Could not extract data from received message" ); return EFalse; } @@ -2052,7 +2000,7 @@ else // Could not extract data from received message { TFLOGSTRING("TSY: CMmSmsMessHandler::CheckTpPidAndSenderAndServiceCenter: Could not extract data from received message"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_CHECKTPPIDANDSENDERANDSERVICECENTER, "CMmSmsMessHandler::CheckTpPidAndSenderAndServiceCenter - Could not extract data from received message" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_CHECKTPPIDANDSENDERANDSERVICECENTER_TD, "CMmSmsMessHandler::CheckTpPidAndSenderAndServiceCenter - Could not extract data from received message" ); return EFalse; } @@ -2091,14 +2039,14 @@ TInt CMmSmsMessHandler::GetSmsStoreInfo( TInt aIpc ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::GetSmsStoreInfo - IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_GETSMSSTOREINFO, "CMmSmsMessHandler::GetSmsStoreInfo;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_GETSMSSTOREINFO_TD, "CMmSmsMessHandler::GetSmsStoreInfo;aIpc=%d", aIpc ); TInt ret( KErrNone ); // SIM SMS cache: // -- EMobileSmsMessagingGetMessageStoreInfo/EMobilePhoneStoreGetInfo if ( KErrNone == iSmsCache.Status() ) { TFLOGSTRING("TSY: CMmSmsMessHandler::GetSmsStoreInfo -- completed immediatedly"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_GETSMSSTOREINFO, "CMmSmsMessHandler::GetSmsStoreInfo, completed immediatedly" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_GETSMSSTOREINFO_TD, "CMmSmsMessHandler::GetSmsStoreInfo, completed immediatedly" ); TUint8 numOfLoc( TUint8( iSmsCache.TotalEntries() ) ); TInt usedEntries( iSmsCache.UsedEntries() ); CMmDataPackage data; @@ -2109,20 +2057,20 @@ else if ( KErrNoMemory == iSmsCache.Status() ) { TFLOGSTRING("TSY: CMmSmsMessHandler::GetSmsStoreInfo -- recovering from OOM"); -OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_GETSMSSTOREINFO, "CMmSmsMessHandler::GetSmsStoreInfo, recovering from OOM" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_GETSMSSTOREINFO_TD, "CMmSmsMessHandler::GetSmsStoreInfo, recovering from OOM" ); InitializeSmsCache(); } // cache is not ready, start waiting else if ( KErrNotReady == iSmsCache.Status() ) { TFLOGSTRING("TSY: CMmSmsMessHandler::GetSmsStoreInfo -- waiting"); -OstTrace0( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_GETSMSSTOREINFO, "CMmSmsMessHandler::GetSmsStoreInfo, waiting" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_GETSMSSTOREINFO_TD, "CMmSmsMessHandler::GetSmsStoreInfo, waiting" ); } // some other, error return error value else { TFLOGSTRING("TSY: CMmSmsMessHandler::GetSmsStoreInfo -- failed"); -OstTrace0( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_GETSMSSTOREINFO, "CMmSmsMessHandler::GetSmsStoreInfo, failed" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_GETSMSSTOREINFO_TD, "CMmSmsMessHandler::GetSmsStoreInfo, failed" ); ret = iSmsCache.Status(); } return ret; @@ -2136,7 +2084,7 @@ TInt CMmSmsMessHandler::DeleteSms( const CMmDataPackage* aDataPackage ) { TFLOGSTRING("TSY: CMmSmsMessHandler::DeleteSms"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_DELETESMS, "CMmSmsMessHandler::DeleteSms" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_DELETESMS_TD, "CMmSmsMessHandler::DeleteSms" ); // SIM SMS cache: -- EMobilePhoneStoreDelete TInt ret( KErrNone ); @@ -2189,7 +2137,7 @@ else { TFLOGSTRING("TSY: CMmSmsMessHandler::DeleteSms, cache not ready/failed"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_DELETESMS, "CMmSmsMessHandler::DeleteSms, cache not ready/failed" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_DELETESMS_TD, "CMmSmsMessHandler::DeleteSms, cache not ready/failed" ); ret = iSmsCache.Status(); } return ret; @@ -2203,7 +2151,7 @@ TInt CMmSmsMessHandler::DeleteAllSms() { TFLOGSTRING("TSY: CMmSmsMessHandler::DeleteAllSms"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_DELETEALLSMS, "CMmSmsMessHandler::DeleteAllSms" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_DELETEALLSMS_TD, "CMmSmsMessHandler::DeleteAllSms" ); TInt ret( KErrNone ); // SIM SMS cache: -- EMobilePhoneStoreDeleteAll if ( KErrNone == iSmsCache.Status() ) @@ -2256,7 +2204,7 @@ else { TFLOGSTRING("TSY: CMmSmsMessHandler::DeleteAllSms, cache not ready/failed"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_DELETEALLSMS, "CMmSmsMessHandler::DeleteAllSms, cache not ready/failed" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_DELETEALLSMS_TD, "CMmSmsMessHandler::DeleteAllSms, cache not ready/failed" ); ret = iSmsCache.Status(); } return ret; @@ -2270,7 +2218,7 @@ TInt CMmSmsMessHandler::ReadSms( const CMmDataPackage* aDataPackage ) { TFLOGSTRING("TSY: CMmSmsMessHandler::ReadSms"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_READSMS, "CMmSmsMessHandler::ReadSms" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_READSMS_TD, "CMmSmsMessHandler::ReadSms" ); TInt ret( KErrNone ); @@ -2313,7 +2261,7 @@ else { TFLOGSTRING("TSY: CMmSmsMessHandler::ReadSms, cache not ready/failed"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_READSMS, "CMmSmsMessHandler::ReadSms, cache not ready/failed" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_READSMS_TD, "CMmSmsMessHandler::ReadSms, cache not ready/failed" ); ret = iSmsCache.Status(); } return ret; @@ -2327,7 +2275,7 @@ TInt CMmSmsMessHandler::ReadAllSmsL() { TFLOGSTRING("TSY: CMmSmsMessHandler::ReadAllSms"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_READALLSMSL, "CMmSmsMessHandler::ReadAllSmsL" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_READALLSMSL_TD, "CMmSmsMessHandler::ReadAllSmsL" ); TInt ret( KErrNone ); // SIM SMS cache: -- EMobilePhoneStoreReadAllPhase1 @@ -2383,7 +2331,7 @@ else { TFLOGSTRING("TSY: CMmSmsMessHandler::ReadAllSms --- cache not ready/failed"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_READALLSMSL, "CMmSmsMessHandler::ReadAllSmsL, cache not ready/failed" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_READALLSMSL_TD, "CMmSmsMessHandler::ReadAllSmsL, cache not ready/failed" ); iSmsListArray->ResetAndDestroy(); CMmDataPackage package; package.PackData( &iSmsListArray, &iReceivedClass2ToBeReSent ); @@ -2408,7 +2356,7 @@ TInt ret( KErrNone ); TFLOGSTRING("TSY: CMmSmsMessHandler::WriteSms"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_WRITESMS, "CMmSmsMessHandler::WriteSms" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_WRITESMS_TD, "CMmSmsMessHandler::WriteSms" ); // SIM SMS cache: -- EMobilePhoneStoreWrite //check if sms writing is ongoing or not @@ -2460,10 +2408,13 @@ void CMmSmsMessHandler::InitializeSmsCache() { // SIM SMS cache: initialize cache + if( KErrNotReady != iSmsCache.Status() ) + { TFLOGSTRING("TSY: CMmSmsMessHandler::InitializeSmsCache -- SMS CACHEING START ---"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_INITIALIZESMSCACHE, "CMmSmsMessHandler::InitializeSmsCache" ); - iSmsCache.Reset(); - GetNumOfEFSMSRecords (); // Read EF SMS count. +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_INITIALIZESMSCACHE_TD, "CMmSmsMessHandler::InitializeSmsCache" ); + iSmsCache.Reset(); + GetNumOfEFSMSRecords (); // Read EF SMS count. + } } // ----------------------------------------------------------------------------- @@ -2477,21 +2428,21 @@ { TFLOGSTRING2( "TSY: CMmSmsMessHandler::HandleError - Error: %d", aError ); -OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_HANDLEERROR, "CMmSmsMessHandler::HandleError;aError=%d", aError ); +OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_HANDLEERROR_TD, "CMmSmsMessHandler::HandleError;aError=%d", aError ); TUint8 resource( aIsiMsg.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) ); TUint8 messageId( aIsiMsg.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); TUint8 transId( aIsiMsg.Get8bit( ISI_HEADER_OFFSET_TRANSID ) ); TFLOGSTRING4( "TSY: CMmSmsMessHandler::HandleError - resource: %d, msgId: %d, traId: %d", resource, messageId, transId ); -OstTraceExt3(TRACE_NORMAL,DUP1_CMMSMSMESSHANDLER_HANDLEERROR,"CMmSmsMessHandler::HandleError;resource=%hhu;messageId=%hhu;transId=%hhu", resource, messageId, transId ); +OstTraceExt3(TRACE_NORMAL,DUP1_CMMSMSMESSHANDLER_HANDLEERROR_TD,"CMmSmsMessHandler::HandleError;resource=%hhu;messageId=%hhu;transId=%hhu", resource, messageId, transId ); switch ( resource ) { default: { TFLOGSTRING2( "TSY: CMmSmsMessHandler::HandleError - PN_SMS, unknown resource: %d", resource ); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_HANDLEERROR, "CMmSmsMessHandler::HandleError;resource=%hhu", resource ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_HANDLEERROR_TD, "CMmSmsMessHandler::HandleError;resource=%hhu", resource ); // Nothing to do here. break; } @@ -2507,7 +2458,7 @@ RMobileSmsMessaging::TMobileSmsBearer& aBearer ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsSettingsUpdateReq. aBearer: %d", aBearer); -OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSSETTINGSUPDATEREQ, "CMmSmsMessHandler::SmsSettingsUpdateReq;aBearer=%d", aBearer ); +OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSSETTINGSUPDATEREQ_TD, "CMmSmsMessHandler::SmsSettingsUpdateReq;aBearer=%d", aBearer ); TUint8 csRoutePriority( SMS_ROUTE_NOT_AVAILABLE ); TUint8 psRoutePriority( SMS_ROUTE_NOT_AVAILABLE ); @@ -2545,13 +2496,13 @@ default: { TFLOGSTRING2("TSY:CMmSmsMessHandler::SmsSettingsUpdateReq:Invalid bearer = %d",iMobileSmsBearer); -OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSSETTINGSUPDATEREQ, "CMmSmsMessHandler::SmsSettingsUpdateReq;iMobileSmsBearer=%d", iMobileSmsBearer ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSSETTINGSUPDATEREQ_TD, "CMmSmsMessHandler::SmsSettingsUpdateReq;iMobileSmsBearer=%d", iMobileSmsBearer ); break; } } TFLOGSTRING3("TSY:CMmSmsMessHandler::SmsSettingsUpdateReq:CS priority = %d, PS priority = %d",csRoutePriority,psRoutePriority); -OstTraceExt2( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_SMSSETTINGSUPDATEREQ, "CMmSmsMessHandler::SmsSettingsUpdateReq;csRoutePriority=%hhd;psRoutePriority=%hhd", csRoutePriority, psRoutePriority ); +OstTraceExt2( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_SMSSETTINGSUPDATEREQ_TD, "CMmSmsMessHandler::SmsSettingsUpdateReq;csRoutePriority=%hhd;psRoutePriority=%hhd", csRoutePriority, psRoutePriority ); // SMS_SB_ROUTE_INFO sub block (8 bytes) TBuf8 smsRouteInfoBuf( 0 ); @@ -2596,7 +2547,7 @@ ISI_HEADER_SIZE + SMS_SETTINGS_UPDATE_RESP_OFFSET_SMSCAUSE ) ); TFLOGSTRING2("TSY:CMmSmsMessHandler::SmsSettingsUpdateResp: response status=%d.",cause); -OstTraceExt1( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSGSMSETTINGSUPDATERESP, "CMmSmsMessHandler::SmsSettingsUpdateResp;cause=%hhu", cause ); +OstTraceExt1( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSGSMSETTINGSUPDATERESP_TD, "CMmSmsMessHandler::SmsSettingsUpdateResp;cause=%hhu", cause ); TInt err( CMmStaticUtility::CSCauseToEpocError( PN_SMS, @@ -2616,7 +2567,7 @@ TUint8 aIsReplace ) { TFLOGSTRING("TSY: CMmSmsMessHandler::SmsClass2ReceivedMsgInd"); -OstTrace0( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_SMSCLASS2PPROUTINGNTF, "CMmSmsMessHandler::SmsClass2ReceivedMsgInd" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_SMSCLASS2PPROUTINGNTF_TD, "CMmSmsMessHandler::SmsClass2ReceivedMsgInd" ); TInt ret( KErrNone ); TUint smsTpduOffset( 0 ); @@ -2636,7 +2587,7 @@ if ( aIsReplace ) { TFLOGSTRING("TSY: CMmSmsMessHandler::SmsClass2ReceivedMsgInd --- replace"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSCLASS2PPROUTINGNTF, "CMmSmsMessHandler::SmsClass2ReceivedMsgInd, replace" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSCLASS2PPROUTINGNTF_TD, "CMmSmsMessHandler::SmsClass2ReceivedMsgInd, replace" ); for ( TInt i( 0 ); i <= iSmsCache.TotalEntries(); i++ ) { RMobileSmsStore::TMobileGsmSmsEntryV1* simIsiMsg = @@ -2666,7 +2617,7 @@ if ( 0 != location ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsClass2ReceivedMsgInd -- incoming SMS2, writing to location %d", location); -OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSCLASS2PPROUTINGNTF, "CMmSmsMessHandler::SmsClass2ReceivedMsgInd;incoming SMS2, writing to location=%d", location ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSCLASS2PPROUTINGNTF_TD, "CMmSmsMessHandler::SmsClass2ReceivedMsgInd;incoming SMS2, writing to location=%d", location ); // iSmsSlotLocation = TUint8(location); // Write received class2 SMS to SIM Card // Get data from incoming message. @@ -2738,7 +2689,7 @@ else { TFLOGSTRING("TSY: CMmSmsMessHandler::SmsClass2ReceivedMsgInd -- incoming SMS2, cache not ready/failed"); -OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_SMSCLASS2PPROUTINGNTF, "CMmSmsMessHandler::SmsClass2ReceivedMsgInd, incoming SMS2, cache not ready/failed" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_SMSCLASS2PPROUTINGNTF_TD, "CMmSmsMessHandler::SmsClass2ReceivedMsgInd, incoming SMS2, cache not ready/failed" ); ret = KErrGsmSMSMemoryCapacityExceeded; // Setting this true will cause it to be resent? iReceivedClass2ToBeReSent = ETrue; @@ -2752,7 +2703,7 @@ } TFLOGSTRING2("TSY: CMmSmsMessHandler::SmsClass2ReceivedMsgInd ret=%d", ret); -OstTrace1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_SMSCLASS2PPROUTINGNTF, "CMmSmsMessHandler::SmsClass2ReceivedMsgInd;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_SMSCLASS2PPROUTINGNTF_TD, "CMmSmsMessHandler::SmsClass2ReceivedMsgInd;ret=%d", ret ); return ret; } @@ -2765,7 +2716,7 @@ const TIsiReceiveC& aIsiMsg) { TFLOGSTRING("TSY: CMmSmsMessHandler::SmsClass1ReceivedMsgInd"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSCLASS1PPROUTINGNTF, "CMmSmsMessHandler::SmsClass1ReceivedMsgInd" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSCLASS1PPROUTINGNTF_TD, "CMmSmsMessHandler::SmsClass1ReceivedMsgInd" ); TInt ret( KErrNone ); TBool validPduFormat( EFalse ); TSmsMsg smsMsgValue; @@ -2795,7 +2746,7 @@ else { TFLOGSTRING("TSY:CMmSmsMessHandler::SmsClass1ReceivedMsgInd,SMS_SB_ADDRESS expected"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSCLASS1PPROUTINGNTF, "CMmSmsMessHandler::SmsClass1ReceivedMsgInd,SMS_SB_ADDRESS expected" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_SMSCLASS1PPROUTINGNTF_TD, "CMmSmsMessHandler::SmsClass1ReceivedMsgInd,SMS_SB_ADDRESS expected" ); TF_ASSERT_NOT_REACHED(); } @@ -2835,7 +2786,7 @@ else { TFLOGSTRING("TSY:CMmSmsMessHandler::SmsClass1ReceivedMsgInd, SMS_SB_USER_DATA expected"); -OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_SMSCLASS1PPROUTINGNTF, "CMmSmsMessHandler::SmsClass1ReceivedMsgInd, SMS_SB_USER_DATA expected" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_SMSCLASS1PPROUTINGNTF_TD, "CMmSmsMessHandler::SmsClass1ReceivedMsgInd, SMS_SB_USER_DATA expected" ); TF_ASSERT_NOT_REACHED(); } @@ -2868,7 +2819,7 @@ } } TFLOGSTRING2("TSY:CMmSmsMessHandler::SmsClass1ReceivedMsgInd;ret=%d", ret); -OstTrace1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_SMSCLASS1PPROUTINGNTF, "CMmSmsMessHandler::SmsClass1ReceivedMsgInd;ret=%d", ret ); +OstTrace1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_SMSCLASS1PPROUTINGNTF_TD, "CMmSmsMessHandler::SmsClass1ReceivedMsgInd;ret=%d", ret ); return ret; } @@ -2884,7 +2835,7 @@ TUint8& aDestAddressLength ) const { TFLOGSTRING("TSY:CMmSmsMessHandler::GetDestAddressLength"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_GETDESTADDRESSLENGTH, "CMmSmsMessHandler::GetDestAddressLength" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_GETDESTADDRESSLENGTH_TD, "CMmSmsMessHandler::GetDestAddressLength" ); TInt ret( KErrNone ); @@ -2910,26 +2861,27 @@ { ret = KErrArgument; TFLOGSTRING2("TSY:CMmSmsMessHandler::GetDestinationAddressLength: Error! Destination address too long: %d.",aDestAddressLength); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_GETDESTADDRESSLENGTH, "CMmSmsMessHandler::GetDestAddressLength;aDestAddressLength=%hhu", aDestAddressLength ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_GETDESTADDRESSLENGTH_TD, "CMmSmsMessHandler::GetDestAddressLength;aDestAddressLength=%hhu", aDestAddressLength ); } TFLOGSTRING2("TSY:CMmSmsMessHandler::GetDestinationAddressLength:Destination address length %d.",aDestAddressLength); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_GETDESTADDRESSLENGTH, "CMmSmsMessHandler::GetDestAddressLength;aDestAddressLength=%hhu", aDestAddressLength ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_GETDESTADDRESSLENGTH_TD, "CMmSmsMessHandler::GetDestAddressLength;aDestAddressLength=%hhu", aDestAddressLength ); return ret; } // ----------------------------------------------------------------------------- +// CMmSmsMessHandler::BuildSmsSbSubmit // Creates SMS_SB_SUBMIT subblock and appends it to ISI message // ----------------------------------------------------------------------------- // -void CMmSmsMessHandler::BuildSmsSbSubmit( +TUint16 CMmSmsMessHandler::BuildSmsSbSubmit( const TDesC8& aMsgData, TIsiSend& aIsiMsg, - TUint8 aMsgOffset, - TUint8 aDestAddressLength ) const + TUint8 aDestAddressLength, + TUint aMsgOffset ) const { TFLOGSTRING("TSY:CMmSmsMessHandler::BuildSmsSbSubmit"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDSMSSBSUBMIT, "CMmSmsMessHandler::BuildSmsSbSubmit" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDSMSSBSUBMIT_TD, "CMmSmsMessHandler::BuildSmsSbSubmit" ); // Extract needed parameters from TPDU for for SMS_SB_SUBMIT TUint8 messageParameters( aMsgData[ KTpduIndexMessageParameters ] ); @@ -2953,20 +2905,23 @@ TFLOGSTRING2( "TSY:CMmSmsMessHandler::BuildSmsSbSubmit. Message reference: %d", messageReference ); TFLOGSTRING2( "TSY:CMmSmsMessHandler::BuildSmsSbSubmit. Protocol ID: %d", protocolId ); TFLOGSTRING2( "TSY:CMmSmsMessHandler::BuildSmsSbSubmit. Data coding scheme: %d", dataCodingScheme ); -OstTraceExt4( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_BUILDSMSSBSUBMIT, "CMmSmsMessHandler::BuildSmsSbSubmit;messageParameters=%hhu;messageReference=%hhu;protocolId=%hhu;dataCodingScheme=%hhu", messageParameters, messageReference, protocolId, dataCodingScheme ); +OstTraceExt4( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_BUILDSMSSBSUBMIT_TD, "CMmSmsMessHandler::BuildSmsSbSubmit;messageParameters=%hhu;messageReference=%hhu;protocolId=%hhu;dataCodingScheme=%hhu", messageParameters, messageReference, protocolId, dataCodingScheme ); + + return submitBuf.Length(); } // ----------------------------------------------------------------------------- +// CMmSmsMessHandler::BuildSmsSbCommand // Creates SMS_SB_COMMAND subblock and appends it to ISI message // ----------------------------------------------------------------------------- -void CMmSmsMessHandler::BuildSmsSbCommand( +TUint16 CMmSmsMessHandler::BuildSmsSbCommand( const TDesC8& aMsgData, TIsiSend& aIsiMsg, - TUint8 aMsgOffset ) const + TUint aMsgOffset ) const { TFLOGSTRING("TSY:CMmSmsMessHandler::BuildSmsSbCommand"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDSMSSBCOMMAND, "CMmSmsMessHandler::BuildSmsSbCommand" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDSMSSBCOMMAND_TD, "CMmSmsMessHandler::BuildSmsSbCommand" ); // Extract needed parameters from TPDU for SMS_SB_COMMAND TUint8 messageParameters( aMsgData[ KTpduIndexMessageParameters ] ); @@ -2995,24 +2950,26 @@ TFLOGSTRING2( "TSY:CMmSmsMessHandler::BuildSmsSbCommand. Protocol ID: %d", protocolId ); TFLOGSTRING2( "TSY:CMmSmsMessHandler::BuildSmsSbCommand. Command type: %d", commandType ); TFLOGSTRING2( "TSY:CMmSmsMessHandler::BuildSmsSbCommand. Message Number: %d", messageNumber ); -OstTraceExt5( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_BUILDSMSSBCOMMAND, "CMmSmsMessHandler::BuildSmsSbCommand;messageParameters=%hhu;messageReference=%hhu;protocolId=%hhu;commandType=%hhu;messageNumber=%hhu", messageParameters, messageReference, protocolId, commandType, messageNumber ); +OstTraceExt5( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_BUILDSMSSBCOMMAND_TD, "CMmSmsMessHandler::BuildSmsSbCommand;messageParameters=%hhu;messageReference=%hhu;protocolId=%hhu;commandType=%hhu;messageNumber=%hhu", messageParameters, messageReference, protocolId, commandType, messageNumber ); + + return commandBuf.Length(); } // ----------------------------------------------------------------------------- +// CMmSmsMessHandler::BuildSmsSbAddress // Creates SMS_SB_ADDRESS subblock and appends it to ISI message // ----------------------------------------------------------------------------- -TUint8 CMmSmsMessHandler::BuildSmsSbAddress( +TUint16 CMmSmsMessHandler::BuildSmsSbAddress( const TDesC8& aAddress, TIsiSend& aIsiMsg, TUint8 aAddressType, - TUint8 aMsgOffset ) const + TUint aMsgOffset ) const { TFLOGSTRING("TSY:CMmSmsMessHandler::BuildSmsSbAddress"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDSMSSBADDRESS, "CMmSmsMessHandler::BuildSmsSbAddress" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDSMSSBADDRESS_TD, "CMmSmsMessHandler::BuildSmsSbAddress" ); TUint8 addressLength( aAddress.Length() ); - TUint8 subblockLength( 0 ); // Create and fill SMS_SB_ADDRESS subblock TBuf8 addressBuf( 0 ); TIsiSubBlock address( @@ -3025,42 +2982,37 @@ aIsiMsg.CopyData( aMsgOffset, address.CompleteSubBlock() ); - // Subblock length is needed for return value - subblockLength = addressBuf.Length(); - TFLOGSTRING2( "TSY:CMmSmsMessHandler::BuildSmsSbAddress. Address type: %d", aAddressType ); TFLOGSTRING2( "TSY:CMmSmsMessHandler::BuildSmsSbAddress. Address length: %d", addressLength ); -OstTraceExt2( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_BUILDSMSSBADDRESS, "CMmSmsMessHandler::BuildSmsSbAddress;aAddressType=%hhu;addressLength=%hhu", aAddressType, addressLength ); +OstTraceExt2( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_BUILDSMSSBADDRESS_TD, "CMmSmsMessHandler::BuildSmsSbAddress;aAddressType=%hhu;addressLength=%hhu", aAddressType, addressLength ); #ifdef _DEBUG for ( TInt i( 0 ); i < aAddress.Length(); i++ ) { TFLOGSTRING3( "TSY:CMmSmsMessHandler::BuildSmsSbAddress. Address data[%d]: 0x%x", i, aAddress[i] ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_BUILDSMSSBADDRESS, "CMmSmsMessHandler::BuildSmsSbAddress;i=%hhu;aAddress[i]=%hhu", i, aAddress[i] ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_BUILDSMSSBADDRESS_TD, "CMmSmsMessHandler::BuildSmsSbAddress;i=%hhu;aAddress[i]=%hhu", i, aAddress[i] ); } #endif // _DEBUG -TFLOGSTRING2( "TSY:CMmSmsMessHandler::BuildSmsSbAddress. Length of subblock: %d", subblockLength ); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_BUILDSMSSBADDRESS, "CMmSmsMessHandler::BuildSmsSbAddress;subblockLength=%hhu", subblockLength ); - - return subblockLength; + + return addressBuf.Length(); } // ----------------------------------------------------------------------------- +// CMmSmsMessHandler::BuildSmsSbUserData // Creates SMS_SB_USER_DATA subblock and appends it to ISI message // ----------------------------------------------------------------------------- -TUint8 CMmSmsMessHandler::BuildSmsSbUserData( +TUint16 CMmSmsMessHandler::BuildSmsSbUserData( const TDesC8& aMsgData, TIsiSend& aIsiMsg, TUint8 aTpUdl, TUint8 aTpUserDataIndex, TBool aDefaultAlphabet, - TUint8 aMsgOffset ) const + TUint aMsgOffset ) const { TFLOGSTRING("TSY:CMmSmsMessHandler::BuildSmsSbUserData"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDSMSSBUSERDATA, "CMmSmsMessHandler::BuildSmsSbUserData" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDSMSSBUSERDATA_TD, "CMmSmsMessHandler::BuildSmsSbUserData" ); TUint8 dataLengthInOctets( 0 ); - TUint8 subblockLength( 0 ); // If data is 7-bit, then TP-UDL is integer representation of // the number of septets within the TP-UD field @@ -3090,30 +3042,27 @@ aIsiMsg.CopyData( aMsgOffset, userData.CompleteSubBlock() ); - subblockLength = userDataBuf.Length(); - TFLOGSTRING2( "TSY:CMmSmsMessHandler::BuildSmsSbUserData. User data length in octets: %d", dataLengthInOctets ); TFLOGSTRING2( "TSY:CMmSmsMessHandler::BuildSmsSbUserData. User data character count: %d", aTpUdl ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_BUILDSMSSBUSERDATA, "CMmSmsMessHandler::BuildSmsSbUserData;dataLengthInOctets=%hhu;aTpUdl=%hhu", dataLengthInOctets, aTpUdl ); -TFLOGSTRING2( "TSY:CMmSmsMessHandler::BuildSmsSbUserData. Length of subblock: %d", subblockLength ); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_BUILDSMSSBUSERDATA, "CMmSmsMessHandler::BuildSmsSbUserData;subblockLength=%hhu", subblockLength ); - - return subblockLength; +OstTraceExt2( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_BUILDSMSSBUSERDATA_TD, "CMmSmsMessHandler::BuildSmsSbUserData;dataLengthInOctets=%hhu;aTpUdl=%hhu", dataLengthInOctets, aTpUdl ); + + return userDataBuf.Length(); } // ----------------------------------------------------------------------------- +// CMmSmsMessHandler::BuildSmsSbValidityPeriod // Creates SMS_SB_VALIDITY_PERIOD subblock and appends it to ISI message // ----------------------------------------------------------------------------- -void CMmSmsMessHandler::BuildSmsSbValidityPeriod( +TUint16 CMmSmsMessHandler::BuildSmsSbValidityPeriod( const TDesC8& aMsgData, TIsiSend& aIsiMsg, TUint8 aTpVpIndex, TUint8 aTpVpLength, - TUint8 aMsgOffset ) const + TUint aMsgOffset ) const { TFLOGSTRING("TSY:CMmSmsMessHandler::BuildSmsSbValidityPeriod"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDSMSSBVALIDITYPERIOD, "CMmSmsMessHandler::BuildSmsSbValidityPeriod" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDSMSSBVALIDITYPERIOD_TD, "CMmSmsMessHandler::BuildSmsSbValidityPeriod" ); // Extract validity period data bytes TPtrC8 tpVpData( aMsgData.Mid( aTpVpIndex, aTpVpLength ) ); @@ -3130,27 +3079,30 @@ aIsiMsg.CopyData( aMsgOffset, validityPeriod.CompleteSubBlock() ); TFLOGSTRING2( "TSY:CMmSmsMessHandler::BuildSmsSbValidityPeriod. Validity period length: %d", aTpVpLength ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_BUILDSMSSBVALIDITYPERIOD, "CMmSmsMessHandler::BuildSmsSbValidityPeriod;aTpVpLength=%hhu", aTpVpLength ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_BUILDSMSSBVALIDITYPERIOD_TD, "CMmSmsMessHandler::BuildSmsSbValidityPeriod;aTpVpLength=%hhu", aTpVpLength ); #ifdef _DEBUG for ( TInt i( 0 ); i < aTpVpLength; i++ ) { TFLOGSTRING3( "Validity period, byte[%d], 0x%x", i, tpVpData[i] ); -OstTraceExt2( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_BUILDSMSSBVALIDITYPERIOD, "CMmSmsMessHandler::BuildSmsSbValidityPeriod;i=%hhu;tpVpData[i]=%hhu", i, tpVpData[i] ); +OstTraceExt2( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_BUILDSMSSBVALIDITYPERIOD_TD, "CMmSmsMessHandler::BuildSmsSbValidityPeriod;i=%hhu;tpVpData[i]=%hhu", i, tpVpData[i] ); } #endif // _DEBUG + + return validityPeriodBuf.Length(); } // ----------------------------------------------------------------------------- +// CMmSmsMessHandler::BuildSmsCheckInfo // Creates SMS_SB_CHECK_INFO sub block with SMS_CHECK_DISABLE_FDN and appends it // to ISI message. // ----------------------------------------------------------------------------- -void CMmSmsMessHandler::BuildSmsCheckInfo( +TUint16 CMmSmsMessHandler::BuildSmsCheckInfo( TIsiSend& aIsiMsg, - TUint8 aMsgOffset ) const + TUint aMsgOffset ) const { TFLOGSTRING("TSY:CMmSmsMessHandler::BuildSmsCheckInfo"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDSMSCHECKINFO, "CMmSmsMessHandler::BuildSmsCheckInfo" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_BUILDSMSCHECKINFO_TD, "CMmSmsMessHandler::BuildSmsCheckInfo" ); // Create and fill SMS_SB_CHECK_INFO subblock. TBuf8 checkInfoBuf; @@ -3165,6 +3117,7 @@ aIsiMsg.CopyData( aMsgOffset, checkInfo.CompleteSubBlock() ); + return checkInfoBuf.Length(); } // ----------------------------------------------------------------------------- @@ -3179,8 +3132,8 @@ const TDesC8& aFileData ) { TFLOGSTRING3("TSY:CMmSmsMessHandler::ProcessUiccMsg, aTraId: %d, status: %d", aTraId, aStatus ); -OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_PROCESSUICCMSG, "CMmSmsMessHandler::ProcessUiccMsg;aTraId=%d", aTraId ); -OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_PROCESSUICCMSG, "CMmSmsMessHandler::ProcessUiccMsg;aStatus=%d", aStatus ); +OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_PROCESSUICCMSG_TD, "CMmSmsMessHandler::ProcessUiccMsg;aTraId=%d", aTraId ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_PROCESSUICCMSG_TD, "CMmSmsMessHandler::ProcessUiccMsg;aStatus=%d", aStatus ); TInt ret( KErrNone ); @@ -3273,7 +3226,7 @@ default: { TFLOGSTRING("TSY:CMmSmsMessHandler::ProcessUiccMsg - unknown transaction ID" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_PROCESSUICCMSG, "CMmSmsMessHandler::ProcessUiccMsg - unknown transaction ID" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_PROCESSUICCMSG_TD, "CMmSmsMessHandler::ProcessUiccMsg - unknown transaction ID" ); break; } @@ -3291,7 +3244,7 @@ const TUiccTrId aTrId ) { TFLOGSTRING3("TSY: CMmSmsMessHandler::UiccReadSMSReq, aTraId: %d, aRecordId: %d", aTrId, aRecordId ); -OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCREADSMSORSMSRECORDCOUNTREQ, "CMmSmsMessHandler::UiccReadSMSOrSMSRecordCountReq;aTrId=%hhu;aRecordId=%hhu", aTrId, aRecordId ); +OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCREADSMSORSMSRECORDCOUNTREQ_TD, "CMmSmsMessHandler::UiccReadSMSOrSMSRecordCountReq;aTrId=%hhu;aRecordId=%hhu", aTrId, aRecordId ); TUint8 serviceType( 0 ); TInt ret( KErrNone ); @@ -3314,7 +3267,7 @@ default: { TFLOGSTRING("TSY: CMmSmsMessHandler::UiccReadSMSReq - unknown transaction ID" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_UICCREADSMSORSMSRECORDCOUNTREQ, "CMmSmsMessHandler::UiccReadSMSOrSMSRecordCountReq - unknown transaction ID" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_UICCREADSMSORSMSRECORDCOUNTREQ_TD, "CMmSmsMessHandler::UiccReadSMSOrSMSRecordCountReq - unknown transaction ID" ); ret = KErrUnknown; break; } @@ -3355,12 +3308,12 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmSmsMessHandler::UiccReadSMSResp" ); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCREADSMSRESP, "CMmSmsMessHandler::UiccReadSMSResp" ); - - if ( KErrNone == aStatus ) +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCREADSMSRESP_TD, "CMmSmsMessHandler::UiccReadSMSResp" ); + + if ( UICC_STATUS_OK == aStatus ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::SimStSmsHandleReadCacheEntriesL -- cacheing iRecordId=%d", iRecordId ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_UICCREADSMSRESP, "CMmSmsMessHandler::UiccReadSMSResp;iRecordId=%hhu", iRecordId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_UICCREADSMSRESP_TD, "CMmSmsMessHandler::UiccReadSMSResp;iRecordId=%hhu", iRecordId ); if ( 0 != aFileData.Length() ) { @@ -3420,7 +3373,7 @@ else { TFLOGSTRING("TSY: CMmSmsMessHandler::UiccReadSMSResp - abort caching"); -OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_UICCREADSMSRESP, "CMmSmsMessHandler::UiccReadSMSResp - abort caching" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_UICCREADSMSRESP_TD, "CMmSmsMessHandler::UiccReadSMSResp - abort caching" ); // else SIM suddenly removed ==> abort caching // or example SIM rejected (EFSA-6ZQ9K3). @@ -3436,10 +3389,10 @@ if ( KErrNotReady != iSmsCache.Status() ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::UiccReadSMSResp - Success or Error value of SMS cache read = %d",iSmsCache.Status() ); -OstTrace1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_UICCREADSMSRESP, "CMmSmsMessHandler::UiccReadSMSResp;iSmsCache.Status()=%d", iSmsCache.Status() ); +OstTrace1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_UICCREADSMSRESP_TD, "CMmSmsMessHandler::UiccReadSMSResp;iSmsCache.Status()=%d", iSmsCache.Status() ); TFLOGSTRING3("TSY: CMmSmsMessHandler::UiccReadSMSResp --- SMS CACHE READ DONE --- total=%d used=%d",iSmsCache.TotalEntries(), iSmsCache.UsedEntries() ); -OstTrace1( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_UICCREADSMSRESP, "CMmSmsMessHandler::UiccReadSMSResp;iSmsCache.TotalEntries()=%d", iSmsCache.TotalEntries() ); +OstTrace1( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_UICCREADSMSRESP_TD, "CMmSmsMessHandler::UiccReadSMSResp;iSmsCache.TotalEntries()=%d", iSmsCache.TotalEntries() ); // there is a chance that EMobileSmsMessagingGetMessageStoreInfo // request is already on if so, then complete it here... if there is @@ -3470,7 +3423,7 @@ if ( KErrNone == iSmsCache.Status() && iReceivedClass2ToBeReSent ) { TFLOGSTRING("TSY: CMmSmsMessHandler::UiccReadSMSResp -- resume SMS reception"); -OstTrace0( TRACE_NORMAL, DUP5_CMMSMSMESSHANDLER_UICCREADSMSRESP, "CMmSmsMessHandler::UiccReadSMSResp -- resume SMS reception" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMSMSMESSHANDLER_UICCREADSMSRESP_TD, "CMmSmsMessHandler::UiccReadSMSResp -- resume SMS reception" ); SmsReceiveMessageReq( SMS_RECEPTION_STORAGE_STATUS_UPDATE ); iReceivedClass2ToBeReSent = EFalse; } @@ -3487,13 +3440,13 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmSmsMessHandler::UiccReadSMSRespForComplete" ); -//OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCREADSMSRESP, "CMmSmsMessHandler::UiccReadSMSResp;aStatus=%d;aFileData=%s", aStatus,aFileData ); - - - if ( KErrNone == aStatus ) +//OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCREADSMSRESP_TD, "CMmSmsMessHandler::UiccReadSMSResp;aStatus=%d;aFileData=%s", aStatus,aFileData ); + + + if ( UICC_STATUS_OK == aStatus ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::UiccReadSMSRespForComplete -- cacheing iRecordId=%d", iRecordId ); -OstTraceExt1( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCREADSMSRESPFORCOMPLETE, "CMmSmsMessHandler::UiccReadSMSRespForComplete;iRecordId=%hhu", iRecordId ); +OstTraceExt1( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCREADSMSRESPFORCOMPLETE_TD, "CMmSmsMessHandler::UiccReadSMSRespForComplete;iRecordId=%hhu", iRecordId ); if ( 0 != aFileData.Length() ) { @@ -3644,7 +3597,7 @@ ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::UiccWriteSMSReq aRecordId: %d", aRecordId ); -OstTraceExt1( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCWRITESMSREQ, "CMmSmsMessHandler::UiccWriteSMSReq;aRecordId=%hhu", aRecordId ); +OstTraceExt1( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCWRITESMSREQ_TD, "CMmSmsMessHandler::UiccWriteSMSReq;aRecordId=%hhu", aRecordId ); // Set parameters for UICC_APPL_CMD_REQ message TUiccWriteLinearFixed params; @@ -3723,14 +3676,14 @@ void CMmSmsMessHandler::UiccWriteSMSResp( TInt aStatus ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::UiccWriteSMSResp aStatus: %d", aStatus ); -OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCWRITESMSRESP, "CMmSmsMessHandler::UiccWriteSMSResp;aStatus=%d", aStatus ); +OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCWRITESMSRESP_TD, "CMmSmsMessHandler::UiccWriteSMSResp;aStatus=%d", aStatus ); // Create Package CMmDataPackage package; if ( iSMSClass2Write ) { - if ( KErrNone == aStatus ) + if ( UICC_STATUS_OK == aStatus ) { // After writing class2 SMS to SIM card, it has // to be read in case SIM SW has changed the contents @@ -3780,7 +3733,7 @@ } else { - if ( KErrNone == aStatus ) + if ( UICC_STATUS_OK == aStatus ) { // After writing class2 SMS to SIM card, it has // to be read in case SIM SW has changed the contents @@ -3819,7 +3772,7 @@ void CMmSmsMessHandler::GetNumOfEFSMSRecords( void ) { TFLOGSTRING("TSY: CMmSmsMessHandler::GetNumOfEFSMSRecords" ); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_GETNUMOFEFSMSRECORDS, "CMmSmsMessHandler::GetNumOfEFSMSRecords" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_GETNUMOFEFSMSRECORDS_TD, "CMmSmsMessHandler::GetNumOfEFSMSRecords" ); TUint8 recordID( 0 ); TUiccTrId trId( ETrIdReadSMSRecordCount ); @@ -3838,12 +3791,12 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmSmsMessHandler::GetNumOfEFSMSRecordsResp" ); -OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_GETNUMOFEFSMSRECORDSRESP, "CMmSmsMessHandler::GetNumOfEFSMSRecordsResp;aStatus=%d;aFileData=%s", aStatus, aFileData ); +OstTraceExt2( TRACE_NORMAL, CMMSMSMESSHANDLER_GETNUMOFEFSMSRECORDSRESP_TD, "CMmSmsMessHandler::GetNumOfEFSMSRecordsResp;aStatus=%d;aFileData=%s", aStatus, aFileData ); //Save number of SMS locations on SIM card TInt smsNumOfLoc( 0 ); - if ( KErrNone == aStatus ) + if ( UICC_STATUS_OK == aStatus ) { TFci fci( aFileData ); smsNumOfLoc = fci.GetNumberOfRecords(); @@ -3855,7 +3808,7 @@ // got the total number or SIM SMS entries iSmsCache.SetTotalEntriesL( smsNumOfLoc ); TFLOGSTRING2("TSY: CMmSmsMessHandler::SimStSmsGetNumOfLocRespL -- total number of locations on sim %d", iSmsCache.TotalEntries() ); -OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_GETNUMOFEFSMSRECORDSRESP, "CMmSmsMessHandler::GetNumOfEFSMSRecordsResp;iSmsCache.TotalEntries()=%d", iSmsCache.TotalEntries() ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_GETNUMOFEFSMSRECORDSRESP_TD, "CMmSmsMessHandler::GetNumOfEFSMSRecordsResp;iSmsCache.TotalEntries()=%d", iSmsCache.TotalEntries() ); // now start reading entries one by one starting from record 1 UiccReadSMSOrSMSRecordCountReq( 1, ETrIdReadSMS ); @@ -3888,7 +3841,7 @@ void CMmSmsMessHandler::UiccDeleteSMSResp( TInt aStatus ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::UiccDeleteSMSResp aStatus: %d", aStatus ); -OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_UICCDELETESMSRESP, "CMmSmsMessHandler::UiccDeleteSMSResp;aStatus=%d", aStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_UICCDELETESMSRESP_TD, "CMmSmsMessHandler::UiccDeleteSMSResp;aStatus=%d", aStatus ); // Create Package CMmDataPackage package; @@ -3911,7 +3864,7 @@ void CMmSmsMessHandler::UiccDeleteAllSMSResp( TInt aStatus ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::UiccDeleteSMSResp aStatus: %d", aStatus ); -OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCDELETEALLSMSRESP, "CMmSmsMessHandler::UiccDeleteAllSMSResp;aStatus=%d", aStatus ); +OstTrace1( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCDELETEALLSMSRESP_TD, "CMmSmsMessHandler::UiccDeleteAllSMSResp;aStatus=%d", aStatus ); // Create Package CMmDataPackage package; @@ -3948,7 +3901,7 @@ const TTime& aScTime ) { TFLOGSTRING("TSY: CMmSmsMessHandler::CheckSCTimestamp"); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp" ); TBool matchFound( EFalse ); TInt offset( 1 ); // Message Reference position @@ -3975,7 +3928,7 @@ if ( ( 0 == scTimeStamp[1] ) || ( 0 == scTimeStamp[2] ) ) { TFLOGSTRING("TSY:CMmSmsMessHandler::CheckSCTimestamp:Invalid timestamp found, ignored."); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp, Invalid timestamp found, ignored" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp, Invalid timestamp found, ignored" ); matchFound = ETrue; } @@ -4031,36 +3984,36 @@ // debug print TDateTime dt = simStoredTime.DateTime(); TFLOGSTRING("TSY:CMmSmsMessHandler::CheckSCTimestamp:Message stored on SIM:"); -OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp, Message stored on SIM:" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp, Message stored on SIM:" ); TFLOGSTRING2(" year=%d",dt.Year()); -OstTrace1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp;Year=%d", dt.Year() ); +OstTrace1( TRACE_NORMAL, DUP3_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp;Year=%d", dt.Year() ); TFLOGSTRING2(" month=%d",dt.Month()+1); -OstTrace1( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp;Month=%d", ( dt.Month() + 1 ) ); +OstTrace1( TRACE_NORMAL, DUP4_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp;Month=%d", ( dt.Month() + 1 ) ); TFLOGSTRING2(" day=%d",dt.Day()+1); -OstTrace1( TRACE_NORMAL, DUP5_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp;Day=%d", ( dt.Day() + 1 ) ); +OstTrace1( TRACE_NORMAL, DUP5_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp;Day=%d", ( dt.Day() + 1 ) ); TFLOGSTRING2(" hour=%d",dt.Hour()); -OstTrace1( TRACE_NORMAL, DUP6_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp;Hour=%d", dt.Hour() ); +OstTrace1( TRACE_NORMAL, DUP6_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp;Hour=%d", dt.Hour() ); TFLOGSTRING2(" minute=%d",dt.Minute()); -OstTrace1( TRACE_NORMAL, DUP7_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp;Minute=%d", dt.Minute() ); +OstTrace1( TRACE_NORMAL, DUP7_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp;Minute=%d", dt.Minute() ); TFLOGSTRING2(" second=%d",dt.Second()); -OstTrace1( TRACE_NORMAL, DUP8_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp;Second=%d", dt.Second() ); +OstTrace1( TRACE_NORMAL, DUP8_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp;Second=%d", dt.Second() ); TFLOGSTRING2(" timezone difference=%d",simTimezoneDiff); -OstTraceExt1( TRACE_NORMAL, DUP9_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp;simTimezoneDiff=%hhd", simTimezoneDiff ); +OstTraceExt1( TRACE_NORMAL, DUP9_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp;simTimezoneDiff=%hhd", simTimezoneDiff ); dt = aScTime.DateTime(); TFLOGSTRING("TSY:CMmSmsMessHandler::CheckSCTimestamp:Message opened on client side:"); -OstTrace0( TRACE_NORMAL, DUP10_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp, Message opened on client side:" ); +OstTrace0( TRACE_NORMAL, DUP10_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp, Message opened on client side:" ); TFLOGSTRING2(" year=%d",dt.Year()); -OstTrace1( TRACE_NORMAL, DUP11_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp;Year=%d", ( dt.Year() + 1 ) ); +OstTrace1( TRACE_NORMAL, DUP11_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp;Year=%d", ( dt.Year() + 1 ) ); TFLOGSTRING2(" month=%d",dt.Month()+1); -OstTrace1( TRACE_NORMAL, DUP12_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp;Month=%d", ( dt.Month() + 1 ) ); +OstTrace1( TRACE_NORMAL, DUP12_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp;Month=%d", ( dt.Month() + 1 ) ); TFLOGSTRING2(" day=%d",dt.Day()+1); -OstTrace1( TRACE_NORMAL, DUP13_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp;Day=%d", ( dt.Day() + 1 ) ); +OstTrace1( TRACE_NORMAL, DUP13_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp;Day=%d", ( dt.Day() + 1 ) ); TFLOGSTRING2(" hour=%d",dt.Hour()); -OstTrace1( TRACE_NORMAL, DUP14_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp;Hour=%d", dt.Hour() ); +OstTrace1( TRACE_NORMAL, DUP14_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp;Hour=%d", dt.Hour() ); TFLOGSTRING2(" minute=%d",dt.Minute()); -OstTrace1( TRACE_NORMAL, DUP15_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp;Minute=%d", dt.Minute() ); +OstTrace1( TRACE_NORMAL, DUP15_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp;Minute=%d", dt.Minute() ); TFLOGSTRING2(" second=%d",dt.Second()); -OstTrace1( TRACE_NORMAL, DUP16_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP, "CMmSmsMessHandler::CheckSCTimestamp;Second=%d", dt.Second() ); +OstTrace1( TRACE_NORMAL, DUP16_CMMSMSMESSHANDLER_CHECKSCTIMESTAMP_TD, "CMmSmsMessHandler::CheckSCTimestamp;Second=%d", dt.Second() ); // debug print #endif // _DEBUG @@ -4085,7 +4038,7 @@ ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::UiccUpdateSMSStatusReq aRecordId: %d", aRecordId ); -OstTraceExt1( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCUPDATESMSSTATUS, "CMmSmsMessHandler::UiccUpdateSMSStatus;aRecordId=%hhu", aRecordId ); +OstTraceExt1( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCUPDATESMSSTATUS_TD, "CMmSmsMessHandler::UiccUpdateSMSStatus;aRecordId=%hhu", aRecordId ); // Read parameters from SIM // Set parameters for UICC_APPL_CMD_REQ message @@ -4120,9 +4073,9 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmSmsMessHandler::UiccReadSMSResp" ); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCUPDATESMSSTATUSREADSMSRESP, "CMmSmsMessHandler::UiccUpdateSMSStatusReadSMSResp" ); - - if ( KErrNone == aStatus ) +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCUPDATESMSSTATUSREADSMSRESP_TD, "CMmSmsMessHandler::UiccUpdateSMSStatusReadSMSResp" ); + + if ( UICC_STATUS_OK == aStatus ) { if ( 0 != aFileData.Length() ) { @@ -4184,14 +4137,14 @@ void CMmSmsMessHandler::UiccUpdateSMSStatusWriteSMSResp( TInt aStatus ) { TFLOGSTRING2("TSY: CMmSmsMessHandler::UiccUpdateSMSStatusReadSMSResp aStatus: %d", aStatus ); -OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_UICCUPDATESMSSTATUSREADSMSRESP, "CMmSmsMessHandler::UiccUpdateSMSStatusReadSMSResp;aStatus=%d", aStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_UICCUPDATESMSSTATUSREADSMSRESP_TD, "CMmSmsMessHandler::UiccUpdateSMSStatusReadSMSResp;aStatus=%d", aStatus ); iMessageRouter->Complete( ECustomSetSimMessageStatusReadIPC, CMmStaticUtility::UICCCSCauseToEpocError( aStatus ) ); // Update the same flag also in TSY's cache. - if ( KErrNone == aStatus ) + if ( UICC_STATUS_OK == aStatus ) { iSmsCache.SetStorageStatus( iRecordId, RMobileSmsStore::EStoredMessageRead ); } @@ -4206,7 +4159,7 @@ TInt CMmSmsMessHandler::UiccGetSmspEntryReq() { TFLOGSTRING("TSY: CMmSmsMessHandler::UiccGetSmspEntryReq" ); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCREADNUMOFSMSPENTRIES, "CMmSmsMessHandler::UiccGetSmspEntryReq" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCREADNUMOFSMSPENTRIES_TD, "CMmSmsMessHandler::UiccGetSmspEntryReq" ); // Set parameters for UICC_APPL_CMD_REQ message TUiccReadLinearFixed params; @@ -4236,7 +4189,7 @@ TInt CMmSmsMessHandler::UiccStoreSmspEntry( const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmSmsMessHandler::UiccStoreSmspEntry" ); -OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCSTORESMSPENTRY, "CMmSmsMessHandler::UiccStoreSmspEntry" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_UICCSTORESMSPENTRY_TD, "CMmSmsMessHandler::UiccStoreSmspEntry" ); TInt ret( KErrNone ); TInt dataLength( aFileData.Length() ); @@ -4366,7 +4319,7 @@ const CMmDataPackage* aDataPackage ) { TFLOGSTRING("TSY: CMmSmsMessHandler::UiccSmsUpdateParameterReq"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_UICCSTORESMSPENTRY, "CMmSmsMessHandler::UiccStoreSmspEntry" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSMSMESSHANDLER_UICCSTORESMSPENTRY_TD, "CMmSmsMessHandler::UiccStoreSmspEntry" ); RMobileSmsMessaging::TMobileSmspEntryV1* smsParameters; // Unpack data @@ -4470,4 +4423,85 @@ return iMmUiccMessHandler->CreateUiccApplCmdReq( params ); } + +// ----------------------------------------------------------------------------- +// CMmSmsMessHandler::SmsResourceConfInd +// ----------------------------------------------------------------------------- +// +void CMmSmsMessHandler::SmsResourceConfInd( const TIsiReceiveC& aIsiMsg ) + { +TFLOGSTRING( "TSY: CMmSmsMessHandler::SmsResourceConfInd" ); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSRESOURCECONFIND_TD, "CMmSmsMessHandler::SmsResourceConfInd" ); + + // To check The receive indication is for startup or reconfiguration + if ( SMS_RES_CONF_STARTUP == aIsiMsg.Get8bit( + ISI_HEADER_SIZE + SMS_RESOURCE_CONF_IND_OFFSET_CONFSTATUS ) ) + { + TUint sbStartOffset( 0 ); + // Check if resource control is requested for MO SM. + if ( KErrNone == aIsiMsg.FindSubBlockOffsetById( + ISI_HEADER_SIZE + SIZE_SMS_RESOURCE_CONF_IND, + SMS_SB_RESOURCE_CONF_REQUIRED, + EIsiSubBlockTypeId16Len16, + sbStartOffset ) ) + { + TUint16 resource( aIsiMsg.Get16bit( + sbStartOffset + SMS_SB_RESOURCE_CONF_REQUIRED_OFFSET_RESPP ) ); + // Check MO SMS control is supported by SIM service table + if ( SMS_RES_ID_CONF_MO_SM_INIT == resource && + NULL == iPhonetReceiver->SatMessHandler() ) + { + SmsResourceConfReq(); + } + } + } + } + + +// ----------------------------------------------------------------------------- +// CMmSmsMessHandler::SmsResourceConfReq +// ----------------------------------------------------------------------------- +// +void CMmSmsMessHandler::SmsResourceConfReq() + { +TFLOGSTRING("TSY: CMmSmsMessHandler::SmsResourceConfReq"); +OstTrace0( TRACE_NORMAL, CMMSMSMESSHANDLER_SMSRESOURCECONFREQ_TD, "CMmSmsMessHandler::SmsResourceConfReq" ); + + TBuf8 data; + TIsiSubBlock ResourceConfReqSb( + data, + SMS_SB_RESOURCE_CONF, + EIsiSubBlockTypeId16Len16 ); + + // set SMS_RESOURCE_IDS to SMS_RES_ID_MO_SM_INIT_DISABLE + data.Append( KSmsResIdMoSmInitDisable >> KShift8 ); + data.Append( KSmsResIdMoSmInitDisable ); + + // set SMS_RESOURCE_IDS_MASK to SMS_RES_ID_MASK_MO_SM_INIT + data.Append( SMS_RES_ID_MASK_MO_SM_INIT >> KShift8 ); + data.Append( SMS_RES_ID_MASK_MO_SM_INIT ); + + // Create SMS_RESOURCE_CONF_REQ message + TIsiSend isiMsg( iPhoNetSender->SendBufferDes() ); + isiMsg.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_SMS ); + isiMsg.Set8bit( + ISI_HEADER_SIZE + SMS_RESOURCE_CONF_REQ_OFFSET_TRANSID, + 0 ); + isiMsg.Set8bit( + ISI_HEADER_SIZE + SMS_RESOURCE_CONF_REQ_OFFSET_MESSAGEID, + SMS_RESOURCE_CONF_REQ ); + isiMsg.Set8bit( + ISI_HEADER_SIZE + SMS_RESOURCE_CONF_REQ_OFFSET_CONFOPERATION, + SMS_RES_CONF_SET ); + isiMsg.Set8bit( + ISI_HEADER_SIZE + SMS_RESOURCE_CONF_REQ_OFFSET_SUBBLOCKCOUNT, + 1 ); + + isiMsg.CopyData( + ISI_HEADER_SIZE + SIZE_SMS_RESOURCE_CONF_REQ, + ResourceConfReqSb.CompleteSubBlock() ); + + iPhoNetSender->Send( isiMsg.Complete() ); + } + // End of File diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmstaticutility.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmstaticutility.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmstaticutility.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -88,7 +88,7 @@ ) { TFLOGSTRING4("TSY: CMmStaticUtility::CSCauseToEpocError - resource: %d, cause type: %d, cause value: %d", aResource, aIsiCauseType, aIsiCauseValue); -OstTraceExt3( TRACE_NORMAL, CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;aResource=%d;aIsiCauseType=%hhu;aIsiCauseValue=%hhu", aResource, aIsiCauseType, aIsiCauseValue ); +OstTraceExt3( TRACE_NORMAL, CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;aResource=%d;aIsiCauseType=%hhu;aIsiCauseValue=%hhu", aResource, aIsiCauseType, aIsiCauseValue ); TInt epocError = ( KErrGeneral & 0x0000FFFF ) | ( KErrNotFound << 16 ); if ( 0 == aIsiCauseValue && 0 == aIsiCauseType ) @@ -274,7 +274,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_MODEM_CALL - common error, default, ISI cause value: %d", aIsiCauseValue); - OstTraceExt1( TRACE_NORMAL, DUP1_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_MODEM_CALL - common error, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); + OstTraceExt1( TRACE_NORMAL, DUP1_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_MODEM_CALL - common error, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -586,7 +586,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_MODEM_CALL - Network specific error, unknown ISI cause value: %d", aIsiCauseValue); - OstTraceExt1( TRACE_NORMAL, DUP2_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_MODEM_CALL - Network specific error, unknown ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); + OstTraceExt1( TRACE_NORMAL, DUP2_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_MODEM_CALL - Network specific error, unknown ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -725,7 +725,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_MODEM_NETWORK, default, ISI cause value: %d", aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_MODEM_NETWORK, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_MODEM_NETWORK, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -860,7 +860,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_MODEM_NETWORK - GSM specific error, unknown ISI cause value: %d", aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP4_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_MODEM_NETWORK - GSM specific error, unknown ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP4_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_MODEM_NETWORK - GSM specific error, unknown ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrGeneral ); break; @@ -1030,7 +1030,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_SS, unknown ISI cause value: %d", aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP5_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_SS, unknown ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP5_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_SS, unknown ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -1052,7 +1052,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_SS - GSM_INDICATE_PASSWORD_ERROR, unknown ISI cause value: %d", aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP6_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_SS - GSM_INDICATE_PASSWORD_ERROR, unknown ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP6_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_SS - GSM_INDICATE_PASSWORD_ERROR, unknown ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -1070,7 +1070,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_SS - GSM_INDICATE_MSG_ERROR, default, ISI cause value: %d", aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP7_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_SS - GSM_INDICATE_MSG_ERROR, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP7_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_SS - GSM_INDICATE_MSG_ERROR, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -1110,7 +1110,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_SS - OTHER_ERROR, default, ISI cause value: %d", aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP8_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_SS - OTHER_ERROR, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP8_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_SS - OTHER_ERROR, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -1128,7 +1128,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_SS - service not supprted, default, ISI cause value: %d", aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP9_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_SS - service not supprted, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP9_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_SS - service not supprted, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -1145,7 +1145,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_SS - GSM_GENERAL_PROBLEM, default, ISI cause value: %d", aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP10_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_SS - GSM_GENERAL_PROBLEM, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP10_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_SS - GSM_GENERAL_PROBLEM, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -1172,7 +1172,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_SS - GSM_INVOKE_PROBLEM, default, ISI cause value: %d", aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP11_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_SS - GSM_INVOKE_PROBLEM, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP11_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_SS - GSM_INVOKE_PROBLEM, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -1189,7 +1189,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_SS - GSM_RETURN_RESULT_PROBLEM, default, ISI cause value: %d", aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP12_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_SS - GSM_RETURN_RESULT_PROBLEM, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP12_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_SS - GSM_RETURN_RESULT_PROBLEM, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -1207,7 +1207,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_SS - GSM_RETURN_ERROR_PROBLEM, default, ISI cause value: %d", aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP13_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_SS - GSM_RETURN_ERROR_PROBLEM, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP13_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_SS - GSM_RETURN_ERROR_PROBLEM, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -1234,7 +1234,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_SS - GSM_MM_RELEASED, default, ISI cause value: %d", aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP14_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_SS - GSM_MM_RELEASED, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP14_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_SS - GSM_MM_RELEASED, default, ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -1332,7 +1332,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_SMS - common error, unknown ISI cause value: %d",aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP15_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_SMS - common error, unknown ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP15_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_SMS - common error, unknown ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -1530,7 +1530,7 @@ case SMS_EXT_ERR_CS_BARRED: { TFLOGSTRING("TSY: CMmStaticUtility::CSCauseToEpocError - DSAC: SMS was rejected because of barred CS" ); -OstTrace0( TRACE_NORMAL, DUP22_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError - DSAC: SMS was rejected because of barred CS" ); +OstTrace0( TRACE_NORMAL, DUP22_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError - DSAC: SMS was rejected because of barred CS" ); epocError = EpocErrorCode( KErrGeneral, KErrGsmCSConnectionBarred ); break; @@ -1539,7 +1539,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError - PN_SMS - GSM specific error, unknown ISI cause value: %d",aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP16_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;PN_SMS - GSM specific error, unknown ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP16_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;PN_SMS - GSM specific error, unknown ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -1609,7 +1609,7 @@ TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError\ - PN_CSD, deafault, ISI cause value: %d", aIsiCauseValue); -OstTrace1( TRACE_NORMAL, DUP23_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;aIsiCauseValue=%d", aIsiCauseValue ); +OstTrace1( TRACE_NORMAL, DUP23_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;aIsiCauseValue=%d", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -1620,10 +1620,10 @@ } TFLOGSTRING2("TSY: CMmStaticUtility::CSCauseToEpocError, Error was originated by ISA Server, Resource ID: 0x%x", aResource); -OstTrace1( TRACE_NORMAL, DUP20_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;Error was originated by ISA Server, Resource ID=%x", aResource ); +OstTrace1( TRACE_NORMAL, DUP20_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;Error was originated by ISA Server, Resource ID=%x", aResource ); TFLOGSTRING3("TSY: CMmStaticUtility::CSCauseToEpocError,ISA Error type: %d, ISA Error value: %d", aIsiCauseType, aIsiCauseValue); -OstTraceExt2( TRACE_NORMAL, DUP21_CMMSTATICUTILITY_CSCAUSETOEPOCERROR, "CMmStaticUtility::CSCauseToEpocError;ISA Error type=%hhu; ISA Error value=%hhu", aIsiCauseType, aIsiCauseValue ); +OstTraceExt2( TRACE_NORMAL, DUP21_CMMSTATICUTILITY_CSCAUSETOEPOCERROR_TD, "CMmStaticUtility::CSCauseToEpocError;ISA Error type=%hhu; ISA Error value=%hhu", aIsiCauseType, aIsiCauseValue ); return epocError; } @@ -1642,7 +1642,7 @@ ) { TFLOGSTRING2("TSY: CMmStaticUtility::UICCCSCauseToEpocError - cause value: %d", aIsiCauseValue); -//OstTraceExt2( TRACE_NORMAL, CMMSTATICUTILITY_SIMCSCAUSETOEPOCERROR, "CMmStaticUtility::SimCSCauseToEpocError;aIsiCauseValue=%hhu", aIsiCauseValue ); +//OstTraceExt2( TRACE_NORMAL, CMMSTATICUTILITY_SIMCSCAUSETOEPOCERROR_TD, "CMmStaticUtility::SimCSCauseToEpocError;aIsiCauseValue=%hhu", aIsiCauseValue ); TInt epocError = ( KErrGeneral & 0x0000FFFF ) | ( KErrNotFound << 16 ); @@ -1724,7 +1724,7 @@ default: { TFLOGSTRING2("TSY: CMmStaticUtility::UICCCSCauseToEpocError - UICC_STATUS_TABLE, unknown ISI cause value: %d", aIsiCauseValue); -OstTraceExt1( TRACE_NORMAL, DUP2_CMMSTATICUTILITY_UICCCSCAUSETOEPOCERROR, "CMmStaticUtility::UICCCSCauseToEpocError; - UICC_STATUS_TABLE, unknown ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMSTATICUTILITY_UICCCSCAUSETOEPOCERROR_TD, "CMmStaticUtility::UICCCSCauseToEpocError; - UICC_STATUS_TABLE, unknown ISI cause value aIsiCauseValue=%hhu", aIsiCauseValue ); epocError = EpocErrorCode( KErrGeneral, KErrNotFound ); break; @@ -1732,10 +1732,10 @@ } TFLOGSTRING("TSY: CMmStaticUtility::UiccCSCauseToEpocError, Error was originated by UICC Server - Resource ID: PN_SIM"); -OstTrace0( TRACE_NORMAL, DUP11_CMMSTATICUTILITY_SIMCSCAUSETOEPOCERROR, "CMmStaticUtility::SimCSCauseToEpocError, Error was originated by ISA Server - Resource ID: PN_SIM" ); +OstTrace0( TRACE_NORMAL, DUP11_CMMSTATICUTILITY_SIMCSCAUSETOEPOCERROR_TD, "CMmStaticUtility::SimCSCauseToEpocError, Error was originated by ISA Server - Resource ID: PN_SIM" ); TFLOGSTRING2("TSY: CMmStaticUtility::UiccCSCauseToEpocError, UICC Error value: %d", aIsiCauseValue ); -OstTraceExt1( TRACE_NORMAL, DUP12_CMMSTATICUTILITY_UICCCSCAUSETOEPOCERROR, "CMmStaticUtility::UiccCSCauseToEpocError;UICC Error value:aIsiCauseValue=%hhu", aIsiCauseValue ); +OstTraceExt1( TRACE_NORMAL, DUP12_CMMSTATICUTILITY_UICCCSCAUSETOEPOCERROR_TD, "CMmStaticUtility::UiccCSCauseToEpocError;UICC Error value:aIsiCauseValue=%hhu", aIsiCauseValue ); return epocError; } @@ -1754,7 +1754,7 @@ ) { TFLOGSTRING4("TSY: CMmStaticUtility::PacketDataCSCauseToEpocError - resource: %d, cause type: %d, cause value: %d", aResource, aIsiCauseType, aIsiCauseValue); -OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_PACKETDATACSCAUSETOEPOCERROR, "CMmStaticUtility::PacketDataCSCauseToEpocError" ); +OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_PACKETDATACSCAUSETOEPOCERROR_TD, "CMmStaticUtility::PacketDataCSCauseToEpocError" ); TInt epocError( KErrGeneral ); @@ -2075,7 +2075,7 @@ } } TFLOGSTRING2("TSY: CMmStaticUtility::PacketDataCSCauseToEpocError - epoc error to be returned: %d", epocError); -OstTrace1( TRACE_NORMAL, DUP1_CMMSTATICUTILITY_PACKETDATACSCAUSETOEPOCERROR, "CMmStaticUtility::PacketDataCSCauseToEpocError;epocError=%d", epocError ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSTATICUTILITY_PACKETDATACSCAUSETOEPOCERROR_TD, "CMmStaticUtility::PacketDataCSCauseToEpocError;epocError=%d", epocError ); return epocError; } @@ -2094,7 +2094,7 @@ ) { TFLOGSTRING("TSY: CMmStaticUtility::MapPdpTypeToClient"); -OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_MAPPDPTYPETOCLIENT, "CMmStaticUtility::MapPdpTypeToClient" ); +OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_MAPPDPTYPETOCLIENT_TD, "CMmStaticUtility::MapPdpTypeToClient" ); if ( GPDS_PDP_TYPE_PPP == aPdpTypeServer ) { @@ -2124,7 +2124,7 @@ ) { TFLOGSTRING2("TSY: CMmStaticUtility::ConvertIPAddressToClient - %S", &aGPDSAddres); - OstTraceExt1( TRACE_NORMAL, CMMSTATICUTILITY_CONVERTIPADDRESSTOCLIENT, "CMmStaticUtility::ConvertIPAddressToClient;aGPDSAddress=%s", aGPDSAddres ); + OstTraceExt1( TRACE_NORMAL, CMMSTATICUTILITY_CONVERTIPADDRESSTOCLIENT_TD, "CMmStaticUtility::ConvertIPAddressToClient;aGPDSAddress=%s", aGPDSAddres ); aInetAddr.Zero(); @@ -2185,7 +2185,7 @@ ) { TFLOGSTRING("TSY: CMmStaticUtility::ConvertIPAddressFromClient"); -OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_CONVERTIPADDRESSFROMCLIENT, "CMmStaticUtility::ConvertIPAddressFromClient" ); +OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_CONVERTIPADDRESSFROMCLIENT_TD, "CMmStaticUtility::ConvertIPAddressFromClient" ); TInt ret(KErrNone); TBuf tmpClientAddress; @@ -2216,14 +2216,14 @@ else { TFLOGSTRING2("TSY: CMmStaticUtility::ConvertIPAddressFromClient; not supported family(%d)", inetAddr.Family()); -OstTrace1( TRACE_NORMAL, DUP2_CMMSTATICUTILITY_CONVERTIPADDRESSFROMCLIENT, "CMmStaticUtility::ConvertIPAddressFromClient; not supported family(%d)", inetAddr.Family() ); +OstTrace1( TRACE_NORMAL, DUP2_CMMSTATICUTILITY_CONVERTIPADDRESSFROMCLIENT_TD, "CMmStaticUtility::ConvertIPAddressFromClient; not supported family(%d)", inetAddr.Family() ); ret = KErrNotSupported; } } else { TFLOGSTRING("TSY: CMmStaticUtility::ConvertIPAddressFromClient; TInetAddr::Input failed"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSTATICUTILITY_CONVERTIPADDRESSFROMCLIENT, "CMmStaticUtility::ConvertIPAddressFromClient; TInetAddr::Input failed" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSTATICUTILITY_CONVERTIPADDRESSFROMCLIENT_TD, "CMmStaticUtility::ConvertIPAddressFromClient; TInetAddr::Input failed" ); } return ret; @@ -2242,7 +2242,7 @@ ) { TFLOGSTRING("TSY: CMmStaticUtility::GetIntFromDescriptor"); -OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_GETINTFROMDESCRIPTOR, "CMmStaticUtility::GetIntFromDescriptor" ); +OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_GETINTFROMDESCRIPTOR_TD, "CMmStaticUtility::GetIntFromDescriptor" ); // Initialize. integer = 0; @@ -2268,7 +2268,7 @@ ) { TFLOGSTRING("TSY: CMmStaticUtility::FormOperatorCode"); -OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_FORMOPERATORCODE, "CMmStaticUtility::FormOperatorCode" ); +OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_FORMOPERATORCODE_TD, "CMmStaticUtility::FormOperatorCode" ); TUint16 mnc1 = 0x0F; TUint16 mnc2 = 0x0F; @@ -2381,7 +2381,7 @@ ) { TFLOGSTRING("TSY: CMmStaticUtility::GetMccCodes"); -OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_GETMCCCODES, "CMmStaticUtility::GetMccCodes" ); +OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_GETMCCCODES_TD, "CMmStaticUtility::GetMccCodes" ); // Extract MCC and MNC from aOperatorCode. TPtrC8 mcc2_mcc1 = aOperatorCode.Left( 0 ); @@ -2421,7 +2421,7 @@ ) { TFLOGSTRING("TSY: CMmStaticUtility::GetMncCodes"); -OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_GETMNCCODES, "CMmStaticUtility::GetMncCodes" ); +OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_GETMNCCODES_TD, "CMmStaticUtility::GetMncCodes" ); // Extract MCC and MNC from aOperatorCode. TPtrC8 mnc3_mcc3 = aOperatorCode.Mid( 1,1 ); @@ -2468,7 +2468,7 @@ ) { TFLOGSTRING("TSY: CMmStaticUtility::CalculateMccMncNumbers"); -OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_CALCULATEMCCMNCNUMBERS, "CMmStaticUtility::CalculateMccMncNumbers" ); +OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_CALCULATEMCCMNCNUMBERS_TD, "CMmStaticUtility::CalculateMccMncNumbers" ); // Mcc is always three digits // If mcc is bigger than 10, code is invalid @@ -2525,7 +2525,7 @@ TBool CMmStaticUtility::IsOperinfoApac() { TFLOGSTRING("TSY: CMmStaticUtility::IsOperinfoApac"); -OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_ISOPERINFOAPAC, "CMmStaticUtility::IsOperinfoApac" ); +OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_ISOPERINFOAPAC_TD, "CMmStaticUtility::IsOperinfoApac" ); #ifdef __WINSCW__ return apacInfoToBeReturned; @@ -2539,14 +2539,14 @@ case ELangPrcChinese: { TFLOGSTRING("TSY: CMmStaticUtility::IsOperinfoApac, Eastern"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSTATICUTILITY_ISOPERINFOAPAC, "CMmStaticUtility::IsOperinfoApac, Eastern" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSTATICUTILITY_ISOPERINFOAPAC_TD, "CMmStaticUtility::IsOperinfoApac, Eastern" ); ret = ETrue; break; } default: { TFLOGSTRING("TSY: CMmStaticUtility::IsOperinfoApac, Western"); -OstTrace0( TRACE_NORMAL, DUP2_CMMSTATICUTILITY_ISOPERINFOAPAC, "CMmStaticUtility::IsOperinfoApac, Western" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSTATICUTILITY_ISOPERINFOAPAC_TD, "CMmStaticUtility::IsOperinfoApac, Western" ); // already set to ret = EFalse; break; } @@ -2656,7 +2656,7 @@ ) { TFLOGSTRING("TSY: CMmStaticUtility::SetOperinfoApac"); -OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_SETOPERINFOAPAC, "CMmStaticUtility::SetOperinfoApac" ); +OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_SETOPERINFOAPAC_TD, "CMmStaticUtility::SetOperinfoApac" ); apacInfoToBeReturned = aApac; } @@ -2674,7 +2674,7 @@ TDes8& aUcs2String ) { TFLOGSTRING("TSY: CMmStaticUtility::ConvertGsmDataToUcs2"); -OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_CONVERTGSMDATATOUCS2, "CMmStaticUtility::ConvertGsmDataToUcs2" ); +OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_CONVERTGSMDATATOUCS2_TD, "CMmStaticUtility::ConvertGsmDataToUcs2" ); TInt i( 0 ); TInt j( 0 ); @@ -2797,7 +2797,7 @@ TUint16 CMmStaticUtility::GetUnicodeGsm( TUint8 aCharacter) { TFLOGSTRING("TSY: CMmStaticUtility::GetUnicodeGsm"); -OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_GETUNICODEGSM, "CMmStaticUtility::GetUnicodeGsm" ); +OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_GETUNICODEGSM_TD, "CMmStaticUtility::GetUnicodeGsm" ); TUint16 ret( 0 ); @@ -3514,7 +3514,7 @@ TDes8& aGsmDataString ) { TFLOGSTRING("TSY: CMmStaticUtility::ConvertUcs2To7BitCodedData"); -OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_CONVERTUCS2TO7BITCODEDDATA, "CMmStaticUtility::ConvertUcs2To7BitCodedData" ); +OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_CONVERTUCS2TO7BITCODEDDATA_TD, "CMmStaticUtility::ConvertUcs2To7BitCodedData" ); if ( 0 < aInputString.Length() ) { @@ -3546,7 +3546,7 @@ TDes8& aGsmDataString ) { TFLOGSTRING("TSY: CMmStaticUtility::ConvertUcs2ToGsmData"); -OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_CONVERTUCS2TOGSMDATA, "CMmStaticUtility::ConvertUcs2ToGsmData" ); +OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_CONVERTUCS2TOGSMDATA_TD, "CMmStaticUtility::ConvertUcs2ToGsmData" ); if ( 0 < aInputString.Length() ) { @@ -3591,7 +3591,7 @@ TBool CMmStaticUtility::GetCodingScheme( TDesC16& aInputString ) { TFLOGSTRING("TSY: CMmStaticUtility::GetCodingScheme"); - OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_GETCODINGSCHEME, "CMmStaticUtility::GetCodingScheme" ); + OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_GETCODINGSCHEME_TD, "CMmStaticUtility::GetCodingScheme" ); TInt ret ( ETrue ); TInt count(0); @@ -4322,7 +4322,7 @@ ) { TFLOGSTRING("TSY: CMmStaticUtility::Get16bit"); - OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_GET16BIT, "CMmStaticUtility::Get16Bit" ); + OstTrace0( TRACE_NORMAL, CMMSTATICUTILITY_GET16BIT_TD, "CMmStaticUtility::Get16Bit" ); TInt target( 0 ); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmsupplservmesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmsupplservmesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmsupplservmesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 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" @@ -38,14 +38,14 @@ #include "cmmsupplservmesshandler.h" #include "tssparser.h" // for parsing service string #include "tsylogger.h" -#include "OstTraceDefinitions.h" #include "cmmuiccmesshandler.h" #include "cmmphonemesshandler.h" // for CallForwFlagsCachingCompleted +#include + +#include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #include "cmmsupplservmesshandlerTraces.h" #endif - // logging -#include // EXTERNAL DATA STRUCTURES //None @@ -69,7 +69,12 @@ //None // MODULE DATA STRUCTURES - //None +enum TCphsCallForwardingFlagStatus + { + ECphsCallForwardingUnknown = 0x0, + ECphsCallForwardingActive = 0xA, + ECphsCallForwardingInactive = 0x5 + }; // LOCAL FUNCTION PROTOTYPES //None @@ -85,7 +90,7 @@ ) { TFLOGSTRING( "TSY: CMmSupplServMessHandler::CMmSupplServMessHandler - Start" ); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_CMMSUPPLSERVMESSHANDLER, "CMmSupplServMessHandler::CMmSupplServMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_CMMSUPPLSERVMESSHANDLER_TD, "CMmSupplServMessHandler::CMmSupplServMessHandler" ); //none } @@ -103,7 +108,7 @@ ) { TFLOGSTRING( "TSY: CMmSupplServMessHandler::NewL" ); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_NEWL, "CMmSupplServMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_NEWL_TD, "CMmSupplServMessHandler::NewL" ); CMmSupplServMessHandler* supplServMessHandler = new ( ELeave ) CMmSupplServMessHandler(); @@ -157,7 +162,7 @@ ) { TFLOGSTRING( "TSY: CMmSupplServMessHandler::ConstructL" ); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_CONSTRUCTL, "CMmSupplServMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_CONSTRUCTL_TD, "CMmSupplServMessHandler::ConstructL" ); iVoiceServiceMappedToTelephony = EFalse; iCircuitServiceMappedToAllBearer = EFalse; @@ -185,7 +190,7 @@ ) { TFLOGSTRING( "TSY: CMmSupplServMessHandler::~CMmSupplServMessHandler" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_CMMSUPPLSERVMESSHANDLER, "CMmSupplServMessHandler::~CMmSupplServMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_CMMSUPPLSERVMESSHANDLER_TD, "CMmSupplServMessHandler::~CMmSupplServMessHandler" ); delete iCFResults; delete iCBResults; @@ -205,7 +210,7 @@ ) { TFLOGSTRING2("TSY: CMmSupplServMessHandler::ExtFuncL: IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_EXTFUNCL, "CMmSupplServMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_EXTFUNCL_TD, "CMmSupplServMessHandler::ExtFuncL;aIpc=%d", aIpc ); //*************************************************************// // NOTE @@ -287,11 +292,11 @@ iCFAddress = changeInfo->iNumber; TFLOGSTRING2("TSY: CMmSupplServMessHandler::ExtFuncL - EMobilePhoneSetCallForwardingStatus - Number: %S", &iCFAddress.iTelNumber); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_EXTFUNCL, "CMmSupplServMessHandler::ExtFuncL;EMobilePhoneSetCallForwardingStatus iCFTelNumber=%S", iCFAddress.iTelNumber ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_EXTFUNCL_TD, "CMmSupplServMessHandler::ExtFuncL;EMobilePhoneSetCallForwardingStatus iCFTelNumber=%S", iCFAddress.iTelNumber ); TFLOGSTRING2("TSY: CMmSupplServMessHandler::ExtFuncL - EMobilePhoneSetCallForwardingStatus - MobileService: %d", iMobileService); -OstTrace1( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_EXTFUNCL, "CMmSupplServMessHandler::ExtFuncL;EMobilePhoneSetCallForwardingStatus iMobileService=%d", iMobileService ); +OstTrace1( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_EXTFUNCL_TD, "CMmSupplServMessHandler::ExtFuncL;EMobilePhoneSetCallForwardingStatus iMobileService=%d", iMobileService ); TFLOGSTRING2("TSY: CMmSupplServMessHandler::ExtFuncL - EMobilePhoneSetCallForwardingStatus - Condition: %d", iMmCFCondition); -OstTrace1( TRACE_NORMAL, DUP3_CMMSUPPLSERVMESSHANDLER_EXTFUNCL, "CMmSupplServMessHandler::ExtFuncL;EMobilePhoneSetCallForwardingStatus iMmCFCondition=%d", iMmCFCondition ); +OstTrace1( TRACE_NORMAL, DUP3_CMMSUPPLSERVMESSHANDLER_EXTFUNCL_TD, "CMmSupplServMessHandler::ExtFuncL;EMobilePhoneSetCallForwardingStatus iMmCFCondition=%d", iMmCFCondition ); //map operation ret = MapOperationMmToIsi( changeInfo->iAction, &operation ); @@ -545,12 +550,34 @@ ssInfoA, ssInfoB, ssInfoC ); + + if( KErrNone != ret ) + { + TUint srcByteCount( 0 ); + // max length of ussd string is 161 + TBuf8 packedString; + // max length of ussd string is 161 + TBuf8 srcString; + + // 16 byte descriptor is appended to 8 byte descriptor as single bytes, + // therefore length can be the same in both descriptors + srcString.Append( serviceString->Left( serviceString->Length() ) ); + srcByteCount = srcString.Length(); + // pack string + GsmLibSmsPackMessage( + packedString, + srcString, + srcByteCount ); + + // send ussd request + ret = SsGsmUssdSendReq( trId, &packedString ); + } } else { TFLOGSTRING( "TSY: CMmSupplServMessHandler::ExtFuncL: parsing of \ service string failed!" ); -OstTrace0( TRACE_NORMAL, DUP4_CMMSUPPLSERVMESSHANDLER_EXTFUNCL, "CMmSupplServMessHandler::ExtFuncL, parsing of service string failed!" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMSUPPLSERVMESSHANDLER_EXTFUNCL_TD, "CMmSupplServMessHandler::ExtFuncL, parsing of service string failed!" ); ret = KErrArgument; } @@ -618,7 +645,7 @@ // this method should only be called for SS cases TFLOGSTRING2("TSY: CMmSupplServMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP5_CMMSUPPLSERVMESSHANDLER_EXTFUNCL, "CMmSupplServMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP5_CMMSUPPLSERVMESSHANDLER_EXTFUNCL_TD, "CMmSupplServMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc ); ret = KErrArgument; break; } @@ -639,7 +666,7 @@ const TDesC8& aFileData ) { TFLOGSTRING3("TSY: CMmSupplServMessHandler::ProcessUiccMsg, transaction ID: %d, status: %d", aTraId, aStatus ); -OstTraceExt2( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSUICCMSG, "CMmSupplServMessHandler::ProcessUiccMsg;aTraId=%d;aStatus=%d", aTraId, aStatus ); +OstTraceExt2( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSUICCMSG_TD, "CMmSupplServMessHandler::ProcessUiccMsg;aTraId=%d;aStatus=%d", aTraId, aStatus ); switch( aTraId ) { @@ -738,7 +765,7 @@ default: { TFLOGSTRING("TSY: CMmSupplServMessHandler::ProcessUiccMsg - unknown transaction ID" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_PROCESSUICCMSG, "CMmSupplServMessHandler::ProcessUiccMsg - unknown transaction ID" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_PROCESSUICCMSG_TD, "CMmSupplServMessHandler::ProcessUiccMsg - unknown transaction ID" ); break; } } @@ -760,7 +787,7 @@ TFLOGSTRING3("TSY: CMmSupplServMessHandler::ReceiveMessageL - resource: %d, \ messageId: %d", resource, messageId); -OstTraceExt2( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_RECEIVEMESSAGEL, "CMmSupplServMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); +OstTraceExt2( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmSupplServMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); switch ( resource ) { @@ -802,7 +829,7 @@ { TFLOGSTRING2( "TSY: CMmSupplServMessHandler::ReceiveMessageL - \ PN_SS - unknown msgId: %d", messageId ); -OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_RECEIVEMESSAGEL, "CMmSupplServMessHandler::ReceiveMessageL;PN_SS - unknown msgId=%d", messageId ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmSupplServMessHandler::ReceiveMessageL;PN_SS - unknown msgId=%d", messageId ); break; } } // switch( messageId ) @@ -812,7 +839,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::ReceiveMessageL - unknown \ resource: %d", resource); -OstTrace1( TRACE_NORMAL, DUP3_CMMSUPPLSERVMESSHANDLER_RECEIVEMESSAGEL, "CMmSupplServMessHandler::ReceiveMessageL;unknown resource=%d", resource ); +OstTrace1( TRACE_NORMAL, DUP3_CMMSUPPLSERVMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmSupplServMessHandler::ReceiveMessageL;unknown resource=%d", resource ); break; } } // switch( resource ) @@ -834,7 +861,7 @@ const TDesC& ssInfoC ) // SS info C { TFLOGSTRING( "TSY: CMmSupplServMessHandler::SsServiceReqSatOriginated" ); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSSERVICEREQSATORIGINATED, "CMmSupplServMessHandler::SsServiceReqSatOriginated" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSSERVICEREQSATORIGINATED_TD, "CMmSupplServMessHandler::SsServiceReqSatOriginated" ); TInt ret( KErrNone ); TUint8 basicServiceCode( SS_ALL_TELE_AND_BEARER ); @@ -852,7 +879,7 @@ { TFLOGSTRING( "TSY: CMmSupplServMessHandler::SsServiceReqSatOriginated, \ call forwarding" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_SSSERVICEREQSATORIGINATED, "CMmSupplServMessHandler::SsServiceReqSatOriginated, call forwarding" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_SSSERVICEREQSATORIGINATED_TD, "CMmSupplServMessHandler::SsServiceReqSatOriginated, call forwarding" ); TUint8 numberType ( SS_NBR_TYPE_UNKNOWN ); TUint8 numberPlan ( SS_NBR_PLAN_ISDN_TELEPHONY ); @@ -917,7 +944,7 @@ { TFLOGSTRING( "TSY: CMmSupplServMessHandler::SsServiceReqSatOriginated, \ call barring" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_SSSERVICEREQSATORIGINATED, "CMmSupplServMessHandler::SsServiceReqSatOriginated, call barring" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_SSSERVICEREQSATORIGINATED_TD, "CMmSupplServMessHandler::SsServiceReqSatOriginated, call barring" ); // basic service code is in ssInfoB, must be converted to TUint8 basicServiceCode = ( TUint8 )parser.GetInt( ssInfoB ); @@ -940,7 +967,7 @@ { TFLOGSTRING( "TSY: CMmSupplServMessHandler::SsServiceReqSatOriginated, \ call waiting" ); -OstTrace0( TRACE_NORMAL, DUP3_CMMSUPPLSERVMESSHANDLER_SSSERVICEREQSATORIGINATED, "CMmSupplServMessHandler::SsServiceReqSatOriginated, call waiting" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMSUPPLSERVMESSHANDLER_SSSERVICEREQSATORIGINATED_TD, "CMmSupplServMessHandler::SsServiceReqSatOriginated, call waiting" ); // basic service code is in ssInfoA, must be converted to TUint8 basicServiceCode = ( TUint8 )parser.GetInt( ssInfoA ); ret = CreateServiceReqWithCheckInfo( @@ -961,7 +988,7 @@ { TFLOGSTRING( "TSY: CMmSupplServMessHandler::SsServiceReqSatOriginated, \ other ss codes" ); -OstTrace0( TRACE_NORMAL, DUP6_CMMSUPPLSERVMESSHANDLER_SSSERVICEREQSATORIGINATED, "CMmSupplServMessHandler::SsServiceReqSatOriginated, other ss codes" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMSUPPLSERVMESSHANDLER_SSSERVICEREQSATORIGINATED_TD, "CMmSupplServMessHandler::SsServiceReqSatOriginated, other ss codes" ); ret = CreateServiceReqWithCheckInfo( aTrId, aOperation, @@ -975,7 +1002,7 @@ { TFLOGSTRING2( "TSY: CMmSupplServMessHandler::SsServiceReqSatOriginated, \ error: unknown ss service: %d", aServiceCode ); -OstTraceExt1( TRACE_NORMAL, DUP7_CMMSUPPLSERVMESSHANDLER_SSSERVICEREQSATORIGINATED, "CMmSupplServMessHandler::SsServiceReqSatOriginated;ERROR: unknown ss service=%hu", aServiceCode ); +OstTraceExt1( TRACE_NORMAL, DUP7_CMMSUPPLSERVMESSHANDLER_SSSERVICEREQSATORIGINATED_TD, "CMmSupplServMessHandler::SsServiceReqSatOriginated;ERROR: unknown ss service=%hu", aServiceCode ); ret = KErrArgument; break; } @@ -998,7 +1025,7 @@ const TUint8 aBasicServiceCode ) { TFLOGSTRING( "TSY: CMmSupplServMessHandler::CreateServiceReqWithCheckInfo" ); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_CREATESERVICEREQWITHCHECKINFO, "CMmSupplServMessHandler::CreateServiceReqWithCheckInfo" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_CREATESERVICEREQWITHCHECKINFO_TD, "CMmSupplServMessHandler::CreateServiceReqWithCheckInfo" ); TInt ret( KErrNone ); TUint8 numOfSubblocks( 1 ); @@ -1083,7 +1110,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::SsCallForwServiceReq"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSCALLFORWSERVICEREQ, "CMmSupplServMessHandler::SsCallForwServiceReq" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSCALLFORWSERVICEREQ_TD, "CMmSupplServMessHandler::SsCallForwServiceReq" ); TUint8 numOfSubblocks( 0 ); TBuf number( 0 ); @@ -1282,10 +1309,10 @@ TFLOGSTRING3("TSY: CMmSupplServMessHandler::SsServiceCompletedRespL number \ of sub blocks: %d, operation: %d", response.iNumSubBlocks, response.iOperation ); -OstTraceExt2( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSSERVICECOMPLETEDRESPL, "CMmSupplServMessHandler::SsServiceCompletedRespL;numSubBlocks=%hhu;operation=%hhu", response.iNumSubBlocks, response.iOperation ); +OstTraceExt2( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSSERVICECOMPLETEDRESPL_TD, "CMmSupplServMessHandler::SsServiceCompletedRespL;numSubBlocks=%hhu;operation=%hhu", response.iNumSubBlocks, response.iOperation ); TFLOGSTRING3("TSY: CMmSupplServMessHandler::SsServiceCompletedRespL ssCode: \ %d, basicService: %d", response.iSsCode, response.iBasicService ); -OstTraceExt2( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_SSSERVICECOMPLETEDRESPL, "CMmSupplServMessHandler::SsServiceCompletedRespL;ssCode=%hu;basicService=%hhu", response.iSsCode, response.iBasicService ); +OstTraceExt2( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_SSSERVICECOMPLETEDRESPL_TD, "CMmSupplServMessHandler::SsServiceCompletedRespL;ssCode=%hu;basicService=%hhu", response.iSsCode, response.iBasicService ); if ( ProcessIfSsRequestChanged( response ) || // original SS request is changed, or initiated by Call Control @@ -1304,7 +1331,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::SsServiceCompletedRespL \ - unknown ssCode: %d", response.iSsCode ); -OstTraceExt1( TRACE_NORMAL, DUP5_CMMSUPPLSERVMESSHANDLER_SSSERVICECOMPLETEDRESPL, "CMmSupplServMessHandler::SsServiceCompletedRespL;ssCode=%hu", response.iSsCode ); +OstTraceExt1( TRACE_NORMAL, DUP5_CMMSUPPLSERVMESSHANDLER_SSSERVICECOMPLETEDRESPL_TD, "CMmSupplServMessHandler::SsServiceCompletedRespL;ssCode=%hu", response.iSsCode ); } } @@ -1322,7 +1349,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::HandleSsGsmForwardingSubBlockL - \ SS condition: %d", aSsCode); -OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_HANDLESSGSMFORWARDINGSUBBLOCKL, "CMmSupplServMessHandler::HandleSsGsmForwardingSubBlockL;aSsCode=%hu", aSsCode ); +OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_HANDLESSGSMFORWARDINGSUBBLOCKL_TD, "CMmSupplServMessHandler::HandleSsGsmForwardingSubBlockL;aSsCode=%hu", aSsCode ); TUint sbStartOffset( aSbStartOffset ); @@ -1429,7 +1456,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::HandleBarringSsGsmBscInfoSubBlockL \ - service code: %d", aSsCode); -OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_HANDLEBARRINGSSGSMBSCINFOSUBBLOCKL, "CMmSupplServMessHandler::HandleBarringSsGsmBscInfoSubBlockL;aSsCode=%hu", aSsCode ); +OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_HANDLEBARRINGSSGSMBSCINFOSUBBLOCKL_TD, "CMmSupplServMessHandler::HandleBarringSsGsmBscInfoSubBlockL;aSsCode=%hu", aSsCode ); //get number of basic service codes in this SS_GSM_BSC_INFO sub block TUint8 numBsc( aIsiMessage.Get8bit( @@ -1462,7 +1489,7 @@ { TFLOGSTRING2( "TSY: CMmSupplServMessHandler::HandleSsGsmBscInfoSubBlockL: \ Unknown Basic Service Group = %d received. Skipping this entry.", bsc ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_HANDLEBARRINGSSGSMBSCINFOSUBBLOCKL, "CMmSupplServMessHandler::HandleBarringSsGsmBscInfoSubBlockL;Unknown Basic Service Group=%hhu", bsc ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_HANDLEBARRINGSSGSMBSCINFOSUBBLOCKL_TD, "CMmSupplServMessHandler::HandleBarringSsGsmBscInfoSubBlockL;Unknown Basic Service Group=%hhu", bsc ); continue; // ignore this entry and go to the next one } @@ -1489,7 +1516,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::HandleWaitingSsGsmBscInfoSubBlockL"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_HANDLEWAITINGSSGSMBSCINFOSUBBLOCKL, "CMmSupplServMessHandler::HandleWaitingSsGsmBscInfoSubBlockL" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_HANDLEWAITINGSSGSMBSCINFOSUBBLOCKL_TD, "CMmSupplServMessHandler::HandleWaitingSsGsmBscInfoSubBlockL" ); //get number of basic service codes in this SS_GSM_BSC_INFO sub block TUint8 numBsc( aIsiMessage.Get8bit( @@ -1521,7 +1548,7 @@ { TFLOGSTRING2( "TSY: CMmSupplServMessHandler::HandleSsGsmDataSubBlockL: \ Unknown Basic Service Group = %d received. Skipping this entry.", bsc ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_HANDLEWAITINGSSGSMBSCINFOSUBBLOCKL, "CMmSupplServMessHandler::HandleWaitingSsGsmBscInfoSubBlockL;Unknown Basic Service Group=%hhu", bsc ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_HANDLEWAITINGSSGSMBSCINFOSUBBLOCKL_TD, "CMmSupplServMessHandler::HandleWaitingSsGsmBscInfoSubBlockL;Unknown Basic Service Group=%hhu", bsc ); continue; // ignore this entry and go to the next one } // Save this entry @@ -1545,7 +1572,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::SsServiceFailedResp"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSSERVICEFAILEDRESP, "CMmSupplServMessHandler::SsServiceFailedResp" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSSERVICEFAILEDRESP_TD, "CMmSupplServMessHandler::SsServiceFailedResp" ); TInt errorToClient( KErrGeneral ); @@ -1562,7 +1589,7 @@ TUint8 subBlockId = aIsiMessage.Get8bit( sbStartOffset ); TFLOGSTRING2("TSY: CMmSupplServMessHandler::SsServiceFailedResp - \ sub block Id: %d", subBlockId); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_SSSERVICEFAILEDRESP, "CMmSupplServMessHandler::SsServiceFailedResp;subBlockId=%hhu", subBlockId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_SSSERVICEFAILEDRESP_TD, "CMmSupplServMessHandler::SsServiceFailedResp;subBlockId=%hhu", subBlockId ); switch ( subBlockId ) { case SS_GSM_INDICATE_PASSWORD_ERROR: @@ -1616,7 +1643,7 @@ KErrGsmSMSNoNetworkService ); TFLOGSTRING("CMmSupplServMessHandler::SsServiceFailedRespL. \ Cause: KSsGsmSsNotAvailable => No network coverage." ); -OstTrace0( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_SSSERVICEFAILEDRESP, "CMmSupplServMessHandler::SsServiceFailedResp, Cause: KSsGsmSsNotAvailable => No network coverage" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_SSSERVICEFAILEDRESP_TD, "CMmSupplServMessHandler::SsServiceFailedResp, Cause: KSsGsmSsNotAvailable => No network coverage" ); } else if( SS_RESOURCE_CONTROL_DENIED == errorCode ) { @@ -1637,9 +1664,9 @@ TUint8 sw1 = data[KSw1Index]; TUint8 sw2 = data[KSw2Index]; TUint8 result = data[KResultIndex]; - errorToClient = CMmStaticUtility::MapSw1Sw2ToEpocError( - sw1, - sw2, + errorToClient = CMmStaticUtility::MapSw1Sw2ToEpocError( + sw1, + sw2, result ); } else @@ -1665,7 +1692,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::SsServiceFailedResp \ - unknown sub block Id: %d", subBlockId); -OstTraceExt1( TRACE_NORMAL, DUP3_CMMSUPPLSERVMESSHANDLER_SSSERVICEFAILEDRESP, "CMmSupplServMessHandler::SsServiceFailedResp;unknown subBlockId=%hhu", subBlockId ); +OstTraceExt1( TRACE_NORMAL, DUP3_CMMSUPPLSERVMESSHANDLER_SSSERVICEFAILEDRESP_TD, "CMmSupplServMessHandler::SsServiceFailedResp;unknown subBlockId=%hhu", subBlockId ); // unknown error sub block errorToClient = KErrGeneral; break; @@ -1690,7 +1717,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::SsServiceNotSupportedResp"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSSERVICENOTSUPPORTEDRESP, "CMmSupplServMessHandler::SsServiceNotSupportedResp" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSSERVICENOTSUPPORTEDRESP_TD, "CMmSupplServMessHandler::SsServiceNotSupportedResp" ); //create ss service not supported response message // complete to SOS layer @@ -1714,7 +1741,7 @@ { TFLOGSTRING3("TSY: CMmSupplServMessHandler::CompleteFailedSSRequest - \ traId: %d, error code: %d", aTransactionId, aError); -OstTraceExt2( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_COMPLETEFAILEDSSREQUEST, "CMmSupplServMessHandler::CompleteFailedSSRequest;aTransactionId=%hhu;aError=%d", aTransactionId, aError ); +OstTraceExt2( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_COMPLETEFAILEDSSREQUEST_TD, "CMmSupplServMessHandler::CompleteFailedSSRequest;aTransactionId=%hhu;aError=%d", aTransactionId, aError ); TBool isExpectedMessage = ETrue; switch ( aTransactionId ) @@ -1793,7 +1820,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::CompleteFailedSSRequest \ - unknown traId: %d", aTransactionId ); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_COMPLETEFAILEDSSREQUEST, "CMmSupplServMessHandler::CompleteFailedSSRequest;aTransactionId=%hhu", aTransactionId ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_COMPLETEFAILEDSSREQUEST_TD, "CMmSupplServMessHandler::CompleteFailedSSRequest;aTransactionId=%hhu", aTransactionId ); // ignore unknown response; do nothing isExpectedMessage = EFalse; break; @@ -1824,7 +1851,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::SsGsmBarringReq"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSGSMBARRINGREQ, "CMmSupplServMessHandler::SsGsmBarringReq" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSGSMBARRINGREQ_TD, "CMmSupplServMessHandler::SsGsmBarringReq" ); TUint8 numOfSubblocks( 0 ); TInt subblockStart = ISI_HEADER_SIZE + SIZE_SS_SERVICE_REQ; @@ -1982,7 +2009,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::SsGsmWaitingReq"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSGSMWAITINGREQ, "CMmSupplServMessHandler::SsGsmWaitingReq" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSGSMWAITINGREQ_TD, "CMmSupplServMessHandler::SsGsmWaitingReq" ); TUint8 numOfSubblocks( 0 ); TBuf8<8> data( 0 ); @@ -2064,7 +2091,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::SsIdentityServiceReq"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSIDENTITYSERVICEREQ, "CMmSupplServMessHandler::SsIdentityServiceReq" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSIDENTITYSERVICEREQ_TD, "CMmSupplServMessHandler::SsIdentityServiceReq" ); //create ss service request message and set it to point send buffer TIsiSend isimsg( iPhoNetSender->SendBufferDes() ); @@ -2151,7 +2178,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::SsGsmUssdSendReq"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSGSMUSSDSENDREQ, "CMmSupplServMessHandler::SsGsmUssdSendReq" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSGSMUSSDSENDREQ_TD, "CMmSupplServMessHandler::SsGsmUssdSendReq" ); //create ss service request message TBuf8<4> data( 0 ); //allocate memory for data @@ -2202,17 +2229,24 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::SsGsmUssdSendResp"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSGSMUSSDSENDRESP, "CMmSupplServMessHandler::SsGsmUssdSendResp" ); - - if ( ESSOperationTypeSendNetworkServiceRequest == aIsiMessage.Get8bit( - ISI_HEADER_SIZE + SS_GSM_USSD_SEND_RESP_OFFSET_TRANSID ) ) +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSGSMUSSDSENDRESP_TD, "CMmSupplServMessHandler::SsGsmUssdSendResp" ); + + TUint8 trId( aIsiMessage.Get8bit( ISI_HEADER_SIZE + SS_GSM_USSD_SEND_RESP_OFFSET_TRANSID ) ); + + if ( ESSOperationTypeSendNetworkServiceRequest == trId ) { // complete (no packed parameter) iMessageRouter->Complete( EMobilePhoneSendNetworkServiceRequest, KErrNone ); } - + else if( ESSOperationTypeSendNetworkServiceRequestNoFdnCheck == trId ) + { + // complete (no packed parameter) + iMessageRouter->Complete( + EMobilePhoneSendNetworkServiceRequestNoFdnCheck, + KErrNone ); + } } // ----------------------------------------------------------------------------- @@ -2227,7 +2261,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::SsStatusInd"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSSTATUSIND, "CMmSupplServMessHandler::SsStatusInd" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSSTATUSIND_TD, "CMmSupplServMessHandler::SsStatusInd" ); // Get number of subblocks TInt numOfSubBlocks( 0 ); @@ -2359,7 +2393,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::SsCompleteInd"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSCOMPLETEIND, "CMmSupplServMessHandler::SsCompleteInd" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SSCOMPLETEIND_TD, "CMmSupplServMessHandler::SsCompleteInd" ); TUint sbStartOffSet( 0 ); RMobilePhone::TMobilePhoneSendSSRequestV3 returnResult; @@ -2436,7 +2470,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapMobileServiceToBasicServiceCodeIsi \ - basic service code: %d", aIsiBasicServiceCode); -OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPMOBILESERVICETOBASICSERVICECODEISI, "CMmSupplServMessHandler::MapMobileServiceToBasicServiceCodeIsi;aIsiBasicServiceCode=%hhu", *aIsiBasicServiceCode ); +OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPMOBILESERVICETOBASICSERVICECODEISI_TD, "CMmSupplServMessHandler::MapMobileServiceToBasicServiceCodeIsi;aIsiBasicServiceCode=%hhu", *aIsiBasicServiceCode ); TInt ret ( KErrNone ); //get the right mobile service @@ -2612,7 +2646,7 @@ // not expected. TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapMobileServiceToBasicServiceCodeIsi \ - unknown mobile service: %d", aMobileService); -OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPMOBILESERVICETOBASICSERVICECODEISI, "CMmSupplServMessHandler::MapMobileServiceToBasicServiceCodeIsi;aMobileService=%d", aMobileService ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPMOBILESERVICETOBASICSERVICECODEISI_TD, "CMmSupplServMessHandler::MapMobileServiceToBasicServiceCodeIsi;aMobileService=%d", aMobileService ); ret = KErrArgument; break; } @@ -2634,7 +2668,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::MapCFConditionMmToIsi"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPCFCONDITIONMMTOISI, "CMmSupplServMessHandler::MapCFConditionMmToIsi" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPCFCONDITIONMMTOISI_TD, "CMmSupplServMessHandler::MapCFConditionMmToIsi" ); TInt retVal( KErrNone ); switch ( aMmCFCondition ) @@ -2661,7 +2695,7 @@ default: TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapCFConditionMmToIsi - \ unknown call forward condition: %d", aCFCondition); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPCFCONDITIONMMTOISI, "CMmSupplServMessHandler::MapCFConditionMmToIsi;aCFCondition=%hu", *aCFCondition ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPCFCONDITIONMMTOISI_TD, "CMmSupplServMessHandler::MapCFConditionMmToIsi;aCFCondition=%hu", *aCFCondition ); retVal = KErrNotSupported; break; } @@ -2683,7 +2717,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::MapTypeOfNumberIsiToMm"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPTYPEOFNUMBERISITOMM, "CMmSupplServMessHandler::MapTypeOfNumberIsiToMm" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPTYPEOFNUMBERISITOMM_TD, "CMmSupplServMessHandler::MapTypeOfNumberIsiToMm" ); TInt retVal( KErrNone ); //get the right numbering plan @@ -2715,7 +2749,7 @@ // compiler warning when trace compiler is not // in use. TUint8 tOn = aIsiTypeOfNumber & 0x0F; // parameter made just for tracing. -OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPTYPEOFNUMBERISITOMM, "CMmSupplServMessHandler::MapTypeOfNumberIsiToMm;aIsiTypeOfNumber=%hhu", tOn ); +OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPTYPEOFNUMBERISITOMM_TD, "CMmSupplServMessHandler::MapTypeOfNumberIsiToMm;aIsiTypeOfNumber=%hhu", tOn ); #endif retVal = KErrArgument; break; @@ -2753,7 +2787,7 @@ // compiler warning when trace compiler is not // in use. TUint8 tOn = ( ( aIsiTypeOfNumber & 0x70 ) >> 4 ); // Parameter just for tracing. -OstTraceExt1( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_MAPTYPEOFNUMBERISITOMM, "CMmSupplServMessHandler::MapTypeOfNumberIsiToMm;tOn=%hhu", tOn ); +OstTraceExt1( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_MAPTYPEOFNUMBERISITOMM_TD, "CMmSupplServMessHandler::MapTypeOfNumberIsiToMm;tOn=%hhu", tOn ); #endif retVal = KErrArgument; break; @@ -2775,7 +2809,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapCFStatusIsiToMm - SS status: %d", aIsiSsStatus); -OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPCFSTATUSISITOMM, "CMmSupplServMessHandler::MapCFStatusIsiToMm;aIsiSsStatus=%hhu", aIsiSsStatus ); +OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPCFSTATUSISITOMM_TD, "CMmSupplServMessHandler::MapCFStatusIsiToMm;aIsiSsStatus=%hhu", aIsiSsStatus ); if ( ( 0 == ( aIsiSsStatus & ( SS_GSM_ACTIVE + SS_GSM_REGISTERED + SS_GSM_PROVISIONED + SS_GSM_QUIESCENT ) ) ) && @@ -2819,7 +2853,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::MapCWStatusIsiToMm"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPCWSTATUSISITOMM, "CMmSupplServMessHandler::MapCWStatusIsiToMm" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPCWSTATUSISITOMM_TD, "CMmSupplServMessHandler::MapCWStatusIsiToMm" ); if ( ( 0 == ( aIsiSsStatus & ( SS_GSM_ACTIVE + SS_GSM_REGISTERED + SS_GSM_PROVISIONED + SS_GSM_QUIESCENT ) ) ) && @@ -2866,7 +2900,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapBasicServiceCodeIsiToMm - \ isi basic service code: %d", aIsiBasicServiceCode); -OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPBASICSERVICECODEISITOMM, "CMmSupplServMessHandler::MapBasicServiceCodeIsiToMm;aIsiBasicServiceCode=%hhu", aIsiBasicServiceCode ); +OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPBASICSERVICECODEISITOMM_TD, "CMmSupplServMessHandler::MapBasicServiceCodeIsiToMm;aIsiBasicServiceCode=%hhu", aIsiBasicServiceCode ); TInt ret( KErrNone ); @@ -3038,7 +3072,7 @@ default: TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapBasicServiceCodeIsiToMm \ - unknown isi basic service code: %d", aIsiBasicServiceCode); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPBASICSERVICECODEISITOMM, "CMmSupplServMessHandler::MapBasicServiceCodeIsiToMm;unknown isi basic service code=%hhu", aIsiBasicServiceCode ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPBASICSERVICECODEISITOMM_TD, "CMmSupplServMessHandler::MapBasicServiceCodeIsiToMm;unknown isi basic service code=%hhu", aIsiBasicServiceCode ); ret = KErrGeneral; // this can't be KErrArgument because basic // service code isn't usually given as argument break; @@ -3060,7 +3094,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapCFConditionIsiToMm - isi call \ forward condition: %d", aCFCondition); -OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPCFCONDITIONISITOMM, "CMmSupplServMessHandler::MapCFConditionIsiToMm;aCFCondition=%hu", aCFCondition ); +OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPCFCONDITIONISITOMM_TD, "CMmSupplServMessHandler::MapCFConditionIsiToMm;aCFCondition=%hu", aCFCondition ); //get the right condition code switch ( aCFCondition ) @@ -3085,7 +3119,7 @@ break; default: TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapCFConditionIsiToMm - unknown isi call forward condition: %d", aCFCondition); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPCFCONDITIONISITOMM, "CMmSupplServMessHandler::MapCFConditionIsiToMm;unknown isi call forward condition=%hu", aCFCondition ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPCFCONDITIONISITOMM_TD, "CMmSupplServMessHandler::MapCFConditionIsiToMm;unknown isi call forward condition=%hu", aCFCondition ); *aMmCFCondition = RMobilePhone::ECallForwardingUnspecified; break; } @@ -3104,7 +3138,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapTimeoutIsiToMm - isi timeout: %d", aISITimeout); -OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPTIMEOUTISITOMM, "CMmSupplServMessHandler::MapTimeoutIsiToMm;aISITimeout=%hhu", aISITimeout ); +OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPTIMEOUTISITOMM_TD, "CMmSupplServMessHandler::MapTimeoutIsiToMm;aISITimeout=%hhu", aISITimeout ); if ( SS_UNDEFINED_TIME == aISITimeout ) { @@ -3131,7 +3165,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapOperationMmToIsi - multimode \ api service action: %d", aMmOperation); -OstTrace1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPOPERATIONMMTOISI, "CMmSupplServMessHandler::MapOperationMmToIsi;aMmOperation=%d", aMmOperation ); +OstTrace1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPOPERATIONMMTOISI_TD, "CMmSupplServMessHandler::MapOperationMmToIsi;aMmOperation=%d", aMmOperation ); TInt ret( KErrNone ); @@ -3155,7 +3189,7 @@ default: TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapOperationMmToIsi - \ unknown multimode api service action: %d", aMmOperation); -OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPOPERATIONMMTOISI, "CMmSupplServMessHandler::MapOperationMmToIsi;unknown multimode api service action=%d", aMmOperation ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPOPERATIONMMTOISI_TD, "CMmSupplServMessHandler::MapOperationMmToIsi;unknown multimode api service action=%d", aMmOperation ); ret = KErrArgument; break; } @@ -3176,7 +3210,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapCBConditionIsiToMm - isi call \ barring condition: %d", aCBCondition); -OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPCBCONDITIONISITOMM, "CMmSupplServMessHandler::MapCBConditionIsiToMm;aCBCondition=%hu", aCBCondition ); +OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPCBCONDITIONISITOMM_TD, "CMmSupplServMessHandler::MapCBConditionIsiToMm;aCBCondition=%hu", aCBCondition ); //get the right condition code switch ( aCBCondition ) @@ -3207,7 +3241,7 @@ break; default: TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapCBConditionIsiToMm - unknown isi call barring condition: %d", aCBCondition); -OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPCBCONDITIONISITOMM, "CMmSupplServMessHandler::MapCBConditionIsiToMm;unknown isi call barring condition=%hu", aCBCondition ); +OstTraceExt1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPCBCONDITIONISITOMM_TD, "CMmSupplServMessHandler::MapCBConditionIsiToMm;unknown isi call barring condition=%hu", aCBCondition ); *aMmCBCondition = RMobilePhone::EBarUnspecified; break; } @@ -3228,7 +3262,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapCBConditionMmToIsi - multimode \ api call barring condition: %d", aMmCBCondition); -OstTrace1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPCBCONDITIONMMTOISI, "CMmSupplServMessHandler::MapCBConditionMmToIsi;aMmCBCondition=%d", aMmCBCondition ); +OstTrace1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPCBCONDITIONMMTOISI_TD, "CMmSupplServMessHandler::MapCBConditionMmToIsi;aMmCBCondition=%d", aMmCBCondition ); TInt ret( KErrNone ); @@ -3262,7 +3296,7 @@ default: TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapCBConditionMmToIsi - \ unknown multimode api call barring condition: %d", aMmCBCondition); -OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPCBCONDITIONMMTOISI, "CMmSupplServMessHandler::MapCBConditionMmToIsi;unknown multimode api call barring condition=%d", aMmCBCondition ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPCBCONDITIONMMTOISI_TD, "CMmSupplServMessHandler::MapCBConditionMmToIsi;unknown multimode api call barring condition=%d", aMmCBCondition ); ret = KErrNotSupported; break; } @@ -3282,7 +3316,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapCBStatusIsiToMm - isi status: %d", aIsiSsStatus); -OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPCBSTATUSISITOMM, "CMmSupplServMessHandler::MapCBStatusIsiToMm;aIsiSsStatus=%hhu", aIsiSsStatus ); +OstTraceExt1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPCBSTATUSISITOMM_TD, "CMmSupplServMessHandler::MapCBStatusIsiToMm;aIsiSsStatus=%hhu", aIsiSsStatus ); //get the right status code if ( ( 0 == ( aIsiSsStatus & ( SS_GSM_ACTIVE + SS_GSM_REGISTERED + @@ -3325,7 +3359,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapIdentityServiceMmToIsi - \ multimode api identity service: %d", aService); -OstTrace1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPIDENTITYSERVICEMMTOISI, "CMmSupplServMessHandler::MapIdentityServiceMmToIsi;aService=%d", aService ); +OstTrace1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPIDENTITYSERVICEMMTOISI_TD, "CMmSupplServMessHandler::MapIdentityServiceMmToIsi;aService=%d", aService ); TInt ret( KErrNone ); @@ -3352,7 +3386,7 @@ default: TFLOGSTRING2("TSY: CMmSupplServMessHandler::MapIdentityServiceMmToIsi \ - unknown multimode api identity service: %d", aService); -OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPIDENTITYSERVICEMMTOISI, "CMmSupplServMessHandler::MapIdentityServiceMmToIsi;unknown multimode api identity service=%d", aService ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPIDENTITYSERVICEMMTOISI_TD, "CMmSupplServMessHandler::MapIdentityServiceMmToIsi;unknown multimode api identity service=%d", aService ); ret = KErrNotSupported; break; } @@ -3378,7 +3412,7 @@ TFLOGSTRING3("TSY: CMmSupplServMessHandler::MapIdentityServiceStatusIsiToMm \ - isi id service status: %d, isi clir operation: %d", aIsiIdentityServiceStatus, aIsiClirOption); -OstTraceExt2( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPIDENTITYSERVICESTATUSISITOMM, "CMmSupplServMessHandler::MapIdentityServiceStatusIsiToMm;aIsiIdentityServiceStatus=%hhu;aIsiClirOption=%hhu", aIsiIdentityServiceStatus, aIsiClirOption ); +OstTraceExt2( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPIDENTITYSERVICESTATUSISITOMM_TD, "CMmSupplServMessHandler::MapIdentityServiceStatusIsiToMm;aIsiIdentityServiceStatus=%hhu;aIsiClirOption=%hhu", aIsiIdentityServiceStatus, aIsiClirOption ); if ( 0 == ( aIsiIdentityServiceStatus & SS_GSM_PROVISIONED ) ) { @@ -3434,7 +3468,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::GsmLibSmsPackMessage"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_GSMLIBSMSPACKMESSAGE, "CMmSupplServMessHandler::GsmLibSmsPackMessage" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_GSMLIBSMSPACKMESSAGE_TD, "CMmSupplServMessHandler::GsmLibSmsPackMessage" ); TUint16 si( 0 ); TUint16 di( 0 ); // Indexes @@ -3491,7 +3525,7 @@ ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::HandleError"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_HANDLEERROR, "CMmSupplServMessHandler::HandleError" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_HANDLEERROR_TD, "CMmSupplServMessHandler::HandleError" ); //none } @@ -3500,16 +3534,18 @@ // Write call forwarding flags REL4 to UICC // ----------------------------------------------------------------------------- // -TInt CMmSupplServMessHandler::UiccWriteCallFwdFlagsRel4Req() +TInt CMmSupplServMessHandler::UiccWriteCallFwdFlagsRel4Req + ( + TUint8 aVoiceStatus, + TUint8 aFaxStatus, + TUint8 aDataStatus + ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsRel4Req"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCWRITECALLFWDFLAGSREL4REQ, "CMmSupplServMessHandler::UiccWriteCallFwdFlagsRel4Req" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCWRITECALLFWDFLAGSREL4REQ_TD, "CMmSupplServMessHandler::UiccWriteCallFwdFlagsRel4Req" ); TBuf telNumber( 0 ); - TUint8 voiceStatus( iVoiceStatus ); - TUint8 faxStatus( iFaxStatus ); - TUint8 dataStatus( iDataStatus ); TUint8 numberLength( iCFAddress.iTelNumber.Length() ); TUint8 status( 0 ); @@ -3529,8 +3565,8 @@ if ( RMobilePhone::ECallForwardingUnconditional == iMmCFCondition ) { telNumber.Copy( iCFAddress.iTelNumber ); - voiceStatus = status; - faxStatus = status; + aVoiceStatus = status; + aFaxStatus = status; } break; } @@ -3539,7 +3575,7 @@ if ( RMobilePhone::ECallForwardingUnconditional == iMmCFCondition ) { telNumber.Copy( iCFAddress.iTelNumber ); - voiceStatus = status; + aVoiceStatus = status; } else { @@ -3555,7 +3591,7 @@ if ( RMobilePhone::ECallForwardingUnconditional == iMmCFCondition ) { - dataStatus = status; + aDataStatus = status; } break; @@ -3567,7 +3603,7 @@ if ( RMobilePhone::ECallForwardingUnconditional == iMmCFCondition ) { - faxStatus = status; + aFaxStatus = status; } break; } @@ -3577,9 +3613,9 @@ RMobilePhone::ECallForwardingUnconditional == iMmCFCondition ) { telNumber.Copy( iCFAddress.iTelNumber ); - voiceStatus = status; - dataStatus = status; - faxStatus = status; + aVoiceStatus = status; + aDataStatus = status; + aFaxStatus = status; } break; } @@ -3588,7 +3624,7 @@ if ( RMobilePhone::ECallForwardingUnconditional == iMmCFCondition ) { telNumber.Copy( iCFAddress.iTelNumber ); - dataStatus = status; + aDataStatus = status; } break; } @@ -3597,29 +3633,29 @@ if ( RMobilePhone::ECallForwardingUnconditional == iMmCFCondition ) { telNumber.Copy( iCFAddress.iTelNumber ); - dataStatus = status; + aDataStatus = status; } break; } default: { TFLOGSTRING2("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsRel4Req - unknown call service: %d", iMobileService); -OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_UICCWRITECALLFWDFLAGSREL4REQ, "CMmSupplServMessHandler::UiccWriteCallFwdFlagsRel4Req;iMobileService=%d", iMobileService ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_UICCWRITECALLFWDFLAGSREL4REQ_TD, "CMmSupplServMessHandler::UiccWriteCallFwdFlagsRel4Req;iMobileService=%d", iMobileService ); break; } } TFLOGSTRING3("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsRel4Req - Number: %S, length: %d", &telNumber, numberLength); -TFLOGSTRING4("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsRel4Req - VoiceStatus: %d, FaxStatus: %d, DataStatus: %d", voiceStatus, faxStatus, dataStatus); -OstTraceExt5( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_UICCWRITECALLFWDFLAGSREL4REQ, "CMmSupplServMessHandler::UiccWriteCallFwdFlagsRel4Req;telNumber=%S;numberLength=%hhu;voiceStatus=%hhu;faxStatus=%hhu;dataStatus=%hhu", telNumber, numberLength, voiceStatus, faxStatus, dataStatus ); +TFLOGSTRING4("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsRel4Req - VoiceStatus: %d, FaxStatus: %d, DataStatus: %d", aVoiceStatus, aFaxStatus, aDataStatus); +OstTraceExt5( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_UICCWRITECALLFWDFLAGSREL4REQ_TD, "CMmSupplServMessHandler::UiccWriteCallFwdFlagsRel4Req;telNumber=%S;numberLength=%hhu;voiceStatus=%hhu;faxStatus=%hhu;dataStatus=%hhu", telNumber, numberLength, aVoiceStatus, aFaxStatus, aDataStatus ); // Status of the call forward unconditional indicator TUint8 cfuIndicatorStatus( 0 ); - cfuIndicatorStatus = voiceStatus; // 1st bit is for voice + cfuIndicatorStatus = aVoiceStatus; // 1st bit is for voice // 2nd bit is for fax - cfuIndicatorStatus = cfuIndicatorStatus | ( faxStatus << 1 ); + cfuIndicatorStatus = cfuIndicatorStatus | ( aFaxStatus << 1 ); // 3rd bit is for data - cfuIndicatorStatus = cfuIndicatorStatus | ( dataStatus << 2 ); + cfuIndicatorStatus = cfuIndicatorStatus | ( aDataStatus << 2 ); // Convert number to BCD format TBuf8 bcdNumberToSim( 0 ); @@ -3686,27 +3722,20 @@ // Write call forwarding flags CPHS to UICC // ----------------------------------------------------------------------------- // -TInt CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq() +TInt CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq + ( + TUint8 aVoiceLine1Status, + TUint8 aVoiceLine2Status, + TUint8 aFaxStatus, + TUint8 aDataStatus + ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCWRITECALLFWDFLAGSCPHSREQ, "CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq" ); - - TUint8 voiceLine1( iVoiceLine1 ); - TUint8 voiceLine2( iVoiceLine2 ); - TUint8 faxFlag( iFax ); - TUint8 dataFlag( iData ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCWRITECALLFWDFLAGSCPHSREQ_TD, "CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq" ); TUint8 numberLength = iCFAddress.iTelNumber.Length(); - TUint8 status( 0 ); - - if ( 0 < numberLength ) - { - status = 0x0A; // set divert - } - else - { - status = 0x05; // cancel divert - } + TCphsCallForwardingFlagStatus status( 0 < numberLength ? + ECphsCallForwardingActive : ECphsCallForwardingInactive ); switch ( iMobileService ) { @@ -3714,7 +3743,7 @@ { if ( RMobilePhone::ECallForwardingUnconditional == iMmCFCondition ) { - voiceLine1 = status; + aVoiceLine1Status = status; } break; } @@ -3722,7 +3751,7 @@ { if ( RMobilePhone::ECallForwardingUnconditional == iMmCFCondition ) { - dataFlag = status; + aDataStatus = status; } break; } @@ -3730,7 +3759,7 @@ { if ( RMobilePhone::ECallForwardingUnconditional == iMmCFCondition ) { - faxFlag = status; + aFaxStatus = status; } break; } @@ -3739,9 +3768,9 @@ if ( RMobilePhone::ECallForwardingAllCases == iMmCFCondition || RMobilePhone::ECallForwardingUnconditional == iMmCFCondition ) { - voiceLine1 = status; - dataFlag = status; - faxFlag = status; + aVoiceLine1Status = status; + aDataStatus = status; + aFaxStatus = status; } break; } @@ -3749,52 +3778,48 @@ { if ( RMobilePhone::ECallForwardingUnconditional == iMmCFCondition ) { - voiceLine2 = status; + aVoiceLine2Status = status; } else if ( RMobilePhone::ECallForwardingAllCases == iMmCFCondition ) { - voiceLine2 = status; - dataFlag = status; - faxFlag = status; + aVoiceLine2Status = status; + aDataStatus = status; + aFaxStatus = status; } break; } default: { TFLOGSTRING2("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq - unknown call service: %d", iMobileService); -OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_UICCWRITECALLFWDFLAGSCPHSREQ, "CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq;iMobileService=%d", iMobileService ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_UICCWRITECALLFWDFLAGSCPHSREQ_TD, "CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq;iMobileService=%d", iMobileService ); break; } } -TFLOGSTRING2("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq - VoiceLine1: %d", voiceLine1); -TFLOGSTRING2("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq - VoiceLine2: %d", voiceLine2); -TFLOGSTRING2("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq - Fax: %d", faxFlag); -TFLOGSTRING2("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq - Data: %d", dataFlag); -OstTraceExt4( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_UICCWRITECALLFWDFLAGSCPHSREQ, "CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq;voiceLine1=%hhu;voiceLine2=%hhu;faxFlag=%hhu;dataFlag=%hhu", voiceLine1, voiceLine2, faxFlag, dataFlag ); +TFLOGSTRING2("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq - VoiceLine1: %d", aVoiceLine1Status); +TFLOGSTRING2("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq - VoiceLine2: %d", aVoiceLine2Status); +TFLOGSTRING2("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq - Fax: %d", aFaxStatus); +TFLOGSTRING2("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq - Data: %d", aDataStatus); +OstTraceExt4( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_UICCWRITECALLFWDFLAGSCPHSREQ_TD, "CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq;voiceLine1=%hhu;voiceLine2=%hhu;faxFlag=%hhu;dataFlag=%hhu", aVoiceLine1Status, aVoiceLine2Status, aFaxStatus, aDataStatus ); // Stores CPHS indicator values to be used in notify // ECustomNotifyIccCallForwardingStatusChangeIPC // Stores CAPI CF indicator values iTCFIndicators.iMultipleSubscriberProfileID = RMmCustomAPI::KProfileIdentityOne; - iTCFIndicators.iIndicator = - ( voiceLine1 == 0x0A ? RMobilePhone::KCFUIndicatorVoice: - RMobilePhone::KCFUIndicatorUnknown ); - - iTCFIndicators.iIndicator |= - ( voiceLine2 == 0x0A ? RMobilePhone::KCFUIndicatorAuxVoice: - RMobilePhone::KCFUIndicatorUnknown ); - - iTCFIndicators.iIndicator |= - ( faxFlag == 0x0A ? RMobilePhone::KCFUIndicatorFax: - RMobilePhone::KCFUIndicatorUnknown ); - - iTCFIndicators.iIndicator |= - ( dataFlag == 0x0A ? RMobilePhone::KCFUIndicatorData: - RMobilePhone::KCFUIndicatorUnknown ); + iTCFIndicators.iIndicator = aVoiceLine1Status == ECphsCallForwardingActive + ? RMobilePhone::KCFUIndicatorVoice : RMobilePhone::KCFUIndicatorUnknown; + + iTCFIndicators.iIndicator |= aVoiceLine2Status == ECphsCallForwardingActive + ? RMobilePhone::KCFUIndicatorAuxVoice : RMobilePhone::KCFUIndicatorUnknown; + + iTCFIndicators.iIndicator |= aFaxStatus == ECphsCallForwardingActive + ? RMobilePhone::KCFUIndicatorFax : RMobilePhone::KCFUIndicatorUnknown; + + iTCFIndicators.iIndicator |= aDataStatus == ECphsCallForwardingActive + ? RMobilePhone::KCFUIndicatorData : RMobilePhone::KCFUIndicatorUnknown; TFLOGSTRING2("TSY: CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq - Indicator: 0x%x", iTCFIndicators.iIndicator ); -OstTrace1( TRACE_NORMAL, DUP3_CMMSUPPLSERVMESSHANDLER_UICCWRITECALLFWDFLAGSCPHSREQ, "CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq;iTCFIndicators.iIndicator=%x", iTCFIndicators.iIndicator ); +OstTrace1( TRACE_NORMAL, DUP3_CMMSUPPLSERVMESSHANDLER_UICCWRITECALLFWDFLAGSCPHSREQ_TD, "CMmSupplServMessHandler::UiccWriteCallFwdFlagsCPHSReq;iTCFIndicators.iIndicator=%x", iTCFIndicators.iIndicator ); iTCFIndicators.iCFNumber.iTelNumber.Zero(); @@ -3816,10 +3841,19 @@ // File data tu be updated. TBuf8<2> fileDataBuf; - // Byte 1: Voice line 2 (bits 4-7) and Voice line 1 (bits 0-3) - fileDataBuf.Append( ( voiceLine2 << 4 ) | ( voiceLine1 ) ); - // Byte 2: Data calls (bits 4-7) and Fax calls (bits 0-3) - fileDataBuf.Append( ( dataFlag << 4 ) | ( faxFlag ) ); + // Byte 1[M]: Voice line 2 (bits 4-7) and Voice line 1 (bits 0-3) + fileDataBuf.Append( aVoiceLine2Status << 4 | aVoiceLine1Status ); + // Byte 2[O]: Data calls (bits 4-7) and Fax calls (bits 0-3) + // write only if it makes sense + if ( ECphsCallForwardingUnknown != aFaxStatus || + ECphsCallForwardingUnknown != aDataStatus ) + { + aDataStatus = aDataStatus == ECphsCallForwardingUnknown ? + ECphsCallForwardingInactive : aDataStatus; + aFaxStatus = aFaxStatus == ECphsCallForwardingUnknown ? + ECphsCallForwardingInactive : aFaxStatus; + fileDataBuf.Append( aDataStatus << 4 | aFaxStatus ); + } params.fileData.Append( fileDataBuf ); @@ -3834,7 +3868,7 @@ TInt CMmSupplServMessHandler::UiccReadCallFwdFlagsRel4Req() { TFLOGSTRING("TSY: CMmSupplServMessHandler::UiccReadCallFwdFlagsRel4Req"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCREADCALLFWDFLAGSREL4REQ, "CMmSupplServMessHandler::UiccReadCallFwdFlagsRel4Req" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCREADCALLFWDFLAGSREL4REQ_TD, "CMmSupplServMessHandler::UiccReadCallFwdFlagsRel4Req" ); // At first try to read rel4 EF ( 6FCB ) // If reading is not successful, then we try CPHS file ( 6F13 ) @@ -3864,7 +3898,7 @@ TInt CMmSupplServMessHandler::UiccReadCallFwdFlagsCphsReq() { TFLOGSTRING("TSY: CMmSupplServMessHandler::UiccReadCallFwdFlagsCphsReq"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCREADCALLFWDFLAGSCPHSREQ, "CMmSupplServMessHandler::UiccReadCallFwdFlagsCphsReq" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCREADCALLFWDFLAGSCPHSREQ_TD, "CMmSupplServMessHandler::UiccReadCallFwdFlagsCphsReq" ); // Set parameters for UICC_APPL_CMD_REQ message TUiccReadTransparent params; @@ -3895,26 +3929,34 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::UiccHandleCallFwdFlagsResp"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCHANDLECALLFWDFLAGSRESP, "CMmSupplServMessHandler::UiccHandleCallFwdFlagsResp" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCHANDLECALLFWDFLAGSRESP_TD, "CMmSupplServMessHandler::UiccHandleCallFwdFlagsResp" ); CMmDataPackage dataPackage; CMmDataPackage customDataPackage; - TBool rel4Exists( EFalse ); - TBool cphsExists( EFalse ); - + enum + { + EForwardFlagsConfigurationUnknown, + EForwardFlagsConfigurationRel4, + EForwardFlagsConfigurationCphs + } configuration( EForwardFlagsConfigurationUnknown ); + + TUint8 voiceStatus( 0 ); + TUint8 auxVoiceStatus( 0 ); + TUint8 faxStatus( 0 ); + TUint8 dataStatus( 0 ); // Read file data only if UICC status is OK if ( UICC_STATUS_OK == aStatus ) { if ( ETrIdReadCallFwdFlagsRel4 == aTrId ) { - rel4Exists = ETrue; - iVoiceStatus = aFileData[1] & 0x01; - iFaxStatus = ( ( aFileData[1] & 0x02 ) >> 1 ); - iDataStatus = ( ( aFileData[1] & 0x04 ) >> 2 ); + configuration = EForwardFlagsConfigurationRel4; + voiceStatus = aFileData[1] & 0x01; + faxStatus = ( aFileData[1] & 0x02 ) >> 1; + dataStatus = ( aFileData[1] & 0x04 ) >> 2; // In case of inactive flags, remaining bytes may be set to 0xFF in SIM // Check the byte 3 for avoiding crash in that case. - if ( iVoiceStatus || iFaxStatus || iDataStatus && + if ( ( voiceStatus || faxStatus || dataStatus ) && 0xFF != aFileData[2] ) { TUint8 numberLen( aFileData[2] ); @@ -3934,15 +3976,25 @@ { iCFTelNumberFromSim.SetLength( index ); } + // no else } + // no else } else // CPHS case { - iVoiceLine1 = aFileData[0] & 0x0F; - iVoiceLine2 = ( aFileData[0] & 0xF0 ) >> 4; - iFax = aFileData[1] & 0x0F; - iData = ( aFileData[1] & 0xF0 ) >> 4; - cphsExists = ETrue; + configuration = EForwardFlagsConfigurationCphs; + voiceStatus = aFileData[0] & 0x0F; + auxVoiceStatus = ( aFileData[0] & 0xF0 ) >> 4; + if ( 1 < aFileData.Length() ) + { + faxStatus = aFileData[1] & 0x0F; + dataStatus = ( aFileData[1] & 0xF0 ) >> 4; + } + else + { + faxStatus = ECphsCallForwardingUnknown; + dataStatus = ECphsCallForwardingUnknown; + } } } // End of if ( UICC_STATUS_OK == aStatus ) @@ -3952,37 +4004,35 @@ iTCFIndicators.iMultipleSubscriberProfileID = RMmCustomAPI::KProfileIdentityOne; - if ( rel4Exists ) + if ( EForwardFlagsConfigurationRel4 == configuration ) { iTCFIndicators.iIndicator = - ( iVoiceStatus ? RMobilePhone::KCFUIndicatorVoice: - RMobilePhone::KCFUIndicatorUnknown ); + voiceStatus ? RMobilePhone::KCFUIndicatorVoice : + RMobilePhone::KCFUIndicatorUnknown; iTCFIndicators.iIndicator |= - ( iFaxStatus ? RMobilePhone::KCFUIndicatorFax: - RMobilePhone::KCFUIndicatorUnknown ); + faxStatus ? RMobilePhone::KCFUIndicatorFax : + RMobilePhone::KCFUIndicatorUnknown; iTCFIndicators.iIndicator |= - ( iDataStatus ? RMobilePhone::KCFUIndicatorData: - RMobilePhone::KCFUIndicatorUnknown ); - + dataStatus ? RMobilePhone::KCFUIndicatorData : + RMobilePhone::KCFUIndicatorUnknown; iTCFIndicators.iCFNumber.iTelNumber.Copy( iCFTelNumberFromSim ); } - else if ( cphsExists ) // CPHS + else if ( EForwardFlagsConfigurationCphs == configuration ) // CPHS { iTCFIndicators.iIndicator = - ( iVoiceLine1 == 0x0A ? RMobilePhone::KCFUIndicatorVoice: - RMobilePhone::KCFUIndicatorUnknown ); - + voiceStatus == ECphsCallForwardingActive ? + RMobilePhone::KCFUIndicatorVoice : RMobilePhone::KCFUIndicatorUnknown; + iTCFIndicators.iIndicator |= + auxVoiceStatus == ECphsCallForwardingActive ? + RMobilePhone::KCFUIndicatorAuxVoice : RMobilePhone::KCFUIndicatorUnknown; iTCFIndicators.iIndicator |= - ( iVoiceLine2 == 0x0A ? RMobilePhone::KCFUIndicatorAuxVoice: - RMobilePhone::KCFUIndicatorUnknown ); - + faxStatus == ECphsCallForwardingActive ? + RMobilePhone::KCFUIndicatorFax : RMobilePhone::KCFUIndicatorUnknown; iTCFIndicators.iIndicator |= - ( iFax == 0x0A ? RMobilePhone::KCFUIndicatorFax: - RMobilePhone::KCFUIndicatorUnknown ); - iTCFIndicators.iIndicator |= - ( iData == 0x0A ? RMobilePhone::KCFUIndicatorData: - RMobilePhone::KCFUIndicatorUnknown ); + dataStatus == ECphsCallForwardingActive ? + RMobilePhone::KCFUIndicatorData : RMobilePhone::KCFUIndicatorUnknown; } + // no else if ( iGetIccCallForwardingStatus ) // ECustomGetIccCallForwardingStatusIPC { @@ -4011,24 +4061,25 @@ KErrNone ); TFLOGSTRING("TSY: CMmSupplServMessHandler::SimCallFwdRespL - Check possible refresh status"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_UICCHANDLECALLFWDFLAGSRESP, "CMmSupplServMessHandler::UiccHandleCallFwdFlagsResp - Check possible refresh status" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_UICCHANDLECALLFWDFLAGSRESP_TD, "CMmSupplServMessHandler::UiccHandleCallFwdFlagsResp - Check possible refresh status" ); iMessageRouter->GetPhoneMessHandler()->CallForwFlagsCachingCompleted( aStatus ); } else if ( !iGetCallForwardingNumber ) // EMobilePhoneSetCallForwardingStatus { - if ( rel4Exists ) + if ( EForwardFlagsConfigurationRel4 == configuration ) { // Call forwarding status successfully read from the SIM // Write call forwarding number and indicator status // to the SIM - UiccWriteCallFwdFlagsRel4Req(); + UiccWriteCallFwdFlagsRel4Req( voiceStatus, faxStatus, dataStatus ); } - else if ( cphsExists ) + else if ( EForwardFlagsConfigurationCphs == configuration ) { // Call forwarding status successfully read from the SIM // Write call forwarding number and indicator status // to the SIM - UiccWriteCallFwdFlagsCPHSReq(); + UiccWriteCallFwdFlagsCPHSReq( + voiceStatus, auxVoiceStatus, faxStatus, dataStatus ); } else { @@ -4047,7 +4098,7 @@ iGetCallForwardingNumber = EFalse; dataPackage.PackData( &iCFTelNumberFromSim ); - if ( rel4Exists ) + if ( EForwardFlagsConfigurationRel4 == configuration ) { // Call forwarding number successfully read from the SIM // Complete the GetCallForwardingNumber to SOS layer @@ -4078,7 +4129,7 @@ TInt CMmSupplServMessHandler::UiccReadVoiceMsgFlagsRel4Req() { TFLOGSTRING("TSY: CMmSupplServMessHandler::UiccReadVoiceMsgFlagsRel4Req"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_UICCREADVOICEMSGFLAGSREL4REQ, "CMmSupplServMessHandler::UiccReadVoiceMsgFlagsRel4Req" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_UICCREADVOICEMSGFLAGSREL4REQ_TD, "CMmSupplServMessHandler::UiccReadVoiceMsgFlagsRel4Req" ); // At first try to read rel4 EF ( 6FCA ) // If reading is not successful, then we try CPHS file ( 6F11 ) @@ -4110,7 +4161,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::UiccReadVoiceMsgFlagsResp"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCREADVOICEMSGFLAGSRESP, "CMmSupplServMessHandler::UiccReadVoiceMsgFlagsResp" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCREADVOICEMSGFLAGSRESP_TD, "CMmSupplServMessHandler::UiccReadVoiceMsgFlagsResp" ); TInt ret( KErrNone ); CMmDataPackage dataPackage; @@ -4174,7 +4225,7 @@ TInt CMmSupplServMessHandler::UiccReadVoiceMsgFlagsCphsReq() { TFLOGSTRING("TSY: CMmSupplServMessHandler::UiccHandleCallFwdFlagsResp"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCREADVOICEMSGFLAGSCPHSREQ, "CMmSupplServMessHandler::UiccReadVoiceMsgFlagsCphsReq" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCREADVOICEMSGFLAGSCPHSREQ_TD, "CMmSupplServMessHandler::UiccReadVoiceMsgFlagsCphsReq" ); // Reading of rel4 was not successful, we try CPHS file ( 6F11 ) // Set parameters for UICC_APPL_CMD_REQ message @@ -4203,7 +4254,7 @@ const RMobilePhone::TMobilePhoneMessageWaitingV1& aMsgWaiting ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::UiccWriteVoiceMsgFlagsCPHSReq"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCWRITEVOICEMSGFLAGSCPHSREQ, "CMmSupplServMessHandler::UiccWriteVoiceMsgFlagsCPHSReq" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCWRITEVOICEMSGFLAGSCPHSREQ_TD, "CMmSupplServMessHandler::UiccWriteVoiceMsgFlagsCPHSReq" ); // Set parameters for UICC_APPL_CMD_REQ message TUiccWriteTransparent params; @@ -4258,7 +4309,7 @@ const RMobilePhone::TMobilePhoneMessageWaitingV1& aMsgWaiting ) { TFLOGSTRING("TSY: CMmSupplServMessHandler::UiccHandleCallFwdFlagsResp"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCWRITEVOICEMSGFLAGSREL4REQ, "CMmSupplServMessHandler::UiccWriteVoiceMsgFlagsRel4Req" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_UICCWRITEVOICEMSGFLAGSREL4REQ_TD, "CMmSupplServMessHandler::UiccWriteVoiceMsgFlagsRel4Req" ); // Set parameters for UICC_APPL_CMD_REQ message TUiccWriteLinearFixed params; @@ -4300,7 +4351,7 @@ TUint8& aIsiTypeOfNumber ) { TFLOGSTRING("TSY: CMmCallMessHandler::MapTypeOfNumberMmToIsi"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPTYPEOFNUMBERMMTOISI, "CMmSupplServMessHandler::MapTypeOfNumberMmToIsi" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_MAPTYPEOFNUMBERMMTOISI_TD, "CMmSupplServMessHandler::MapTypeOfNumberMmToIsi" ); //get the right numbering plan switch ( aMmNumberingPlan ) @@ -4343,7 +4394,7 @@ { TFLOGSTRING2("TSY: CMmCallMessHandler::MapTypeOfNumberMmToIsi -\ Not supported numbering plan: %d", aMmNumberingPlan); -OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPTYPEOFNUMBERMMTOISI, "CMmSupplServMessHandler::MapTypeOfNumberMmToIsi;aMmNumberingPlan=%d", aMmNumberingPlan ); +OstTrace1( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_MAPTYPEOFNUMBERMMTOISI_TD, "CMmSupplServMessHandler::MapTypeOfNumberMmToIsi;aMmNumberingPlan=%d", aMmNumberingPlan ); break; } } @@ -4398,7 +4449,7 @@ { TFLOGSTRING2("TSY: CMmCallMessHandler::MapTypeOfNumberMmToIsi -\ Not supported number type: %d", aMmTypeOfNumber); -OstTrace1( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_MAPTYPEOFNUMBERMMTOISI, "CMmSupplServMessHandler::MapTypeOfNumberMmToIsi;aMmTypeOfNumber=%d", aMmTypeOfNumber ); +OstTrace1( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_MAPTYPEOFNUMBERMMTOISI_TD, "CMmSupplServMessHandler::MapTypeOfNumberMmToIsi;aMmTypeOfNumber=%d", aMmTypeOfNumber ); break; } } @@ -4416,7 +4467,7 @@ { TFLOGSTRING2("TSY: CMmSupplServMessHandler::SetVoiceCallForwardLine: %d", aAlsLine); -OstTrace1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SETVOICECALLFORWARDLINE, "CMmSupplServMessHandler::SetVoiceCallForwardLine;aAlsLine=%d", aAlsLine ); +OstTrace1( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_SETVOICECALLFORWARDLINE_TD, "CMmSupplServMessHandler::SetVoiceCallForwardLine;aAlsLine=%d", aAlsLine ); iAlsLine = aAlsLine; } @@ -4429,17 +4480,17 @@ const TPreprocessedSsServiceCompleteResponse& aResponse) { TFLOGSTRING("TSY:CMmSupplServMessHandler::ProcessIfSsRequestChanged"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSIFSSREQUESTCHANGED, "CMmSupplServMessHandler::ProcessIfSsRequestChanged" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSIFSSREQUESTCHANGED_TD, "CMmSupplServMessHandler::ProcessIfSsRequestChanged" ); TBool ret( EFalse ); // original SS request is changed, or initiated by Call Control - if ( ESSOperationTypeUnknown == aResponse.iTraId && iSsCode != aResponse.iSsCode ) + if ( iSsCode != aResponse.iSsCode ) { ret = ETrue; if ( KSsCodeNoValue != iSsCode ) { TFLOGSTRING("TSY: call control has changed SS request -> complete with error"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_PROCESSIFSSREQUESTCHANGED, "CMmSupplServMessHandler::ProcessIfSsRequestChanged, call control has changed SS request -> complete with error" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_PROCESSIFSSREQUESTCHANGED_TD, "CMmSupplServMessHandler::ProcessIfSsRequestChanged, call control has changed SS request -> complete with error" ); //call control has changed SS request -> complete with error iMessageRouter->Complete( iIpc, @@ -4450,7 +4501,7 @@ else { TFLOGSTRING("TSY: call control has changed call request to SS request -> ignored"); -OstTrace0( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_PROCESSIFSSREQUESTCHANGED, "CMmSupplServMessHandler::ProcessIfSsRequestChanged,call control has changed call request to SS request -> ignored" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMSUPPLSERVMESSHANDLER_PROCESSIFSSREQUESTCHANGED_TD, "CMmSupplServMessHandler::ProcessIfSsRequestChanged,call control has changed call request to SS request -> ignored" ); // call control has changed call request to SS request. // CTSY doesn't expect the completion, ignore this (error EXTL-6XJ9KC) } @@ -4467,7 +4518,7 @@ const TPreprocessedSsServiceCompleteResponse& /*aResponse*/) { TFLOGSTRING("TSY:CMmSupplServMessHandler::ProcessIfSimpleCompletionPossible"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSIFSIMPLECOMPLETIONPOSSIBLE, "CMmSupplServMessHandler::ProcessIfSimpleCompletionPossible" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSIFSIMPLECOMPLETIONPOSSIBLE_TD, "CMmSupplServMessHandler::ProcessIfSimpleCompletionPossible" ); TBool ret( EFalse ); if ( EMobilePhoneSendNetworkServiceRequestNoFdnCheck == iIpc || @@ -4488,7 +4539,7 @@ TBool CMmSupplServMessHandler::ProcessSsGsmPasswordRegistration( const TPreprocessedSsServiceCompleteResponse& aResponse) { -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSSSGSMPASSWORDREGISTRATION, "CMmSupplServMessHandler::ProcessSsGsmPasswordRegistration" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSSSGSMPASSWORDREGISTRATION_TD, "CMmSupplServMessHandler::ProcessSsGsmPasswordRegistration" ); TFLOGSTRING("TSY:CMmSupplServMessHandler::ProcessSsGsmPasswordRegistration"); TBool ret( EFalse ); @@ -4511,7 +4562,7 @@ const TPreprocessedSsServiceCompleteResponse& aResponse) { TFLOGSTRING("TSY:CMmSupplServMessHandler::ProcessIfCallForwardingL"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSIFCALLFORWARDINGL, "CMmSupplServMessHandler::ProcessIfCallForwardingL" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSIFCALLFORWARDINGL_TD, "CMmSupplServMessHandler::ProcessIfCallForwardingL" ); TBool ret( EFalse ); // offset where the subblock starts TUint sbStartOffset( 0 ); @@ -4647,7 +4698,7 @@ const TPreprocessedSsServiceCompleteResponse& aResponse) { TFLOGSTRING("TSY:CMmSupplServMessHandler::ProcessIfCallBarringL"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSIFCALLBARRINGL, "CMmSupplServMessHandler::ProcessIfCallBarringL" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSIFCALLBARRINGL_TD, "CMmSupplServMessHandler::ProcessIfCallBarringL" ); TBool ret( EFalse ); // offset where the subblock starts TUint sbStartOffset( 0 ); @@ -4784,7 +4835,7 @@ const TPreprocessedSsServiceCompleteResponse& aResponse) { TFLOGSTRING("TSY:CMmSupplServMessHandler::ProcessIfCallWaitingL"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSIFCALLWAITINGL, "CMmSupplServMessHandler::ProcessIfCallWaitingL" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSIFCALLWAITINGL_TD, "CMmSupplServMessHandler::ProcessIfCallWaitingL" ); TBool ret( EFalse ); // offset where the subblock starts TUint sbStartOffset( 0 ); @@ -4927,7 +4978,7 @@ const TPreprocessedSsServiceCompleteResponse& aResponse) { TFLOGSTRING("TSY:CMmSupplServMessHandler::ProcessIfIdentityServices"); -OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSIFIDENTITYSERVICES, "CMmSupplServMessHandler::ProcessIfIdentityServices" ); +OstTrace0( TRACE_NORMAL, CMMSUPPLSERVMESSHANDLER_PROCESSIFIDENTITYSERVICES_TD, "CMmSupplServMessHandler::ProcessIfIdentityServices" ); TBool ret( EFalse ); // offset where the subblock starts TUint sbStartOffset( 0 ); @@ -4967,7 +5018,7 @@ sbStartOffset ) ) ) { TFLOGSTRING("TSY:CMmSupplServMessHandler::ProcessIfIdentityServices: KSsGsmGenericServiceInfo found"); -OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_PROCESSIFIDENTITYSERVICES, "CMmSupplServMessHandler::ProcessIfIdentityServices, KSsGsmGenericServiceInfo found" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMSUPPLSERVMESSHANDLER_PROCESSIFIDENTITYSERVICES_TD, "CMmSupplServMessHandler::ProcessIfIdentityServices, KSsGsmGenericServiceInfo found" ); clirInfoFound = ETrue; // get status TUint8 statusIsi = aResponse.iIsiMessage.Get8bit( diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmuiccmesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmuiccmesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmuiccmesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-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" @@ -15,8 +15,6 @@ * */ - - // INCLUDE FILES #include "cmmuiccmesshandler.h" #include "cmmphonetsender.h" @@ -24,6 +22,7 @@ #include "cmmmessagerouter.h" #include "cmmstaticutility.h" #include "cmmphonemesshandler.h" +#include "terminalprofile.h" // terminal profile #include #include @@ -47,7 +46,15 @@ const TUint8 KUiccSbApduLengthOffset( 6 ); const TUint8 KUiccSbApduDataOffset( 8 ); const TUint16 KUiccSbApduSize( SIZE_UICC_SB_APDU + KApduDataLength ); +// Truncated AID length +const TUint8 KTruncatedAidLength = 7; +// Truncated AID ( 3GPP USIM RID + app code ) +// RID 'A000000087' +// App code '1002' +_LIT8( KTruncatedAID, "\xA0\x00\x00\x00\x87\x10\x02" ); +const TUint8 KSizeOfTerminalProfileSb = 40; +const TInt KCardStatusFieldLength = 1; // ============================= LOCAL FUNCTIONS =============================== @@ -56,9 +63,28 @@ // Temporary for testing purposes, terminal profile sending will be moved // to SAT TSY TFLOGSTRING("TSY: CMmUiccMessHandler::SendTerminalProfile TEMPORARY SOLUTION FOR TESTING"); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_SENDTERMINALPROFILE, "CMmUiccMessHandler::SendTerminalProfile TEMPORARY SOLUTION FOR TESTING" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_SENDTERMINALPROFILE_TD, "CMmUiccMessHandler::SendTerminalProfile TEMPORARY SOLUTION FOR TESTING" ); + + + // Pointer to terminal profile buffer + const TUint8* terminalProfilePtr( NULL ); + // Size of terminal profile + TInt sizeofTerminalProfile( 0 ); - // Create UICC_CAT_TERMINAL_PROFILE message + if( UICC_CARD_TYPE_UICC == iCardType ) + { + terminalProfilePtr = &KTerminalProfileUicc[0]; + sizeofTerminalProfile = sizeof( KTerminalProfileUicc ); +TFLOGSTRING("TSY: CMmUiccMessHandler::SendTerminalProfile TEMPORARY SOLUTION FOR TESTING - Card type UICC"); + } + else // ICC type + { + terminalProfilePtr = &KTerminalProfileIcc[0]; + sizeofTerminalProfile = sizeof( KTerminalProfileIcc ); +TFLOGSTRING("TSY: CMmUiccMessHandler::SendTerminalProfile TEMPORARY SOLUTION FOR TESTING - Card type ICC"); + } + + // Create UICC_CAT_REQ message TIsiSend isiMsg( iPhoNetSender->SendBufferDes() ); isiMsg.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_UICC ); isiMsg.Set8bit( ISI_HEADER_SIZE, UICC_CAT_REQ_OFFSET_TRANSID ); // transaction id @@ -66,8 +92,8 @@ isiMsg.Set8bit( ISI_HEADER_SIZE + UICC_CAT_REQ_OFFSET_SERVICETYPE, UICC_CAT_TERMINAL_PROFILE ); isiMsg.Set8bit( ISI_HEADER_SIZE + UICC_CAT_REQ_OFFSET_NSB, 1 ); // num of subblocks - // Create subblock - TBuf8<30> terminalProfileBuf( 0 ); + // Create UICC_SB_TERMINAL_PROFILE subblock + TBuf8 terminalProfileBuf( 0 ); TIsiSubBlock uiccSbTerminalProfile( terminalProfileBuf, UICC_SB_TERMINAL_PROFILE, @@ -78,13 +104,15 @@ terminalProfileBuf.Append( KUiccPadding ); // Terminal profile length (16-bit) - terminalProfileBuf.Append( KUiccPadding ); - terminalProfileBuf.Append( 1 ); terminalProfileBuf.Append( 0 ); + terminalProfileBuf.Append( sizeofTerminalProfile ); + + // Terminal profile + terminalProfileBuf.Append( terminalProfilePtr, sizeofTerminalProfile ); // Append subblock to ISI message isiMsg.CopyData( - ISI_HEADER_SIZE + 4, + ISI_HEADER_SIZE + SIZE_UICC_CAT_REQ, uiccSbTerminalProfile.CompleteSubBlock() ); iPhoNetSender->Send( isiMsg.Complete() ); @@ -200,7 +228,7 @@ CMmPhoNetReceiver* aPhoNetReceiver) { TFLOGSTRING("TSY: CMmUiccMessHandler::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CONSTRUCTL, "CMmUiccMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CONSTRUCTL_TD, "CMmUiccMessHandler::ConstructL" ); // Reset the pointer array iMessHandlerPrtList.Reset(); @@ -226,6 +254,12 @@ // Initialized for USIM application iApplFileId.Append( 0x7F ); iApplFileId.Append( 0xFF ); + + TUiccParamsApduReq params; + params.messHandlerPtr = static_cast( this ); + params.trId = ETrIdGetCardStatus; + params.serviceType = UICC_CARD_STATUS_GET; + CreateUiccCardReq( params ); } // ----------------------------------------------------------------------------- @@ -239,7 +273,7 @@ CMmMessageRouter* aMessageRouter ) { TFLOGSTRING("TSY: CMmUiccMessHandler::NewL"); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_NEWL, "CMmUiccMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_NEWL_TD, "CMmUiccMessHandler::NewL" ); CMmUiccMessHandler* uiccMessHandler( new ( ELeave ) CMmUiccMessHandler() ); CleanupStack::PushL( uiccMessHandler ); @@ -257,7 +291,7 @@ CMmUiccMessHandler::~CMmUiccMessHandler() { TFLOGSTRING("TSY: CMmUiccMessHandler::~CMmUiccMessHandler"); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CMMUICCMESSHANDLER, "CMmUiccMessHandler::~CMmUiccMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CMMUICCMESSHANDLER_TD, "CMmUiccMessHandler::~CMmUiccMessHandler" ); } // ----------------------------------------------------------------------------- @@ -268,7 +302,7 @@ // void CMmUiccMessHandler::ReceiveMessageL( const TIsiReceiveC& aIsiMsg ) { - TInt status( KErrNone ); + TUint8 status( UICC_STATUS_FAIL ); TUint8 details ( UICC_NO_DETAILS ); TUint8 messageId( aIsiMsg.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); TUint8 trId( aIsiMsg.Get8bit( ISI_HEADER_OFFSET_TRANSID ) ); @@ -276,68 +310,83 @@ TPtrC8 fileData; TFLOGSTRING3("TSY: CMmUiccMessHandler::ReceiveMessageL, message ID :0x%x, transaction ID: %d", messageId, trId ); -OstTraceExt2( TRACE_NORMAL, CMMUICCMESSHANDLER_RECEIVEMESSAGEL, "CMmUiccMessHandler::ReceiveMessageL;messageId=%hhx;trId=%hhu", messageId, trId ); +OstTraceExt2( TRACE_NORMAL, CMMUICCMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmUiccMessHandler::ReceiveMessageL;messageId=%hhx;trId=%hhu", messageId, trId ); + MUiccOperationBase* messHandler( NULL ); // Get the correct message handler for this operation - MUiccOperationBase* messHandler( iMessHandlerPrtList.At( trId ) ); + if( trId < iMessHandlerPrtList.Count() ) + { + messHandler = iMessHandlerPrtList.At( trId ); + } switch( messageId ) { case UICC_CAT_IND: { +TFLOGSTRING("TSY: CMmUiccMessHandler::ReceiveMessageL:UICC_CAT_IND"); // Send terminal profile ( to be moved to SAT TSY later ) - SendTerminalProfile(); + serviceType = aIsiMsg.Get8bit( + ISI_HEADER_SIZE + UICC_CAT_IND_OFFSET_SERVICETYPE ); + if( UICC_READY == serviceType ) + { + SendTerminalProfile(); + } break; } case UICC_CAT_RESP: { // To be moved to SAT TSY later +TFLOGSTRING("TSY: CMmUiccMessHandler::ReceiveMessageL: UICC_CAT_RESP"); break; } case UICC_CARD_IND: { +TFLOGSTRING("TSY: CMmUiccMessHandler::ReceiveMessageL: UICC_CARD_IND"); serviceType = aIsiMsg.Get8bit( ISI_HEADER_SIZE + UICC_CARD_IND_OFFSET_SERVICETYPE ); // Start application activation procedure if the card is ready and // the application is not active yet - if ( UICC_CARD_READY == serviceType && + if (UICC_CARD_READY == serviceType && UICC_STATUS_APPL_ACTIVE != iApplicationStatus ) { TUiccParamsBase params; params.messHandlerPtr = static_cast( this ); params.trId = ETrIdGetUiccApplication; - CreateUiccApplicationReq( params, UICC_APPL_LIST ); + CreateUiccApplicationReq( params, UICC_APPL_LIST, iCardType ); } // No else. Application was active already break; } case UICC_RESP: { +TFLOGSTRING("TSY: CMmUiccMessHandler::ReceiveMessageL: UICC_RESP"); iUiccServerStatus = HandleUiccResp( aIsiMsg ); - // Start application activation procedure if the card is ready and - // the application is not active yet + // Start application activation procedure if UICC server is ready + // but appplication activations is not done by TSY if ( UICC_STATUS_START_UP_COMPLETED == iUiccServerStatus && - UICC_STATUS_APPL_ACTIVE != iApplicationStatus) + UICC_STATUS_APPL_ACTIVE != iApplicationStatus ) { // Read the application ID TUiccParamsBase params; params.messHandlerPtr = static_cast( this ); params.trId = ETrIdGetUiccApplication; - CreateUiccApplicationReq( params, UICC_APPL_LIST ); + //CreateUiccApplicationReq( params, UICC_APPL_LIST, iCardType ); } break; } case UICC_APPLICATION_RESP: { - status = HandleUiccApplicationResp( aIsiMsg ); + status = aIsiMsg.Get8bit( + ISI_HEADER_SIZE + UICC_APPLICATION_RESP_OFFSET_STATUS ); + HandleUiccApplicationResp( aIsiMsg ); break; } case UICC_APPLICATION_IND: { +TFLOGSTRING("TSY: CMmUiccMessHandler::ReceiveMessageL: UICC_APPLICATION_IND"); TInt8 serviceType( aIsiMsg.Get8bit( ISI_HEADER_SIZE + UICC_APPLICATION_IND_OFFSET_SERVICETYPE ) ); - iApplicationStatus = UICC_STATUS_APPL_ACTIVE; // Application activation indication with service type // UICC_APPL_ACTIVATED, as part of PowerOnSim sequence. // Transaction id is set to ETrIdSimPowerOn and operation @@ -345,7 +394,7 @@ if( UICC_APPL_ACTIVATED == serviceType ) { iDoNotRemoveTransactionID = EFalse; - status = KErrNone; + status = UICC_STATUS_OK; trId = ETrIdSimPowerOn; messHandler = iMessHandlerPrtList.At( trId ); } @@ -353,31 +402,33 @@ } case UICC_APPL_CMD_RESP: { +TFLOGSTRING("TSY: CMmUiccMessHandler::ReceiveMessageL: UICC_APPL_CMD_RESP"); status = aIsiMsg.Get8bit( - ISI_HEADER_SIZE + UICC_APPL_CMD_RESP_OFFSET_STATUS ); - + ISI_HEADER_SIZE + UICC_APPL_CMD_RESP_OFFSET_STATUS ); + details = aIsiMsg.Get8bit( ISI_HEADER_SIZE + UICC_APPL_CMD_RESP_OFFSET_DETAILS ); - TInt8 serviceType( aIsiMsg.Get8bit( + TUint8 serviceType( aIsiMsg.Get8bit( ISI_HEADER_SIZE + UICC_APPL_CMD_RESP_OFFSET_SERVICETYPE ) ); if ( UICC_STATUS_OK == status ) { // If READ operation was required, read data from subblock if ( UICC_APPL_READ_TRANSPARENT == serviceType || - UICC_APPL_READ_LINEAR_FIXED == serviceType ) + UICC_APPL_READ_LINEAR_FIXED == serviceType ) { fileData.Set( GetFileData( aIsiMsg ) ); } - if ( UICC_APPL_FILE_INFO == serviceType ) + else if ( UICC_APPL_FILE_INFO == serviceType ) { fileData.Set( GetFileFCI( aIsiMsg ) ); } - if ( UICC_APPL_APDU_SEND == serviceType ) + else if ( UICC_APPL_APDU_SEND == serviceType ) { fileData.Set( GetApduData( aIsiMsg ) ); } + // No else } else { @@ -388,9 +439,10 @@ } case UICC_APDU_RESP: { +TFLOGSTRING("TSY: CMmUiccMessHandler::ReceiveMessageL: UICC_APDU_RESP"); status = aIsiMsg.Get8bit( ISI_HEADER_SIZE + UICC_APDU_RESP_OFFSET_STATUS ); - TInt8 serviceType( aIsiMsg.Get8bit( + TUint8 serviceType( aIsiMsg.Get8bit( ISI_HEADER_SIZE + UICC_APDU_RESP_OFFSET_SERVICETYPE ) ); // Extract actual APDU from SB_APDU @@ -406,7 +458,8 @@ } case UICC_APDU_RESET_IND: { - TInt8 serviceType( aIsiMsg.Get8bit( +TFLOGSTRING("TSY: CMmUiccMessHandler::ReceiveMessageL: UICC_APDU_RESET_IND"); + TUint8 serviceType( aIsiMsg.Get8bit( ISI_HEADER_SIZE + UICC_APDU_RESET_IND_OFFSET_SERVICETYPE ) ); // Indication that SAP APDU interface is activated @@ -420,23 +473,31 @@ } case UICC_CONNECTOR_RESP: { +TFLOGSTRING("TSY: CMmUiccMessHandler::ReceiveMessageL: UICC_CONNECTOR_RESP"); status = aIsiMsg.Get8bit( ISI_HEADER_SIZE + UICC_CONNECTOR_RESP_OFFSET_STATUS ); + break; } - break; case UICC_CARD_RESP: { +TFLOGSTRING("TSY: CMmUiccMessHandler::ReceiveMessageL: UICC_CARD_RESP"); status = aIsiMsg.Get8bit( ISI_HEADER_SIZE + UICC_CARD_RESP_OFFSET_STATUS ); TUint8 serviceType( aIsiMsg.Get8bit( ISI_HEADER_SIZE + UICC_CARD_RESP_OFFSET_SERVICETYPE ) ); + iCardType = aIsiMsg.Get8bit( + ISI_HEADER_SIZE + UICC_CARD_RESP_OFFSET_CARDTYPE ); +TFLOGSTRING2("TSY: CMmUiccMessHandler::ReceiveMessageL: UICC_CARD_RESP iCardType = %d", iCardType ); + if( UICC_STATUS_OK == status && UICC_CARD_STATUS_GET == serviceType ) { + UiccCardRespStatus( aIsiMsg ); + } // File data from SIZE_UICC_SB_CARD_STATUS TUint uiccSbFileDataOffset( 0 ); - TInt cardStatusFieldLength( 1 ); + if ( KErrNone == aIsiMsg.FindSubBlockOffsetById( ISI_HEADER_SIZE + SIZE_UICC_CARD_RESP, @@ -447,15 +508,15 @@ fileData.Set(aIsiMsg.GetData( uiccSbFileDataOffset + UICC_SB_CARD_STATUS_OFFSET_CARDSTATUS, - cardStatusFieldLength) ); + KCardStatusFieldLength ) ); } - } + + break; } - break; default: { TFLOGSTRING("TSY: CMmUiccMessHandler::ReceiveMessageL, default" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMUICCMESSHANDLER_RECEIVEMESSAGEL, "CMmUiccMessHandler::ReceiveMessageL, default" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMUICCMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmUiccMessHandler::ReceiveMessageL, default" ); break; } } @@ -471,7 +532,7 @@ else { TFLOGSTRING("TSY: CMmUiccMessHandler::ReceiveMessageL, message handler not found -> no further handling of this message" ); -OstTrace0( TRACE_NORMAL, DUP3_CMMUICCMESSHANDLER_RECEIVEMESSAGEL, "CMmUiccMessHandler::ReceiveMessageL, message handler not found -> no further handling of this message" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMUICCMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmUiccMessHandler::ReceiveMessageL, message handler not found -> no further handling of this message" ); } } @@ -491,7 +552,7 @@ TUint8 sizeOfApplPathSubblock( 0 ); TFLOGSTRING2("TSY: CMmUiccMessHandler::CreateUiccApplCmdReq, transaction ID: %d", trId ); -OstTrace1( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCAPPLCMDREQ, "CMmUiccMessHandler::CreateUiccApplCmdReq;trId=%d", trId ); +OstTrace1( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCAPPLCMDREQ_TD, "CMmUiccMessHandler::CreateUiccApplCmdReq;trId=%d", trId ); TUint8 applId( aApplType == UICC_APPL_TYPE_UICC_ISIM ? iIsimApplicationId : iApplicationId ); @@ -641,7 +702,8 @@ KUiccApplCmdReqOffset + SIZE_UICC_SB_CLIENT, sizeOfApplPathSubblock ); // Create and append UICC_SB_APDU - const TUiccSendApdu* tmpPtr = static_cast( &aParams ); + const TUiccSendApdu* tmpPtr = + static_cast( &aParams ); CreateUiccSbApdu( isiMsg, KUiccApplCmdReqOffset + SIZE_UICC_SB_CLIENT + @@ -653,7 +715,7 @@ { ret = KErrArgument; TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccApplCmdReq, unknown service type!" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMUICCMESSHANDLER_CREATEUICCAPPLCMDREQ, "CMmUiccMessHandler::CreateUiccApplCmdReq, unknown service type!" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMUICCMESSHANDLER_CREATEUICCAPPLCMDREQ_TD, "CMmUiccMessHandler::CreateUiccApplCmdReq, unknown service type!" ); break; } } // End of switch ( serviceType ) @@ -670,7 +732,7 @@ else { TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccApplCmdReq, cannot handle the request, server busy!" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_CREATEUICCAPPLCMDREQ, "CMmUiccMessHandler::CreateUiccApplCmdReq, cannot handle the request, server busy!" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_CREATEUICCAPPLCMDREQ_TD, "CMmUiccMessHandler::CreateUiccApplCmdReq, cannot handle the request, server busy!" ); ret = KErrServerBusy; } return ret; @@ -687,7 +749,7 @@ TUint8 aApplType ) { TFLOGSTRING2("TSY: CMmUiccMessHandler::CreateUiccApplicationReq, service type: %d", aServiceType ); -OstTraceExt1( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCAPPLICATIONREQ, "CMmUiccMessHandler::CreateUiccApplicationReq;aServiceType=%hhu", aServiceType ); +OstTraceExt1( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCAPPLICATIONREQ_TD, "CMmUiccMessHandler::CreateUiccApplicationReq;aServiceType=%hhu", aServiceType ); TInt ret (KErrGeneral); TUiccTrId trId( aParams.trId ); @@ -710,7 +772,7 @@ isiMsg.Set8bit( ISI_HEADER_SIZE + UICC_APPLICATION_REQ_OFFSET_SERVICETYPE, aServiceType ); - + switch ( aServiceType ) { case UICC_APPL_LIST: @@ -720,11 +782,32 @@ } case UICC_APPL_HOST_ACTIVATE: { - numOfSubblocks = 1; + CreateUiccSbApplInfo( + isiMsg, + ISI_HEADER_SIZE + SIZE_UICC_APPLICATION_REQ ); CreateUiccSbApplication( isiMsg, - ISI_HEADER_SIZE + SIZE_UICC_APPLICATION_REQ, + ISI_HEADER_SIZE + SIZE_UICC_APPLICATION_REQ + + SIZE_UICC_SB_APPL_INFO, aApplType ); + + if ( UICC_APPL_LAST == iApplicationId ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccApplicationReq - need to add UICC_SB_AID subblock" ); + + CreateUiccSbAid( + isiMsg, + ISI_HEADER_SIZE + + SIZE_UICC_APPLICATION_REQ + + SIZE_UICC_SB_APPL_INFO + + SIZE_UICC_SB_APPLICATION ); + + numOfSubblocks = 3; + } + else + { + numOfSubblocks = 2; + } break; } default: @@ -745,7 +828,7 @@ else { TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccApplicationReq, cannot handle the request, server busy!" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_CREATEUICCAPPLICATIONREQ, "CMmUiccMessHandler::CreateUiccApplicationReq, cannot handle the request, server busy!" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_CREATEUICCAPPLICATIONREQ_TD, "CMmUiccMessHandler::CreateUiccApplicationReq, cannot handle the request, server busy!" ); ret = KErrServerBusy; } return ret; @@ -759,7 +842,7 @@ TUint8 CMmUiccMessHandler::GetApplicationId() const { TFLOGSTRING2("TSY: CMmUiccMessHandler::GetApplicationId, application ID: %d", iApplicationId ); -OstTraceExt1( TRACE_NORMAL, CMMUICCMESSHANDLER_GETAPPLICATIONID, "CMmUiccMessHandler::GetApplicationId;aApplId=%hhu", iApplicationId ); +OstTraceExt1( TRACE_NORMAL, CMMUICCMESSHANDLER_GETAPPLICATIONID_TD, "CMmUiccMessHandler::GetApplicationId;aApplId=%hhu", iApplicationId ); return iApplicationId; } @@ -771,7 +854,7 @@ TUint8 CMmUiccMessHandler::GetApplicationType() const { TFLOGSTRING2("TSY: CMmUiccMessHandler::GetApplicationType, application type: %d", iApplicationType ); -OstTraceExt1( TRACE_NORMAL, CMMUICCMESSHANDLER_GETAPPLICATIONTYPE, "CMmUiccMessHandler::GetApplicationType;aApplType=%hhu", iApplicationType ); +OstTraceExt1( TRACE_NORMAL, CMMUICCMESSHANDLER_GETAPPLICATIONTYPE_TD, "CMmUiccMessHandler::GetApplicationType;aApplType=%hhu", iApplicationType ); return iApplicationType; } @@ -783,7 +866,7 @@ const TDesC8& CMmUiccMessHandler::GetApplicationFileId() const { TFLOGSTRING("TSY: CMmUiccMessHandler::GetApplicationFileId" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETAPPLICATIONFILEID, "CMmUiccMessHandler::GetApplicationFileId" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETAPPLICATIONFILEID_TD, "CMmUiccMessHandler::GetApplicationFileId" ); return iApplFileId; } @@ -795,7 +878,7 @@ TUint8 CMmUiccMessHandler::GetCardType() const { TFLOGSTRING("TSY: CMmUiccMessHandler::GetCardType" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETCARDTYPE, "CMmUiccMessHandler::GetCardType" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETCARDTYPE_TD, "CMmUiccMessHandler::GetCardType" ); return iCardType; } @@ -807,7 +890,7 @@ TUint8 CMmUiccMessHandler::GetIsimApplicationStatus() const { TFLOGSTRING("TSY: CMmUiccMessHandler::GetIsimApplicationStatus" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETISIMAPPLICATIONSTATUS, "CMmUiccMessHandler::GetIsimApplicationStatus" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETISIMAPPLICATIONSTATUS_TD, "CMmUiccMessHandler::GetIsimApplicationStatus" ); return iIsimApplicationStatus; } @@ -819,7 +902,7 @@ TBool CMmUiccMessHandler::IsIsimApplicationFound() const { TFLOGSTRING("TSY: CMmUiccMessHandler::IsIsimApplicationFound" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_ISISIMAPPLICATIONFOUND, "CMmUiccMessHandler::IsIsimApplicationFound" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_ISISIMAPPLICATIONFOUND_TD, "CMmUiccMessHandler::IsIsimApplicationFound" ); return iIsimApplicationFound; } @@ -831,7 +914,7 @@ const RMobilePhone::TAID& CMmUiccMessHandler::GetAid() const { TFLOGSTRING("TSY: CMmUiccMessHandler::GetAid" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_GETAPPLICATIONFILEID, "CMmUiccMessHandler::GetApplicationFileId" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_GETAPPLICATIONFILEID_TD, "CMmUiccMessHandler::GetApplicationFileId" ); return iAid; } // ----------------------------------------------------------------------------- @@ -846,7 +929,7 @@ TUint8& aSizeOfSubblock ) { TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccSbApplPath" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCSBAPPLPATH, "CMmUiccMessHandler::CreateUiccSbApplPath" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCSBAPPLPATH_TD, "CMmUiccMessHandler::CreateUiccSbApplPath" ); // UICC_SB_APPL_PATH subblock TBuf8 uiccSbApplPathBuf( 0 ); @@ -885,7 +968,7 @@ const TUint8 aApplType ) { TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccSbClient" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCSBCLIENT, "CMmUiccMessHandler::CreateUiccSbClient" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCSBCLIENT_TD, "CMmUiccMessHandler::CreateUiccSbClient" ); // UICC_SB_CLIENT subblock TBuf8 uiccSbClientBuf( 0 ); @@ -919,7 +1002,7 @@ else { TFLOGSTRING2("TSY: CMmUiccMessHandler::CreateUiccSbClient: unknown appl type: 0x%x", aApplType ); -OstTrace1( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_CREATEUICCSBCLIENT, "CMmUiccMessHandler::CreateUiccSbClient: unknown appl type: 0x%x", aApplType ); +OstTrace1( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_CREATEUICCSBCLIENT_TD, "CMmUiccMessHandler::CreateUiccSbClient: unknown appl type: 0x%x", aApplType ); } } @@ -934,7 +1017,7 @@ TUint8 aMsgOffset ) { TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccSbTransparent" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCSBTRANSPARENT, "CMmUiccMessHandler::CreateUiccSbTransparent" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCSBTRANSPARENT_TD, "CMmUiccMessHandler::CreateUiccSbTransparent" ); // UICC_SB_TRANSPARENT subblock TBuf8 uiccSbTransparentBuf( 0 ); @@ -967,7 +1050,7 @@ TUint8 aMsgOffset ) { TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccSbLinearFixed" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCSBLINEARFIXED, "CMmUiccMessHandler::CreateUiccSbLinearFixed" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCSBLINEARFIXED_TD, "CMmUiccMessHandler::CreateUiccSbLinearFixed" ); // UICC_SB_LINEAR_FIXED subblock TBuf8 uiccSbLinearFixedBuf( 0 ); @@ -999,7 +1082,7 @@ ) { TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccSbFileData" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCSBFILEDATA, "CMmUiccMessHandler::CreateUiccSbFileData" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCSBFILEDATA_TD, "CMmUiccMessHandler::CreateUiccSbFileData" ); // UICC_SB_FILE_DATA subblock TBuf8 uiccSbFileDataBuf( 0 ); @@ -1033,7 +1116,7 @@ TUint8 aApplType ) { TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccSbApplication" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCSBAPPLICATION, "CMmUiccMessHandler::CreateUiccSbApplication" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCSBAPPLICATION_TD, "CMmUiccMessHandler::CreateUiccSbApplication" ); // SIZE_UICC_SB_APPLICATION_STR TBuf8 uiccSbApplicationBuf( 0 ); @@ -1072,10 +1155,63 @@ else { TFLOGSTRING2("TSY: CMmUiccMessHandler::CreateUiccSbApplication: unknown application type: 0x%x", aApplType ); -OstTrace1( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_CREATEUICCSBAPPLICATION, "CMmUiccMessHandler::CreateUiccSbApplication: unknown application type: 0x%x", aApplType ); +OstTrace1( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_CREATEUICCSBAPPLICATION_TD, "CMmUiccMessHandler::CreateUiccSbApplication: unknown application type: 0x%x", aApplType ); } } + +// ----------------------------------------------------------------------------- +// CMmUiccMessHandler::CreateUiccSbApplInfo +// (other items were commented in a header). +// ----------------------------------------------------------------------------- +// +void CMmUiccMessHandler::CreateUiccSbApplInfo( + TIsiSend& aIsiMsg, + TUint8 aMsgOffset ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccSbApplInfo" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCSBAPPLINFO_TD, "CMmUiccMessHandler::CreateUiccSbApplInfo" ); + + TBuf8 uiccSbApplInfoBuf( 0 ); + TIsiSubBlock uiccSbApplInfo( + uiccSbApplInfoBuf, + UICC_SB_APPL_INFO, + EIsiSubBlockTypeId16Len16 ); + + uiccSbApplInfoBuf.Append( KUiccPadding ); + uiccSbApplInfoBuf.Append( KUiccPadding ); + uiccSbApplInfoBuf.Append( KUiccPadding ); + + uiccSbApplInfoBuf.Append( UICC_APPL_START_UP_NO_INIT_PROC ); + + aIsiMsg.CopyData( aMsgOffset, uiccSbApplInfo.CompleteSubBlock() ); + } + +// ----------------------------------------------------------------------------- +// CMmUiccMessHandler::CreateUiccSbAid +// (other items were commented in a header). +// ----------------------------------------------------------------------------- +// +void CMmUiccMessHandler::CreateUiccSbAid( + TIsiSend& aIsiMsg, + TUint8 aMsgOffset ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccSbAid" ); + + TBuf8 uiccSbAidBuf( 0 ); + TIsiSubBlock uiccSbAid( + uiccSbAidBuf, + UICC_SB_AID, + EIsiSubBlockTypeId16Len16 ); + + // Add truncated AID length + uiccSbAidBuf.Append( KTruncatedAidLength ); + // Add 3GPP USIM RID and app code + uiccSbAidBuf.Append( KTruncatedAID ); + + aIsiMsg.CopyData( aMsgOffset, uiccSbAid.CompleteSubBlock() ); + } + // ----------------------------------------------------------------------------- // CMmUiccMessHandler::GetFileData // (other items were commented in a header). @@ -1084,7 +1220,7 @@ const TPtrC8 CMmUiccMessHandler::GetFileData( const TIsiReceiveC& aIsiMsg ) { TFLOGSTRING("TSY: CMmUiccMessHandler::GetFileData" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETFILEDATA, "CMmUiccMessHandler::GetFileData" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETFILEDATA_TD, "CMmUiccMessHandler::GetFileData" ); TPtrC8 data( KNullDesC8 ); @@ -1113,7 +1249,7 @@ TUint8 CMmUiccMessHandler::HandleUiccResp( const TIsiReceiveC& aIsiMsg ) { TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccResp" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_HANDLEUICCRESP, "CMmUiccMessHandler::HandleUiccResp" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_HANDLEUICCRESP_TD, "CMmUiccMessHandler::HandleUiccResp" ); TUint8 serverStatus( UICC_STATUS_NOT_READY ); // Check the service type @@ -1134,6 +1270,282 @@ return serverStatus; } + + +// ----------------------------------------------------------------------------- +// CMmUiccMessHandler::HandleUiccApplListResp +// (other items were commented in a header). +// ----------------------------------------------------------------------------- +// +TInt CMmUiccMessHandler::HandleUiccApplListResp( + const TIsiReceiveC& aIsiMsg ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplListResp" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_HANDLEUICCAPPLLISTRESP, "CMmUiccMessHandler::HandleUiccApplListResp" ); + + TInt ret( KErrNone ); + TUint16 startIndex( ISI_HEADER_SIZE + SIZE_UICC_APPLICATION_RESP ); + + // Check if UICC_SB_APPL_DATA_OBJECT is included => UICC application + TUint uiccSbApplDataObjectOffset( 0 ); + TUint8 applicationType( 0 ); + TUint16 sbLen( 0 ); + + TBool usimOrSimApplFound( EFalse ); + + while ( KErrNone == aIsiMsg.FindSubBlockOffsetById( + startIndex, + UICC_SB_APPL_DATA_OBJECT, + EIsiSubBlockTypeId16Len16, + uiccSbApplDataObjectOffset ) ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplListResp-UICC_APPL_LIST FIND_SB" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_HANDLEUICCAPPLLISTRESP, "CMmUiccMessHandler::HandleUiccApplListResp - UICC_APPL_LIST FIND_SB" ); + applicationType = aIsiMsg.Get8bit( + uiccSbApplDataObjectOffset + + UICC_SB_APPL_DATA_OBJECT_OFFSET_APPLICATIONTYPE ); + + sbLen = aIsiMsg.Get16bit( + uiccSbApplDataObjectOffset + + UICC_SB_APPL_DATA_OBJECT_OFFSET_SBLEN ); + + if ( ( UICC_APPL_TYPE_UICC_USIM == applicationType || + UICC_APPL_TYPE_ICC_SIM == applicationType ) && + EFalse == usimOrSimApplFound ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplListResp-UICC_APPL_LIST FOUND_U/SIM" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMUICCMESSHANDLER_HANDLEUICCAPPLLISTRESP, "CMmUiccMessHandler::HandleUiccApplListResp - UICC_APPL_LIST FOUND_U/SIM" ); + + iApplicationType = applicationType; + + iApplicationId = aIsiMsg.Get8bit( + uiccSbApplDataObjectOffset + + UICC_SB_APPL_DATA_OBJECT_OFFSET_APPLID ); + + TUint8 length( aIsiMsg.Get8bit( + uiccSbApplDataObjectOffset + + UICC_SB_APPL_DATA_OBJECT_OFFSET_APPLDOLEN ) ); + + // Application data object contains EFdir data, + // 5 bytes are mandatory. See TS 102.221 V7.11.0 table 13.2 + if ( 5 <= length ) + { + TPtrC8 applDataObject( aIsiMsg.GetData( + uiccSbApplDataObjectOffset + + UICC_SB_APPL_DATA_OBJECT_OFFSET_APPLDO, + length ) ); + // Length of AID is located in index 3 + TUint8 aidLength( applDataObject[3] ); + // Copy actual AID + iAid.Copy( applDataObject.Mid( 4, aidLength ) ); + } + + usimOrSimApplFound = ETrue; + } + else if( UICC_APPL_TYPE_UICC_ISIM == applicationType && + EFalse == iIsimApplicationFound ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplListResp-UICC_APPL_LIST FOUND_ISIM" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMUICCMESSHANDLER_HANDLEUICCAPPLLISTRESP, "CMmUiccMessHandler::HandleUiccApplListResp - UICC_APPL_LIST FOUND_ISIM" ); + iIsimApplicationFound = ETrue; + + iIsimApplicationId = aIsiMsg.Get8bit( + uiccSbApplDataObjectOffset + + UICC_SB_APPL_DATA_OBJECT_OFFSET_APPLID ); + iIsimApplicationStatus = aIsiMsg.Get8bit( + uiccSbApplDataObjectOffset + + UICC_SB_APPL_DATA_OBJECT_OFFSET_APPLSTATUS ); + } + startIndex = uiccSbApplDataObjectOffset + sbLen; + } + + if ( !usimOrSimApplFound && + UICC_CARD_TYPE_UICC == iCardType ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplListResp-UICC_APPL_LIST, NO SUBBLOCK - handle USIM" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMUICCMESSHANDLER_HANDLEUICCAPPLLISTRESP, "CMmUiccMessHandler::HandleUiccApplListResp - UICC_APPL_LIST, NO SUBBLOCK - handle USIM" ); + applicationType = UICC_APPL_TYPE_UICC_USIM; + iApplicationType = applicationType; + iApplicationId = UICC_APPL_LAST; + } + else if ( !usimOrSimApplFound && + UICC_CARD_TYPE_ICC == iCardType ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplListResp-UICC_APPL_LIST, NO SUBBLOCK - handle SIM" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMUICCMESSHANDLER_HANDLEUICCAPPLLISTRESP, "CMmUiccMessHandler::HandleUiccApplListResp - UICC_APPL_LIST, NO SUBBLOCK - handle SIM" ); + applicationType = UICC_APPL_TYPE_ICC_SIM; + iApplicationType = applicationType; + iApplicationId = UICC_APPL_ID_UNKNOWN; + } + // No else + + if ( UICC_CARD_TYPE_ICC == iCardType ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplListResp-UICC_APPL_LIST FOUND_SIM" ); +OstTrace0( TRACE_NORMAL, DUP6_CMMUICCMESSHANDLER_HANDLEUICCAPPLLISTRESP, "CMmUiccMessHandler::HandleUiccApplListResp - UICC_APPL_LIST FOUND_SIM" ); + + // Application file ID for GSM + TBuf8<2> gsmFileId; + gsmFileId.Append( 0x7F ); + gsmFileId.Append( 0x20 ); + iApplFileId.Copy( gsmFileId ); + } + + // Activate the application + TUiccParamsBase params; + params.messHandlerPtr = static_cast( this ); + params.trId = ETrIdActivateUiccApplication; +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplListResp-UICC_APPL_LIST HOST_ACTI" ); +OstTrace0( TRACE_NORMAL, DUP7_CMMUICCMESSHANDLER_HANDLEUICCAPPLLISTRESP, "CMmUiccMessHandler::HandleUiccApplListResp - UICC_APPL_LIST HOST_ACTI" ); + + ret = CreateUiccApplicationReq( + params, + UICC_APPL_HOST_ACTIVATE, + iApplicationType ); + + return ret; + } + + + + + + + +// ----------------------------------------------------------------------------- +// CMmUiccMessHandler::HandleUiccApplHostActivate +// (other items were commented in a header). +// ----------------------------------------------------------------------------- +// +TInt CMmUiccMessHandler::HandleUiccApplHostActivate( const TIsiReceiveC& aIsiMsg ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplHostActivate" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_HANDLEUICCAPPLHOSTACTIVATE, "CMmUiccMessHandler::HandleUiccApplHostActivate" ); + + TInt ret( KErrNone ); + TUint16 startIndex( ISI_HEADER_SIZE + SIZE_UICC_APPLICATION_RESP ); + TUint8 trId( aIsiMsg.Get8bit( + ISI_HEADER_SIZE + UICC_APPLICATION_RESP_OFFSET_TRANSID ) ); + +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplicationResp-HOST_ACTI" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_HANDLEUICCAPPLHOSTACTIVATE, "CMmUiccMessHandler::HandleUiccApplHostActivate - HOST_ACTI" ); + + TUint uiccSbClientOffset( 0 ); + if ( KErrNone == aIsiMsg.FindSubBlockOffsetById( + startIndex, + UICC_SB_CLIENT, + EIsiSubBlockTypeId16Len16, + uiccSbClientOffset ) ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplHostActivate - UICC_SB_CLIENT" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMUICCMESSHANDLER_HANDLEUICCAPPLHOSTACTIVATE, "CMmUiccMessHandler::HandleUiccApplHostActivate - UICC_SB_CLIENT" ); + if( ETrIdActivateUiccApplication == trId ) + { + iUiccClientId = aIsiMsg.Get8bit( + uiccSbClientOffset + + UICC_SB_CLIENT_OFFSET_CLIENTID ); + } + else if( ETrIdActivateIsimApplication == trId ) + { + iUiccIsimClientId = aIsiMsg.Get8bit( + uiccSbClientOffset + + UICC_SB_CLIENT_OFFSET_CLIENTID ); + } + } + + // UICC_SB_FCI contains PIN key references + TUint uiccSbFciOffset( 0 ); + if ( KErrNone == aIsiMsg.FindSubBlockOffsetById( + ISI_HEADER_SIZE + SIZE_UICC_APPLICATION_RESP, + UICC_SB_FCI, + EIsiSubBlockTypeId16Len16, + uiccSbFciOffset ) ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplHostActivate - UICC_SB_FCI" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMUICCMESSHANDLER_HANDLEUICCAPPLHOSTACTIVATE, "CMmUiccMessHandler::HandleUiccApplHostActivate - UICC_SB_FCI" ); + + // Check is the SIM UICC + TPtrC8 data( KNullDesC8 ); + + // The whole sub block is returned + TInt sbLength( aIsiMsg.Get16bit( + uiccSbFciOffset + UICC_SB_FCI_OFFSET_SBLEN ) ); + data.Set( aIsiMsg.GetData( + uiccSbFciOffset, + sbLength ) ); + + TFci fci( data ); + if( UICC_CARD_TYPE_UICC == fci.GetTypeOfCard() ) + { + StorePinKeyReferences( data ); + } + } + + // In case of ICC there is two UICC_SB_CHV subblocks + // that contain PIN IDs for ICC application + TUint uiccSbChvOffset( 0 ); + while ( KErrNone == aIsiMsg.FindSubBlockOffsetById( + startIndex, + UICC_SB_CHV, + EIsiSubBlockTypeId16Len16, + uiccSbChvOffset ) ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplHostActivate - UICC_SB_CHV" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMUICCMESSHANDLER_HANDLEUICCAPPLHOSTACTIVATE, "CMmUiccMessHandler::HandleUiccApplHostActivate - UICC_SB_CHV" ); + + TUint8 chvQualifier( aIsiMsg.Get8bit( + uiccSbChvOffset + + UICC_SB_CHV_OFFSET_CHVQUALIFIER ) ); + if ( UICC_CHV1 == chvQualifier ) // PIN1 + { + iPin1Id = aIsiMsg.Get8bit( + uiccSbChvOffset + UICC_SB_CHV_OFFSET_PINID ); + } + else // PIN2 + { + iPin2Id = aIsiMsg.Get8bit( + uiccSbChvOffset + UICC_SB_CHV_OFFSET_PINID ); + } + startIndex = uiccSbChvOffset + SIZE_UICC_SB_CHV; + } + + // In case EFdir was empty or didn't exist in APPL_LIST + // response, HOST_ACTIVATE request is done differently. + // Response for HOST_ACTIVATE include UICC_SB_APPLICATION + // subblock. + TUint uiccSbApplicationOffset( 0 ); + if ( KErrNone == aIsiMsg.FindSubBlockOffsetById( + ISI_HEADER_SIZE + SIZE_UICC_APPLICATION_RESP, + UICC_SB_APPLICATION, + EIsiSubBlockTypeId16Len16, + uiccSbApplicationOffset ) ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplHostActivate - UICC_SB_APPLICATION" ); +OstTrace0( TRACE_NORMAL, DUP5_CMMUICCMESSHANDLER_HANDLEUICCAPPLHOSTACTIVATE, "CMmUiccMessHandler::HandleUiccApplHostActivate - UICC_SB_APPLICATION" ); + + // Update AID + iAid.Copy( KTruncatedAID ); + + // Update Application type + iApplicationType = aIsiMsg.Get8bit( + uiccSbApplicationOffset + + UICC_SB_APPLICATION_OFFSET_APPLICATIONTYPE ); + + // Update Appl ID + iApplicationId = aIsiMsg.Get8bit( + uiccSbApplicationOffset + + UICC_SB_APPLICATION_OFFSET_APPLID ); + } + + // Application is now ready to start receiving commands + iApplicationStatus = UICC_STATUS_APPL_ACTIVE; + InitializeSimServiceTableCache(); + InitializeCphsInformationCache(); + + return ret; + } + + // ----------------------------------------------------------------------------- // CMmUiccMessHandler::HandleUiccApplicationResp // (other items were commented in a header). @@ -1143,7 +1555,7 @@ const TIsiReceiveC& aIsiMsg ) { TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplicationResp" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_HANDLEUICCAPPLICATIONRESP, "CMmUiccMessHandler::HandleUiccApplicationResp" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_HANDLEUICCAPPLICATIONRESP_TD, "CMmUiccMessHandler::HandleUiccApplicationResp" ); TInt ret( KErrNone ); // Get service type and status @@ -1155,7 +1567,6 @@ ISI_HEADER_SIZE + UICC_APPLICATION_RESP_OFFSET_CARDTYPE ); TUint8 trId( aIsiMsg.Get8bit( ISI_HEADER_SIZE + UICC_APPLICATION_RESP_OFFSET_TRANSID ) ); - TUint16 startIndex( ISI_HEADER_SIZE + SIZE_UICC_APPLICATION_RESP ); if ( UICC_STATUS_OK == status ) { @@ -1163,168 +1574,17 @@ { case UICC_APPL_LIST: { - // Check if UICC_SB_APPL_DATA_OBJECT is included => UICC application - TUint uiccSbApplDataObjectOffset( 0 ); - TUint8 applicationType( 0 ); - TUint16 sbLen( 0 ); - - TBool usimApplFound( EFalse ); - - while ( KErrNone == aIsiMsg.FindSubBlockOffsetById( - startIndex, - UICC_SB_APPL_DATA_OBJECT, - EIsiSubBlockTypeId16Len16, - uiccSbApplDataObjectOffset ) ) - { - applicationType = aIsiMsg.Get8bit( - uiccSbApplDataObjectOffset + - UICC_SB_APPL_DATA_OBJECT_OFFSET_APPLICATIONTYPE ); - - sbLen = aIsiMsg.Get16bit( - uiccSbApplDataObjectOffset + - UICC_SB_APPL_DATA_OBJECT_OFFSET_SBLEN ); - - if ( UICC_APPL_TYPE_UICC_USIM == applicationType && - EFalse == usimApplFound ) - { - iApplicationType = applicationType; - - iApplicationId = aIsiMsg.Get8bit( - uiccSbApplDataObjectOffset + - UICC_SB_APPL_DATA_OBJECT_OFFSET_APPLID ); - iApplicationStatus = aIsiMsg.Get8bit( - uiccSbApplDataObjectOffset + - UICC_SB_APPL_DATA_OBJECT_OFFSET_APPLSTATUS ); - - TUint8 length( aIsiMsg.Get8bit( - uiccSbApplDataObjectOffset + - UICC_SB_APPL_DATA_OBJECT_OFFSET_APPLDOLEN ) ); - - // Application data object contains EF dir data, - // 5 bytes are mandatory. See TS 102.221 V7.11.0 table 13.2 - if ( 5 <= length ) - { - TPtrC8 applDataObject( aIsiMsg.GetData( - uiccSbApplDataObjectOffset + - UICC_SB_APPL_DATA_OBJECT_OFFSET_APPLDO, - length ) ); - // Length of AID is located in index 3 - TUint8 aidLength( applDataObject[3] ); - // Copy actual AID - iAid.Copy( applDataObject.Mid( 4, aidLength ) ); - } - - usimApplFound = ETrue; - } - else if( UICC_APPL_TYPE_UICC_ISIM == applicationType && - EFalse == iIsimApplicationFound ) - { - iIsimApplicationFound = ETrue; - - iIsimApplicationId = aIsiMsg.Get8bit( - uiccSbApplDataObjectOffset + - UICC_SB_APPL_DATA_OBJECT_OFFSET_APPLID ); - iIsimApplicationStatus = aIsiMsg.Get8bit( - uiccSbApplDataObjectOffset + - UICC_SB_APPL_DATA_OBJECT_OFFSET_APPLSTATUS ); - } - startIndex = uiccSbApplDataObjectOffset + sbLen; - } - if ( EFalse == usimApplFound ) // ICC application - { - iApplicationType = UICC_APPL_TYPE_ICC_SIM; - iApplicationId = UICC_APPL_ID_UNKNOWN; - // Application file ID for GSM - TBuf8<2> gsmFileId; - gsmFileId.Append( 0x7F ); - gsmFileId.Append( 0x20 ); - iApplFileId.Copy( gsmFileId ); - } - // Activate the application - if ( UICC_STATUS_APPL_ACTIVE != iApplicationStatus ) - { - TUiccParamsBase params; - params.messHandlerPtr = static_cast( this ); - params.trId = ETrIdActivateUiccApplication; - ret = CreateUiccApplicationReq( params, UICC_APPL_HOST_ACTIVATE ); - } + ret = HandleUiccApplListResp( aIsiMsg ); break; } case UICC_APPL_HOST_ACTIVATE: { - TUint uiccSbClientOffset( 0 ); - if ( KErrNone == aIsiMsg.FindSubBlockOffsetById( - startIndex, - UICC_SB_CLIENT, - EIsiSubBlockTypeId16Len16, - uiccSbClientOffset ) ) - { - if( ETrIdActivateUiccApplication == trId ) - { - iUiccClientId = aIsiMsg.Get8bit( - uiccSbClientOffset + - UICC_SB_CLIENT_OFFSET_CLIENTID ); - } - else if( ETrIdActivateIsimApplication == trId ) - { - iUiccIsimClientId = aIsiMsg.Get8bit( - uiccSbClientOffset + - UICC_SB_CLIENT_OFFSET_CLIENTID ); - } - } - // UICC_SB_FCI contains PIN key references - TUint uiccSbFciOffset( 0 ); - if ( KErrNone == aIsiMsg.FindSubBlockOffsetById( - ISI_HEADER_SIZE + SIZE_UICC_APPLICATION_RESP, - UICC_SB_FCI, - EIsiSubBlockTypeId16Len16, - uiccSbFciOffset ) ) - { - // Check is the SIM UICC - TPtrC8 data( KNullDesC8 ); - - // The whole sub block is returned - TInt sbLength( aIsiMsg.Get16bit( - uiccSbFciOffset + UICC_SB_FCI_OFFSET_SBLEN ) ); - data.Set( aIsiMsg.GetData( - uiccSbFciOffset, - sbLength ) ); - - TFci fci( data ); - if( UICC_CARD_TYPE_UICC == fci.GetTypeOfCard() ) - { - StorePinKeyReferences( data ); - } - } - - // In case of ICC there is two UICC_SB_CHV subblocks - // that contain PIN IDs for ICC application - TUint uiccSbChvOffset( 0 ); - while ( KErrNone == aIsiMsg.FindSubBlockOffsetById( - startIndex, - UICC_SB_CHV, - EIsiSubBlockTypeId16Len16, - uiccSbChvOffset ) ) - { - TUint8 chvQualifier( aIsiMsg.Get8bit( - uiccSbChvOffset + - UICC_SB_CHV_OFFSET_CHVQUALIFIER ) ); - if ( UICC_CHV1 == chvQualifier ) // PIN1 - { - iPin1Id = aIsiMsg.Get8bit( - uiccSbChvOffset + UICC_SB_CHV_OFFSET_PINID ); - } - else // PIN2 - { - iPin2Id = aIsiMsg.Get8bit( - uiccSbChvOffset + UICC_SB_CHV_OFFSET_PINID ); - } - startIndex = uiccSbChvOffset + SIZE_UICC_SB_CHV; - } + ret = HandleUiccApplHostActivate( aIsiMsg ); break; } default: { +TFLOGSTRING("TSY: CMmUiccMessHandler::HandleUiccApplicationResp - default"); break; } } @@ -1346,7 +1606,7 @@ const TPtrC8 CMmUiccMessHandler::GetFileFCI( const TIsiReceiveC& aIsiMsg ) { TFLOGSTRING("TSY: CMmUiccMessHandler::GetFileFCI"); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETFILEFCI, "CMmUiccMessHandler::GetFileFCI" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETFILEFCI_TD, "CMmUiccMessHandler::GetFileFCI" ); TPtrC8 data( KNullDesC8 ); TUint uiccSbFileDataOffset( 0 ); @@ -1376,7 +1636,7 @@ const TUiccParamsBase& aParams ) { TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccConnectorReq"); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCCONNREQ, "CMmUiccMessHandler::CreateUiccConnectorReq" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCCONNREQ_TD, "CMmUiccMessHandler::CreateUiccConnectorReq" ); TInt ret (KErrGeneral); TInt trId( aParams.trId ); @@ -1418,7 +1678,9 @@ break; } default: + { break; + } } isiMsg.Set8bit( @@ -1442,7 +1704,7 @@ TInt CMmUiccMessHandler::CreateUiccApduReq( const TUiccParamsApduReq& aParams ) { TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccApduReq"); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCAPDUREQ, "CMmUiccMessHandler::CreateUiccApduReq" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCAPDUREQ_TD, "CMmUiccMessHandler::CreateUiccApduReq" ); TInt ret (KErrGeneral); TInt trId( aParams.trId ); @@ -1525,7 +1787,7 @@ TUint8 aAction ) { TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccSbApduActions"); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCASBPDUACTION, "CMmUiccMessHandler::CreateUiccSbApduActions" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCASBPDUACTION_TD, "CMmUiccMessHandler::CreateUiccSbApduActions" ); // SIZE_UICC_SB_APPLICATION_STR TBuf8 uiccSbApduActionBuf( 0 ); @@ -1555,7 +1817,7 @@ const TPtrC8 CMmUiccMessHandler::GetApduData( const TIsiReceiveC& aIsiMsg ) { TFLOGSTRING("TSY: CMmUiccMessHandler::GetApduData"); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETAPDUDATA, "CMmUiccMessHandler::GetApduData" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETAPDUDATA_TD, "CMmUiccMessHandler::GetApduData" ); TPtrC8 data( KNullDesC8 ); @@ -1588,7 +1850,7 @@ const TDesC8& aAPDUData) { TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccSbApdu" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATESBAPDU, "CMmUiccMessHandler::CreateUiccSbApdu" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATESBAPDU_TD, "CMmUiccMessHandler::CreateUiccSbApdu" ); // UICC_SB_APDU subblock TBuf8 uiccSbApduBuf( 0 ); @@ -1623,7 +1885,7 @@ TInt CMmUiccMessHandler::CreateUiccCardReq( const TUiccParamsBase& aParams ) { TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccCardReq" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATECARDREQ, "CMmUiccMessHandler::CreateUiccCardReq" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATECARDREQ_TD, "CMmUiccMessHandler::CreateUiccCardReq" ); TInt ret ( KErrGeneral ); TInt trId( aParams.trId ); @@ -1667,7 +1929,7 @@ void CMmUiccMessHandler::InitializeSimServiceTableCache( TBool aComplete ) { TFLOGSTRING("TSY: CMmUiccMessHandler::InitializeSimServiceTableCache" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_INITIALIZESIMSERVICETABLECACHE, "CMmUiccMessHandler::InitializeSimServiceTableCache" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_INITIALIZESIMSERVICETABLECACHE_TD, "CMmUiccMessHandler::InitializeSimServiceTableCache" ); // Service table internal cacheing is done during strtup and SIM refresh. // Completing of IPC EMmTsyBootNotifySimStatusReadyIPC is done only @@ -1705,7 +1967,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmUiccMessHandler::SimServiceTableCacheResp" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_SIMSERVICETABLECACHERESP, "CMmUiccMessHandler::SimServiceTableCacheResp" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_SIMSERVICETABLECACHERESP_TD, "CMmUiccMessHandler::SimServiceTableCacheResp" ); if ( UICC_STATUS_OK == aStatus ) { @@ -1722,13 +1984,13 @@ else { TFLOGSTRING("TSY: CMmUiccMessHandler::SimServiceTableCacheResp unknown card type, cache not done" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_SIMSERVICETABLECACHERESP, "CMmUiccMessHandler::SimServiceTableCacheResp unknown card type, cache not done" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_SIMSERVICETABLECACHERESP_TD, "CMmUiccMessHandler::SimServiceTableCacheResp unknown card type, cache not done" ); } } else { TFLOGSTRING2("TSY: CMmUiccMessHandler::SimServiceTableCacheResp: reading failed (0x%x)", aStatus ); -OstTrace1( TRACE_NORMAL, DUP2_CMMUICCMESSHANDLER_SIMSERVICETABLECACHERESP, "CMmUiccMessHandler::SimServiceTableCacheResp: reading failed (%x)", aStatus ); +OstTrace1( TRACE_NORMAL, DUP2_CMMUICCMESSHANDLER_SIMSERVICETABLECACHERESP_TD, "CMmUiccMessHandler::SimServiceTableCacheResp: reading failed (%x)", aStatus ); } // Cacheing during startup @@ -1754,7 +2016,7 @@ TBool CMmUiccMessHandler::GetServiceStatus( TUint8 aServiceNo ) { TFLOGSTRING2("TSY: CMmUiccMessHandler::GetServiceStatus for card: ox%x", iCardType ); -OstTrace1( TRACE_NORMAL, CMMUICCMESSHANDLER_GETSERVICESTATUS, "CMmUiccMessHandler::GetServiceStatus for card: ox%x", iCardType ); +OstTrace1( TRACE_NORMAL, CMMUICCMESSHANDLER_GETSERVICESTATUS_TD, "CMmUiccMessHandler::GetServiceStatus for card: ox%x", iCardType ); TBool ret( EFalse ); @@ -1785,7 +2047,7 @@ if( iUSTFile[index] & mask ) { TFLOGSTRING2("TSY: CMmUiccMessHandler::GetServiceStatus: UICC service (%d) supported", aServiceNo ); -OstTrace1( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_GETSERVICESTATUS, "CMmUiccMessHandler::GetServiceStatus: UICC service (%d) supported", aServiceNo ); +OstTrace1( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_GETSERVICESTATUS_TD, "CMmUiccMessHandler::GetServiceStatus: UICC service (%d) supported", aServiceNo ); ret = ETrue; } } @@ -1822,7 +2084,7 @@ if( ( iSSTFile[index] & mask ) == mask ) { TFLOGSTRING2("TSY: CMmUiccMessHandler::GetServiceStatus: ICC service (%d) supported", aServiceNo ); -OstTrace1( TRACE_NORMAL, DUP2_CMMUICCMESSHANDLER_GETSERVICESTATUS, "CMmUiccMessHandler::GetServiceStatus: ICC service (%d) supported", aServiceNo ); +OstTrace1( TRACE_NORMAL, DUP2_CMMUICCMESSHANDLER_GETSERVICESTATUS_TD, "CMmUiccMessHandler::GetServiceStatus: ICC service (%d) supported", aServiceNo ); ret = ETrue; } } @@ -1842,8 +2104,8 @@ const TDesC8& aFileData ) { TFLOGSTRING3("TSY: CMmUiccMessHandler::ProcessUiccMsg, transaction ID: %d, status: %d", aTraId, aStatus ); -OstTrace1( TRACE_NORMAL, CMMUICCMESSHANDLER_PROCESSUICCMSG, "CMmUiccMessHandler::ProcessUiccMsg, transaction ID: %d", aTraId ); -OstTrace1( TRACE_NORMAL, DUP2_CMMUICCMESSHANDLER_PROCESSUICCMSG, "CMmUiccMessHandler::ProcessUiccMsg, status: %d", aStatus ); +OstTrace1( TRACE_NORMAL, CMMUICCMESSHANDLER_PROCESSUICCMSG_TD, "CMmUiccMessHandler::ProcessUiccMsg, transaction ID: %d", aTraId ); +OstTrace1( TRACE_NORMAL, DUP2_CMMUICCMESSHANDLER_PROCESSUICCMSG_TD, "CMmUiccMessHandler::ProcessUiccMsg, status: %d", aStatus ); TInt ret( KErrNone ); @@ -1862,7 +2124,7 @@ default: { TFLOGSTRING("TSY: CMmUiccMessHandler::ProcessUiccMsg, unknown transaction ID" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_PROCESSUICCMSG, "CMmUiccMessHandler::ProcessUiccMsg, unknown transaction ID" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_PROCESSUICCMSG_TD, "CMmUiccMessHandler::ProcessUiccMsg, unknown transaction ID" ); break; } } @@ -1878,7 +2140,7 @@ void CMmUiccMessHandler::StorePinKeyReferences( const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmUiccMessHandler::StorePinKeyReferences" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_STOREPINKEYREFERENCES, "CMmUiccMessHandler::StorePinKeyReferences" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_STOREPINKEYREFERENCES_TD, "CMmUiccMessHandler::StorePinKeyReferences" ); // Get offset for PIN Status Template DO TFci fci( aFileData ); @@ -1955,7 +2217,7 @@ TUint8 CMmUiccMessHandler::GetPin1KeyReference() { TFLOGSTRING("TSY: CMmUiccMessHandler::GetPin1KeyReference" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETPIN1KEYREFERENCE, "CMmUiccMessHandler::GetPin1KeyReference" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETPIN1KEYREFERENCE_TD, "CMmUiccMessHandler::GetPin1KeyReference" ); return iPin1Id; } @@ -1967,7 +2229,7 @@ TUint8 CMmUiccMessHandler::GetPin2KeyReference() { TFLOGSTRING("TSY: CMmUiccMessHandler::GetPin2KeyReference" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETPIN2KEYREFERENCE, "CMmUiccMessHandler::GetPin2KeyReference" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETPIN2KEYREFERENCE_TD, "CMmUiccMessHandler::GetPin2KeyReference" ); return iPin2Id; } @@ -1979,7 +2241,7 @@ RMobilePhone::TMobilePhoneSecurityCode CMmUiccMessHandler::GetActivePin() { TFLOGSTRING("TSY: CMmUiccMessHandler::GetActivePin" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETACTIVEPIN, "CMmUiccMessHandler::GetActivePin" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETACTIVEPIN_TD, "CMmUiccMessHandler::GetActivePin" ); return iActivePin; } @@ -1991,7 +2253,7 @@ void CMmUiccMessHandler::ChangeActivePin() { TFLOGSTRING("TSY: CMmUiccMessHandler::ChangeActivePin" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CHANGEACTIVEPIN, "CMmUiccMessHandler::ChangeActivePin" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CHANGEACTIVEPIN_TD, "CMmUiccMessHandler::ChangeActivePin" ); // Change the internal flag indicating which PIN is active if ( RMobilePhone::ESecurityCodePin1 == iActivePin ) { @@ -2011,7 +2273,7 @@ void CMmUiccMessHandler::InitializeCphsInformationCache() { TFLOGSTRING("TSY: CMmUiccMessHandler::InitializeCphsInformationCache" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_INITIALIZECPHSINFORMATIONCACHE, "CMmUiccMessHandler::InitializeCphsInformationCache" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_INITIALIZECPHSINFORMATIONCACHE_TD, "CMmUiccMessHandler::InitializeCphsInformationCache" ); // CPHS information is read only in case of ICC card if( UICC_CARD_TYPE_ICC == iCardType ) @@ -2045,7 +2307,7 @@ const TDesC8& aFileData ) { TFLOGSTRING("TSY: CMmUiccMessHandler::CphsInformationCacheResp" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CPHSINFORMATIONCACHERESP, "CMmUiccMessHandler::CphsInformationCacheResp" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CPHSINFORMATIONCACHERESP_TD, "CMmUiccMessHandler::CphsInformationCacheResp" ); if ( UICC_STATUS_OK == aStatus ) { @@ -2060,15 +2322,15 @@ else { TFLOGSTRING3("TSY: CMmUiccMessHandler::CphsInformationCacheResp: buffer too small (expected: %d, actual: %d), cannot store CPHS info", dataSize, iCPHSInformation.Length() ); -OstTrace0( TRACE_NORMAL, DUP3_CMMUICCMESSHANDLER_CPHSINFORMATIONCACHERESP, "CMmUiccMessHandler::CphsInformationCacheResp: buffer too small, cannot store CPHS info" ); -OstTrace1( TRACE_NORMAL, DUP2_CMMUICCMESSHANDLER_CPHSINFORMATIONCACHERESP, "CMmUiccMessHandler::CphsInformationCacheResp: expected size: %d", dataSize ); -OstTrace1( TRACE_NORMAL, DUP4_CMMUICCMESSHANDLER_CPHSINFORMATIONCACHERESP, "CMmUiccMessHandler::CphsInformationCacheResp: actual size: %d", iCPHSInformation.Length() ); +OstTrace0( TRACE_NORMAL, DUP3_CMMUICCMESSHANDLER_CPHSINFORMATIONCACHERESP_TD, "CMmUiccMessHandler::CphsInformationCacheResp: buffer too small, cannot store CPHS info" ); +OstTrace1( TRACE_NORMAL, DUP2_CMMUICCMESSHANDLER_CPHSINFORMATIONCACHERESP_TD, "CMmUiccMessHandler::CphsInformationCacheResp: expected size: %d", dataSize ); +OstTrace1( TRACE_NORMAL, DUP4_CMMUICCMESSHANDLER_CPHSINFORMATIONCACHERESP_TD, "CMmUiccMessHandler::CphsInformationCacheResp: actual size: %d", iCPHSInformation.Length() ); } } else { TFLOGSTRING2("TSY: CMmUiccMessHandler::CphsInformationCacheResp: reading failed (0x%x)", aStatus ); -OstTrace1( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_CPHSINFORMATIONCACHERESP, "CMmUiccMessHandler::CphsInformationCacheResp: reading failed (0x%x)", aStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_CPHSINFORMATIONCACHERESP_TD, "CMmUiccMessHandler::CphsInformationCacheResp: reading failed (0x%x)", aStatus ); } } @@ -2080,7 +2342,7 @@ TBool CMmUiccMessHandler::GetCphsInformationStatus( TUint8 aServiceNo ) { TFLOGSTRING("TSY: CMmUiccMessHandler::GetCphsInformationStatus" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_GETCPHSINFORMATIONSTATUS, "CMmUiccMessHandler::GetCphsInformationStatus" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMUICCMESSHANDLER_GETCPHSINFORMATIONSTATUS_TD, "CMmUiccMessHandler::GetCphsInformationStatus" ); TBool ret( EFalse ); @@ -2113,7 +2375,7 @@ if( ( iCPHSInformation[index] & mask ) == mask ) { TFLOGSTRING2("TSY: CMmUiccMessHandler::GetCphsInformationStatus: CPHS service (%d) supported", aServiceNo ); -OstTrace1( TRACE_NORMAL, CMMUICCMESSHANDLER_GETCPHSINFORMATIONSTATUS, "CMmUiccMessHandler::GetCphsInformationStatus: CPHS service (%d) supported", aServiceNo ); +OstTrace1( TRACE_NORMAL, CMMUICCMESSHANDLER_GETCPHSINFORMATIONSTATUS_TD, "CMmUiccMessHandler::GetCphsInformationStatus: CPHS service (%d) supported", aServiceNo ); ret = ETrue; } } @@ -2132,7 +2394,7 @@ lengthOfFCISb = CMmStaticUtility::Get16Bit( iData, UICC_SB_FCI_OFFSET_SBLEN ); TFLOGSTRING2("TSY: TFci::GetLength lengthOfFCISb = %d", lengthOfFCISb ); -OstTrace1( TRACE_NORMAL, TFCI_GETLENGTH, "TFci::GetLength;lengthOfFCISb=%d", lengthOfFCISb ); +OstTrace1( TRACE_NORMAL, TFCI_GETLENGTH_TD, "TFci::GetLength;lengthOfFCISb=%d", lengthOfFCISb ); return lengthOfFCISb; } @@ -2146,7 +2408,7 @@ { TUint8 uiccCardType( iData[UICC_SB_FCI_OFFSET_CARDTYPE] ); TFLOGSTRING2("TSY: TFci::GetTypeOfCard uiccCardType = %d", uiccCardType ); -OstTraceExt1( TRACE_NORMAL, TFCI_GETTYPEOFCARD, "TFci::GetTypeOfCard;uiccCardType=%hhu", uiccCardType ); +OstTraceExt1( TRACE_NORMAL, TFCI_GETTYPEOFCARD_TD, "TFci::GetTypeOfCard;uiccCardType=%hhu", uiccCardType ); return uiccCardType; } @@ -2159,7 +2421,7 @@ TInt TFci::GetOffsetOfTLV( const TUint8 aDescription ) { TFLOGSTRING("TSY: TFci::::GetOffsetOfTLV" ); -OstTrace0( TRACE_NORMAL, TFCI_GETOFFSETOFTLV, "TFci::GetOffsetOfTLV" ); +OstTrace0( TRACE_NORMAL, TFCI_GETOFFSETOFTLV_TD, "TFci::GetOffsetOfTLV" ); TInt indexOfData( 0 ); TInt length( GetLength() ); @@ -2211,7 +2473,7 @@ TInt TFci::GetNumberOfRecords() { TFLOGSTRING("TSY: TFci::GetNumberOfRecords" ); -OstTrace0( TRACE_NORMAL, TFCI_GETNUMBEROFRECORDS, "TFci::GetNumberOfRecords" ); +OstTrace0( TRACE_NORMAL, TFCI_GETNUMBEROFRECORDS_TD, "TFci::GetNumberOfRecords" ); TInt numberOfRecords( 0 ); TUint8 uiccCardType( GetTypeOfCard()); @@ -2248,11 +2510,11 @@ else { TFLOGSTRING("TSY: TFci::GetNumberOfRecords: UNKNOWN CARD TYPE" ); -OstTrace0( TRACE_NORMAL, DUP2_TFCI_GETNUMBEROFRECORDS, "TFci::GetNumberOfRecords: UNKNOWN CARD TYPE" ); +OstTrace0( TRACE_NORMAL, DUP2_TFCI_GETNUMBEROFRECORDS_TD, "TFci::GetNumberOfRecords: UNKNOWN CARD TYPE" ); } TFLOGSTRING2("TSY: TFci::GetNumberOfRecords numberOfRecords = %d", numberOfRecords ); -OstTrace1( TRACE_NORMAL, DUP1_TFCI_GETNUMBEROFRECORDS, "TFci::GetNumberOfRecords;numberOfRecords=%d", numberOfRecords ); +OstTrace1( TRACE_NORMAL, DUP1_TFCI_GETNUMBEROFRECORDS_TD, "TFci::GetNumberOfRecords;numberOfRecords=%d", numberOfRecords ); return numberOfRecords; } @@ -2265,7 +2527,7 @@ TInt TFci::GetRecordLength() { TFLOGSTRING("TSY: TFci::GetRecordLength" ); -OstTrace0( TRACE_NORMAL, TFCI_GETRECORDLENGTH, "TFci::GetRecordLength" ); +OstTrace0( TRACE_NORMAL, TFCI_GETRECORDLENGTH_TD, "TFci::GetRecordLength" ); TInt recordLength( 0 ); TUint8 uiccCardType( GetTypeOfCard()); @@ -2295,11 +2557,11 @@ else { TFLOGSTRING("TSY: TFci::GetRecordLength: UNKNOWN CARD TYPE" ); -OstTrace0( TRACE_NORMAL, DUP2_TFCI_GETRECORDLENGTH, "TFci::GetRecordLength: UNKNOWN CARD TYPE" ); +OstTrace0( TRACE_NORMAL, DUP2_TFCI_GETRECORDLENGTH_TD, "TFci::GetRecordLength: UNKNOWN CARD TYPE" ); } TFLOGSTRING2("TSY: TFci::GetRecordLength recordLength = %d", recordLength ); -OstTrace1( TRACE_NORMAL, DUP1_TFCI_GETRECORDLENGTH, "TFci::GetRecordLength;recordLength=%d", recordLength ); +OstTrace1( TRACE_NORMAL, DUP1_TFCI_GETRECORDLENGTH_TD, "TFci::GetRecordLength;recordLength=%d", recordLength ); return recordLength; } @@ -2312,7 +2574,7 @@ TInt TFci::GetSizeOfFile() { TFLOGSTRING("TSY: TFci::GetSizeOfFile" ); -OstTrace0( TRACE_NORMAL, TFCI_GETSIZEOFFILE, "TFci::GetSizeOfFile" ); +OstTrace0( TRACE_NORMAL, TFCI_GETSIZEOFFILE_TD, "TFci::GetSizeOfFile" ); TInt fileSize( 0 ); TUint8 uiccCardType( GetTypeOfCard() ); @@ -2342,12 +2604,12 @@ else { TFLOGSTRING("TSY: TFci::GetFileSize: UNKNOWN CARD TYPE" ); -OstTrace0( TRACE_NORMAL, DUP2_TFCI_GETSIZEOFFILE, "TFci::GetSizeOfFile: UNKNOWN CARD TYPE" ); +OstTrace0( TRACE_NORMAL, DUP2_TFCI_GETSIZEOFFILE_TD, "TFci::GetSizeOfFile: UNKNOWN CARD TYPE" ); } TFLOGSTRING2("TSY: TFci::GetSizeOfFile fileSize = %d", fileSize ); -OstTrace1( TRACE_NORMAL, DUP1_TFCI_GETSIZEOFFILE, "TFci::GetSizeOfFile;fileSize=%d", fileSize ); +OstTrace1( TRACE_NORMAL, DUP1_TFCI_GETSIZEOFFILE_TD, "TFci::GetSizeOfFile;fileSize=%d", fileSize ); return fileSize; } @@ -2360,7 +2622,7 @@ TInt TFci::GetFileIdentifier() { TFLOGSTRING("TSY: TFci::GetFileIdentifier" ); -OstTrace0( TRACE_NORMAL, TFCI_GETFILEIDENTIFIER, "TFci::GetFileIdentifier" ); +OstTrace0( TRACE_NORMAL, TFCI_GETFILEIDENTIFIER_TD, "TFci::GetFileIdentifier" ); TInt fileIdentifier( 0 ); TUint8 uiccCardType( GetTypeOfCard()); @@ -2392,11 +2654,11 @@ else { TFLOGSTRING("TSY: TFci::GetFileIdentifier: UNKNOWN CARD TYPE" ); -OstTrace0( TRACE_NORMAL, DUP2_TFCI_GETFILEIDENTIFIER, "TFci::GetFileIdentifier: UNKNOWN CARD TYPE" ); +OstTrace0( TRACE_NORMAL, DUP2_TFCI_GETFILEIDENTIFIER_TD, "TFci::GetFileIdentifier: UNKNOWN CARD TYPE" ); } TFLOGSTRING2("TSY: TFci::GetFileIdentifier fileIdentifier = %d", fileIdentifier ); -OstTrace1( TRACE_NORMAL, DUP1_TFCI_GETFILEIDENTIFIER, "TFci::GetFileIdentifier;fileIdentifier=%d", fileIdentifier ); +OstTrace1( TRACE_NORMAL, DUP1_TFCI_GETFILEIDENTIFIER_TD, "TFci::GetFileIdentifier;fileIdentifier=%d", fileIdentifier ); return fileIdentifier; } @@ -2409,7 +2671,7 @@ TUint8 TFci::GetFileStatus() { TFLOGSTRING("TSY: TFci::GetFileStatus" ); -OstTrace0( TRACE_NORMAL, TFCI_GETFILESTATUS, "TFci::GetFileStatus" ); +OstTrace0( TRACE_NORMAL, TFCI_GETFILESTATUS_TD, "TFci::GetFileStatus" ); TUint8 fileStatus( 0 ); TUint8 uiccCardType( GetTypeOfCard()); @@ -2426,11 +2688,11 @@ else { TFLOGSTRING("TSY: TFci::GetFileStatus: UNKNOWN CARD TYPE" ); -OstTrace0( TRACE_NORMAL, DUP1_TFCI_GETFILESTATUS, "TFci::GetFileStatus: UNKNOWN CARD TYPE" ); +OstTrace0( TRACE_NORMAL, DUP1_TFCI_GETFILESTATUS_TD, "TFci::GetFileStatus: UNKNOWN CARD TYPE" ); } TFLOGSTRING2("TSY: TFci::GetFileStatus fileStatus = %d", fileStatus ); -OstTraceExt1( TRACE_NORMAL, DUP2_TFCI_GETFILESTATUS, "TFci::GetFileStatus;fileStatus=%hhu", fileStatus ); +OstTraceExt1( TRACE_NORMAL, DUP2_TFCI_GETFILESTATUS_TD, "TFci::GetFileStatus;fileStatus=%hhu", fileStatus ); return fileStatus; } @@ -2443,8 +2705,90 @@ TUint8 CMmUiccMessHandler::GetUiccClientId() { TFLOGSTRING("TSY: CMmUiccMessHandler::GetUiccClientId" ); -OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETUICCCLIENTID, "CMmUiccMessHandler::GetUiccClientId" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETUICCCLIENTID_TD, "CMmUiccMessHandler::GetUiccClientId" ); return iUiccClientId; } +// ----------------------------------------------------------------------------- +// CMmUiccMessHandler::GetUiccApplicationStatus +// (other items were commented in a header). +// ----------------------------------------------------------------------------- +// +TUint8 CMmUiccMessHandler::GetUiccApplicationStatus() + { +TFLOGSTRING("TSY: CMmUiccMessHandler::GetUiccApplicationStatus" ); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_GETUICCAPPLICATIONSTATUS_TD, "CMmUiccMessHandler::GetUiccApplicationStatus" ); + return iApplicationStatus; + } + + +// ----------------------------------------------------------------------------- +// CMmUiccMessHandler::CreateUiccReq +// Builds UICC_REQ ISI message and sends it via phonet +// ----------------------------------------------------------------------------- +// +TInt CMmUiccMessHandler::CreateUiccReq() + { +TFLOGSTRING("TSY: CMmUiccMessHandler::CreateUiccReq"); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_CREATEUICCREQ_TD, "CMmUiccMessHandler::CreateUiccReq" ); + + // Create UICC_REQ message for querying card status + TIsiSend isiMsg( iPhoNetSender->SendBufferDes() ); + isiMsg.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_UICC ); + isiMsg.Set8bit( ISI_HEADER_OFFSET_TRANSID, ETrIdGetUiccStatus ); + isiMsg.Set8bit( ISI_HEADER_OFFSET_MESSAGEID, UICC_REQ ); + isiMsg.Set8bit( ISI_HEADER_SIZE + UICC_REQ_OFFSET_SERVICETYPE, + UICC_STATUS_GET ); + // THERE IS NO OFFSET FOR SB COUNT CURRENTLY IN THE ISI HEADER + isiMsg.Set8bit( ISI_HEADER_SIZE + UICC_REQ_OFFSET_SERVICETYPE + 1, 0x00 ); + + return iPhoNetSender->Send( isiMsg.Complete() ); + } + +// ----------------------------------------------------------------------------- +// CMmUiccMessHandler::UiccCardRespStatus +// Uicc card response card status handling +// ----------------------------------------------------------------------------- +// +void CMmUiccMessHandler::UiccCardRespStatus( const TIsiReceiveC& aIsiMsg ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::UiccCardRespStatus"); +OstTrace0( TRACE_NORMAL, CMMUICCMESSHANDLER_UICCCARDRESPSTATUS_TD, "CMmUiccMessHandler::UiccCardRespStatus" ); + + TUint8 nbOfSubBlocks( aIsiMsg.Get8bit( + ISI_HEADER_SIZE + UICC_CARD_RESP_OFFSET_NSB ) ); + if( nbOfSubBlocks ) + { + + TUint uiccSbFileDataOffset( 0 ); + if( KErrNone == aIsiMsg.FindSubBlockOffsetById( + ISI_HEADER_SIZE + SIZE_UICC_CARD_RESP, + UICC_SB_CARD_STATUS, + EIsiSubBlockTypeId16Len16, + uiccSbFileDataOffset ) ) + { + + TInt cardStatus( aIsiMsg.Get8bit( + uiccSbFileDataOffset + + UICC_SB_CARD_STATUS_OFFSET_CARDSTATUS ) ); +TFLOGSTRING2("TSY: CMmUiccMessHandler::UiccCardRespStatus: UICC_CARD_RESP cardstatus = %d", cardStatus ); + if( UICC_STATUS_CARD_NOT_READY == cardStatus ) + { + SendTerminalProfile(); + } + else if( UICC_STATUS_CARD_READY == cardStatus && + UICC_APPL_ID_UNKNOWN == iApplicationId ) + { +TFLOGSTRING("TSY: CMmUiccMessHandler::UiccCardRespStatus: UICC_CARD_RESP ACTIVATE"); + // Activate the application + TUiccParamsBase params; + params.messHandlerPtr = static_cast( this ); + params.trId = ETrIdGetUiccApplication; + CreateUiccApplicationReq( params, UICC_APPL_LIST, iCardType ); + + } + } + } + } + // End of File diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/cmmussdmesshandler.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/cmmussdmesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/cmmussdmesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -73,7 +73,7 @@ ) { TFLOGSTRING("TSY: CMmUssdMessHandler::CMmUssdMessHandler"); -OstTrace0( TRACE_NORMAL, CMMUSSDMESSHANDLER_CMMUSSDMESSHANDLER, "CMmUssdMessHandler::CMmUssdMessHandler" ); +OstTrace0( TRACE_NORMAL, CMMUSSDMESSHANDLER_CMMUSSDMESSHANDLER_TD, "CMmUssdMessHandler::CMmUssdMessHandler" ); //None } @@ -88,7 +88,7 @@ ) { TFLOGSTRING("TSY: CMmUssdMessHandler::~CMmUssdMessHandler"); -OstTrace0( TRACE_NORMAL, DUP1_CMMUSSDMESSHANDLER_CMMUSSDMESSHANDLER, "CMmUssdMessHandler::~CMmUssdMessHandler" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMUSSDMESSHANDLER_CMMUSSDMESSHANDLER_TD, "CMmUssdMessHandler::~CMmUssdMessHandler" ); } // ----------------------------------------------------------------------------- // CMmUssdMessHandler::ConstructL @@ -101,7 +101,7 @@ ) { TFLOGSTRING("TSY: CMmUssdMessHandler::ConstructL"); -OstTrace0( TRACE_NORMAL, CMMUSSDMESSHANDLER_CONSTRUCTL, "CMmUssdMessHandler::ConstructL" ); +OstTrace0( TRACE_NORMAL, CMMUSSDMESSHANDLER_CONSTRUCTL_TD, "CMmUssdMessHandler::ConstructL" ); // The flag indicates the correct complete method in failed case for // SS_SERVICE_FAILED_RESP iIsSendReleaseCalled = EFalse; @@ -128,7 +128,7 @@ ) { TFLOGSTRING("TSY: CMmUssdMessHandler::NewL.\n"); -OstTrace0( TRACE_NORMAL, CMMUSSDMESSHANDLER_NEWL, "CMmUssdMessHandler::NewL" ); +OstTrace0( TRACE_NORMAL, CMMUSSDMESSHANDLER_NEWL_TD, "CMmUssdMessHandler::NewL" ); CMmUssdMessHandler* ussdMessHandler = new( ELeave ) CMmUssdMessHandler(); @@ -161,7 +161,7 @@ TInt messageId (aIsiMessage.Get8bit(ISI_HEADER_OFFSET_MESSAGEID) ); TFLOGSTRING3("TSY: CMmUssdMessHandler::ReceiveMessageL - resouce: %d, msgId: %d", resource, messageId); -OstTraceExt2( TRACE_NORMAL, CMMUSSDMESSHANDLER_RECEIVEMESSAGEL, "CMmUssdMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); +OstTraceExt2( TRACE_NORMAL, CMMUSSDMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmUssdMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId ); switch( resource ) { @@ -189,7 +189,7 @@ default: { TFLOGSTRING2("TSY: CMmUssdMessHandler::ReceiveMessageL - PN_SS - unknown msgId: %d", messageId); -OstTrace1( TRACE_NORMAL, DUP1_CMMUSSDMESSHANDLER_RECEIVEMESSAGEL, "CMmUssdMessHandler::ReceiveMessageL;unknown messageId=%d", messageId ); +OstTrace1( TRACE_NORMAL, DUP1_CMMUSSDMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmUssdMessHandler::ReceiveMessageL;unknown messageId=%d", messageId ); // No propiert handler methods for ISI-message found break; } @@ -199,7 +199,7 @@ default: { TFLOGSTRING2("TSY: CMmUssdMessHandler::ReceiveMessageL - unknown resource: %d", resource); -OstTrace1( TRACE_NORMAL, DUP2_CMMUSSDMESSHANDLER_RECEIVEMESSAGEL, "CMmUssdMessHandler::ReceiveMessageL;resource=%d", resource ); +OstTrace1( TRACE_NORMAL, DUP2_CMMUSSDMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmUssdMessHandler::ReceiveMessageL;resource=%d", resource ); break; } } @@ -217,7 +217,7 @@ ) { TFLOGSTRING("TSY: CMmUssdMessHandler::SsGsmUssdSendReq"); -OstTrace0( TRACE_NORMAL, CMMUSSDMESSHANDLER_SSGSMUSSDSENDREQ, "CMmUssdMessHandler::SsGsmUssdSendReq" ); +OstTrace0( TRACE_NORMAL, CMMUSSDMESSHANDLER_SSGSMUSSDSENDREQ_TD, "CMmUssdMessHandler::SsGsmUssdSendReq" ); TInt ret ( KErrNone ); TBuf8 data( 0 ); TDes8* attributes( 0 ); @@ -231,7 +231,7 @@ RMobileUssdMessaging::TMobileUssdAttributesV1 msgAttr ( ( *msgAttrPck )() ); TFLOGSTRING2("TSY: CMmUssdMessHandler::SsGsmUssdSendReq. AttributeType: %d", msgAttr.iType ); -OstTrace1( TRACE_NORMAL, DUP1_CMMUSSDMESSHANDLER_SSGSMUSSDSENDREQ, "CMmUssdMessHandler::SsGsmUssdSendReq;msgAttr.iType=%d", msgAttr.iType ); +OstTrace1( TRACE_NORMAL, DUP1_CMMUSSDMESSHANDLER_SSGSMUSSDSENDREQ_TD, "CMmUssdMessHandler::SsGsmUssdSendReq;msgAttr.iType=%d", msgAttr.iType ); TUint8 ussdType( KFiller ); //initialize ussdtype to 0 @@ -248,7 +248,7 @@ case RMobileUssdMessaging::EUssdMOReply: { TFLOGSTRING2("TSY: CMmUssdMessHandler::SsGsmUssdSendReq; iLastMtUssdIsRequest = %d", iLastMtUssdIsRequest); -OstTrace1( TRACE_NORMAL, DUP5_CMMUSSDMESSHANDLER_SSGSMUSSDSENDREQ, "CMmUssdMessHandler::SsGsmUssdSendReq;iLastMtUssdIsRequest=%d", iLastMtUssdIsRequest ); +OstTrace1( TRACE_NORMAL, DUP5_CMMUSSDMESSHANDLER_SSGSMUSSDSENDREQ_TD, "CMmUssdMessHandler::SsGsmUssdSendReq;iLastMtUssdIsRequest=%d", iLastMtUssdIsRequest ); if ( iLastMtUssdIsRequest ) { ussdType = SS_GSM_USSD_MT_REPLY; @@ -279,7 +279,7 @@ else { TFLOGSTRING("TSY: CMmUssdMessHandler::SsGsmUssdSendReq. Type flag missing" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMUSSDMESSHANDLER_SSGSMUSSDSENDREQ, "CMmUssdMessHandler::SsGsmUssdSendReq, Type flag missing" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMUSSDMESSHANDLER_SSGSMUSSDSENDREQ_TD, "CMmUssdMessHandler::SsGsmUssdSendReq, Type flag missing" ); // ussd type is unknown, report error ret = KErrArgument; } @@ -296,7 +296,7 @@ else { TFLOGSTRING("TSY: CMmUssdMessHandler::SsGsmUssdSendReq. DCS flag missing" ); -OstTrace0( TRACE_NORMAL, DUP3_CMMUSSDMESSHANDLER_SSGSMUSSDSENDREQ, "CMmUssdMessHandler::SsGsmUssdSendReq, DCS flag missing" ); +OstTrace0( TRACE_NORMAL, DUP3_CMMUSSDMESSHANDLER_SSGSMUSSDSENDREQ_TD, "CMmUssdMessHandler::SsGsmUssdSendReq, DCS flag missing" ); // data coding scheme is unknown, report error. ret = KErrArgument; } @@ -390,7 +390,7 @@ ) { TFLOGSTRING("LTSY: CMmUssdMessHandler::SsGsmUssdSendReq. End USSD session" ); -OstTrace0( TRACE_NORMAL, DUP4_CMMUSSDMESSHANDLER_SSGSMUSSDSENDREQ, "CMmUssdMessHandler::SsGsmUssdSendReq" ); +OstTrace0( TRACE_NORMAL, DUP4_CMMUSSDMESSHANDLER_SSGSMUSSDSENDREQ_TD, "CMmUssdMessHandler::SsGsmUssdSendReq" ); // Change the flag to indicate the correct complete method for failed resp iIsSendReleaseCalled = ETrue; @@ -422,7 +422,7 @@ ) { TFLOGSTRING("TSY: CMmUssdMessHandler::SsGsmUssdSendResp" ); -OstTrace0( TRACE_NORMAL, CMMUSSDMESSHANDLER_SSGSMUSSDSENDRESP, "CMmUssdMessHandler::SsGsmUssdSendResp" ); +OstTrace0( TRACE_NORMAL, CMMUSSDMESSHANDLER_SSGSMUSSDSENDRESP_TD, "CMmUssdMessHandler::SsGsmUssdSendResp" ); TUint8 length ( aIsiMessage.Get8bit( ISI_HEADER_SIZE + SS_GSM_USSD_SEND_RESP_OFFSET_LENGTHOFUSSDSTRING ) ); @@ -441,7 +441,7 @@ if ( SS_GSM_USSD_END == ussdType && iIsSendReleaseCalled ) { TFLOGSTRING("TSY: CMmUssdMessHandler::SsGsmUssdSendResp. Response to SendRelease." ); -OstTrace0( TRACE_NORMAL, DUP1_CMMUSSDMESSHANDLER_SSGSMUSSDSENDRESP, "CMmUssdMessHandler::SsGsmUssdSendResp, Response to SendRelease" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMUSSDMESSHANDLER_SSGSMUSSDSENDRESP_TD, "CMmUssdMessHandler::SsGsmUssdSendResp, Response to SendRelease" ); // Reset the flag iIsSendReleaseCalled = EFalse; @@ -485,7 +485,7 @@ if ( iIsSendReleaseReqPending ) { TFLOGSTRING("TSY: CMmUssdMessHandler::SsGsmUssdSendResp. SendRelease pending." ); -OstTrace0( TRACE_NORMAL, DUP2_CMMUSSDMESSHANDLER_SSGSMUSSDSENDRESP, "CMmUssdMessHandler::SsGsmUssdSendResp, SendRelease pending" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMUSSDMESSHANDLER_SSGSMUSSDSENDRESP_TD, "CMmUssdMessHandler::SsGsmUssdSendResp, SendRelease pending" ); TInt ret ( KErrNone ); ret = SsGsmUssdSendReq(); @@ -520,7 +520,7 @@ { TFLOGSTRING("TSY: CMmUssdMessHandler::SsServiceFailedResp" ); -OstTrace0( TRACE_NORMAL, CMMUSSDMESSHANDLER_SSSERVICEFAILEDRESP, "CMmUssdMessHandler::SsServiceFailedResp" ); +OstTrace0( TRACE_NORMAL, CMMUSSDMESSHANDLER_SSSERVICEFAILEDRESP_TD, "CMmUssdMessHandler::SsServiceFailedResp" ); // Initialize cause type and value, if no specified. // subblock found, use SS_UNSPECIFIED_REASON. @@ -631,7 +631,7 @@ KErrCouldNotConnect, KErrGsmSMSNoNetworkService ); TFLOGSTRING("TSY: CMmUssdMessHandler::SsServiceFailedResp. Cause: SS_GSM_SS_NOT_AVAILABLE => No network coverage." ); -OstTrace0( TRACE_NORMAL, DUP1_CMMUSSDMESSHANDLER_SSSERVICEFAILEDRESP, "CMmUssdMessHandler::SsServiceFailedResp, Cause: SS_GSM_SS_NOT_AVAILABLE => No network coverage" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMUSSDMESSHANDLER_SSSERVICEFAILEDRESP_TD, "CMmUssdMessHandler::SsServiceFailedResp, Cause: SS_GSM_SS_NOT_AVAILABLE => No network coverage" ); } else { @@ -648,7 +648,7 @@ if ( iIsSendReleaseCalled ) { TFLOGSTRING("TSY: CMmUssdMessHandler::SsServiceFailedResp. SendRelease failed." ); -OstTrace0( TRACE_NORMAL, DUP2_CMMUSSDMESSHANDLER_SSSERVICEFAILEDRESP, "CMmUssdMessHandler::SsServiceFailedResp, SendRelease failed" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMUSSDMESSHANDLER_SSSERVICEFAILEDRESP_TD, "CMmUssdMessHandler::SsServiceFailedResp, SendRelease failed" ); // Reset the flag iIsSendReleaseCalled = EFalse; @@ -752,7 +752,7 @@ ( RMobileUssdMessaging::EFormatPackedString ); TFLOGSTRING2("TSY: CMmUssdMessHandler::SsGsmUssdReceiveInd: UssdType %d", ussdType); -OstTraceExt1( TRACE_NORMAL, CMMUSSDMESSHANDLER_SSGSMUSSDRECEIVEIND, "CMmUssdMessHandler::SsGsmUssdReceiveInd;ussdType=%hhu", ussdType ); +OstTraceExt1( TRACE_NORMAL, CMMUSSDMESSHANDLER_SSGSMUSSDRECEIVEIND_TD, "CMmUssdMessHandler::SsGsmUssdReceiveInd;ussdType=%hhu", ussdType ); switch ( ussdType ) { @@ -761,7 +761,7 @@ { iLastMtUssdIsRequest = SS_GSM_USSD_REQUEST == ussdType; TFLOGSTRING2("TSY: CMmUssdMessHandler::SsGsmUssdSendReq; iLastMtUssdIsRequest = %d", iLastMtUssdIsRequest); -OstTrace1( TRACE_NORMAL, DUP3_CMMUSSDMESSHANDLER_SSGSMUSSDRECEIVEIND, "CMmUssdMessHandler::SsGsmUssdReceiveInd;iLastMtUssdIsRequest=%d", iLastMtUssdIsRequest ); +OstTrace1( TRACE_NORMAL, DUP3_CMMUSSDMESSHANDLER_SSGSMUSSDRECEIVEIND_TD, "CMmUssdMessHandler::SsGsmUssdReceiveInd;iLastMtUssdIsRequest=%d", iLastMtUssdIsRequest ); receiveUssdMessageAttributes.iType = RMobileUssdMessaging::EUssdMTRequest; break; @@ -815,7 +815,7 @@ KErrNone ); TFLOGSTRING("TSY: CMmUssdMessHandler::SsGsmUssdReceiveInd: Complete : EMobileUssdMessagingReceiveMessage" ); -OstTrace0( TRACE_NORMAL, DUP1_CMMUSSDMESSHANDLER_SSGSMUSSDRECEIVEIND, "CMmUssdMessHandler::SsGsmUssdReceiveInd, EMobileUssdMessagingReceiveMessage" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMUSSDMESSHANDLER_SSGSMUSSDRECEIVEIND_TD, "CMmUssdMessHandler::SsGsmUssdReceiveInd, EMobileUssdMessagingReceiveMessage" ); } if ( SS_GSM_USSD_END == ussdType ) @@ -828,7 +828,7 @@ KErrNone ); TFLOGSTRING("TSY: CMmUssdMessHandler::SsGsmUssdReceiveInd: Complete : EMobileUssdMessagingNotifyNetworkRelease" ); -OstTrace0( TRACE_NORMAL, DUP2_CMMUSSDMESSHANDLER_SSGSMUSSDRECEIVEIND, "CMmUssdMessHandler::SsGsmUssdReceiveInd, EMobileUssdMessagingNotifyNetworkRelease" ); +OstTrace0( TRACE_NORMAL, DUP2_CMMUSSDMESSHANDLER_SSGSMUSSDRECEIVEIND_TD, "CMmUssdMessHandler::SsGsmUssdReceiveInd, EMobileUssdMessagingNotifyNetworkRelease" ); } } @@ -853,7 +853,7 @@ //*************************************************************//. TFLOGSTRING("TSY: CMmUssdMessHandler::ExtFuncL"); -OstTrace0( TRACE_NORMAL, DUP1_CMMUSSDMESSHANDLER_EXTFUNCL, "CMmUssdMessHandler::ExtFuncL" ); +OstTrace0( TRACE_NORMAL, DUP1_CMMUSSDMESSHANDLER_EXTFUNCL_TD, "CMmUssdMessHandler::ExtFuncL" ); TInt ret( KErrNone ); @@ -893,7 +893,7 @@ default: { TFLOGSTRING2("TSY: CMmUssdMessHandler::ExtFuncL - Unknown IPC: %d", aIpc); -OstTrace1( TRACE_NORMAL, DUP2_CMMUSSDMESSHANDLER_EXTFUNCL, "CMmUssdMessHandler::ExtFuncL;aIpc=%d", aIpc ); +OstTrace1( TRACE_NORMAL, DUP2_CMMUSSDMESSHANDLER_EXTFUNCL_TD, "CMmUssdMessHandler::ExtFuncL;aIpc=%d", aIpc ); ret = KErrNotSupported; break; } @@ -915,7 +915,7 @@ ) { TFLOGSTRING("TSY: CMmUssdMessHandler::HandleError"); -OstTrace0( TRACE_NORMAL, CMMUSSDMESSHANDLER_HANDLEERROR, "CMmUssdMessHandler::HandleError" ); +OstTrace0( TRACE_NORMAL, CMMUSSDMESSHANDLER_HANDLEERROR_TD, "CMmUssdMessHandler::HandleError" ); } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/toperatornames.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/toperatornames.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/toperatornames.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -37,7 +37,8 @@ //None // CONSTANTS - //None +const TUint8 KMccLeadingZero = 0; +const TUint8 KMncLeadingZero = 0; // MACROS //None @@ -64,7 +65,7 @@ template void CopyToDes( TDes& aDest, const T* str ) { TFLOGSTRING("TSY: CopyToDes"); -OstTrace0( TRACE_NORMAL, _COPYTODES, "::CopyToDes" ); +OstTrace0( TRACE_NORMAL, _COPYTODES_TD, "::CopyToDes" ); aDest.Zero(); while ( *str && aDest.Length() < aDest.MaxLength() ) @@ -81,7 +82,7 @@ const TCountry* FindCountry( const TUint aMCC ) { TFLOGSTRING("TSY: FindCountry"); -OstTrace0( TRACE_NORMAL, _FINDCOUNTRY, "::FindCountry" ); +OstTrace0( TRACE_NORMAL, _FINDCOUNTRY_TD, "::FindCountry" ); const TCountry* country( NULL ); @@ -105,7 +106,7 @@ const TOperator* FindOperator( const TUint aMCC, const TUint aMNC ) { TFLOGSTRING("TSY: FindOperator"); -OstTrace0( TRACE_NORMAL, _FINDOPERATOR, "::FindOperator" ); +OstTrace0( TRACE_NORMAL, _FINDOPERATOR_TD, "::FindOperator" ); const TOperator* oper( NULL ); const TCountry* country( FindCountry( aMCC ) ); @@ -137,7 +138,7 @@ TDes& aCountryId ) { TFLOGSTRING("TSY: TOperatorNames::GetCountryID"); -OstTrace0( TRACE_NORMAL, TOPERATORNAMES_GETCOUNTRYID, "TOperatorNames::GetCountryID" ); +OstTrace0( TRACE_NORMAL, TOPERATORNAMES_GETCOUNTRYID_TD, "TOperatorNames::GetCountryID" ); TInt ret( KErrNotFound ); const TCountry* country( FindCountry( aMCC ) ); @@ -162,7 +163,7 @@ TDes& aOperatorName ) { TFLOGSTRING("TSY: TOperatorNames::GetLatinName"); -OstTrace0( TRACE_NORMAL, TOPERATORNAMES_GETLATINNAME, "TOperatorNames::GetLatinName" ); +OstTrace0( TRACE_NORMAL, TOPERATORNAMES_GETLATINNAME_TD, "TOperatorNames::GetLatinName" ); TInt ret( KErrNotFound ); const TOperator* oper( FindOperator( aMCC, aMNC ) ); @@ -187,7 +188,7 @@ TDes& aOperatorName ) { TFLOGSTRING("TSY: TOperatorNames::GetUnicodeName"); -OstTrace0( TRACE_NORMAL, TOPERATORNAMES_GETUNICODENAME, "TOperatorNames::GetUnicodeName" ); +OstTrace0( TRACE_NORMAL, TOPERATORNAMES_GETUNICODENAME_TD, "TOperatorNames::GetUnicodeName" ); TInt ret( KErrNotFound ); const TOperator* oper( FindOperator( aMCC, aMNC ) ); @@ -212,7 +213,7 @@ TDes& aOperatorName ) { TFLOGSTRING("TSY: TOperatorNames::GetCountryMNCName"); -OstTrace0( TRACE_NORMAL, TOPERATORNAMES_GETCOUNTRYMNCNAME, "TOperatorNames::GetCountryMNCName" ); +OstTrace0( TRACE_NORMAL, TOPERATORNAMES_GETCOUNTRYMNCNAME_TD, "TOperatorNames::GetCountryMNCName" ); TInt ret( KErrNotFound ); const TCountry* country( FindCountry( aMCC ) ); @@ -221,7 +222,17 @@ { CopyToDes( aOperatorName, country->iCountryId ); aOperatorName.Append(' '); // space - aOperatorName.AppendNum( aMNC ); + + if ( aMNC < 10 ) + { + aOperatorName.AppendNum( KMncLeadingZero ); + aOperatorName.AppendNum( aMNC ); + } + else + { + aOperatorName.AppendNum( aMNC ); + } + ret = KErrNone; } @@ -239,15 +250,34 @@ TDes& aOperatorName ) { TFLOGSTRING("TSY: TOperatorNames::GetMCCMNCName"); -OstTrace0( TRACE_NORMAL, TOPERATORNAMES_GETMCCMNCNAME, "TOperatorNames::GetMCCMNCName" ); +OstTrace0( TRACE_NORMAL, TOPERATORNAMES_GETMCCMNCNAME_TD, "TOperatorNames::GetMCCMNCName" ); aOperatorName.Zero(); if ( aMCC != 0 || aMNC != 0 ) { - aOperatorName.AppendNum( aMCC ); + if ( aMCC < 10 ) + { + aOperatorName.AppendNum( KMccLeadingZero ); + aOperatorName.AppendNum( KMccLeadingZero ); + aOperatorName.AppendNum( aMCC ); + } + else + { + aOperatorName.AppendNum( aMCC ); + } + aOperatorName.Append(' '); // space - aOperatorName.AppendNum( aMNC ); + + if ( aMNC < 10 ) + { + aOperatorName.AppendNum( KMncLeadingZero ); + aOperatorName.AppendNum( aMNC ); + } + else + { + aOperatorName.AppendNum( aMNC ); + } } } @@ -262,7 +292,7 @@ TDes& aOperatorName ) { TFLOGSTRING("TSY: TOperatorNames::GetName"); -OstTrace0( TRACE_NORMAL, TOPERATORNAMES_GETNAME, "TOperatorNames::GetName" ); +OstTrace0( TRACE_NORMAL, TOPERATORNAMES_GETNAME_TD, "TOperatorNames::GetName" ); TInt ret( KErrNotFound ); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/nokiatsy_dll/src/tssparser.cpp --- a/adaptationlayer/tsy/nokiatsy_dll/src/tssparser.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/nokiatsy_dll/src/tssparser.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -37,7 +37,7 @@ TSsParser::TSsParser() { TFLOGSTRING( "TSY: TSsParser::TSsParser" ); -OstTrace0( TRACE_NORMAL, TSSPARSER_TSSPARSER, "TSsParser::TSsParser" ); +OstTrace0( TRACE_NORMAL, TSSPARSER_TSSPARSER_TD, "TSsParser::TSsParser" ); iSsOperation = SS_OPERATION_UNDEFINED; iServiceCode = SS_UNKNOWN_SERVICE; } @@ -52,7 +52,7 @@ TInt TSsParser::Parse( const TDesC& aServiceString ) { TFLOGSTRING2( "TSY: TSsParser::Parse, servicestring: %S", &aServiceString ); -OstTraceExt1( TRACE_NORMAL, TSSPARSER_PARSE, "TSsParser::Parse;aServiceString=%S", aServiceString ); +OstTraceExt1( TRACE_NORMAL, TSSPARSER_PARSE_TD, "TSsParser::Parse;aServiceString=%S", aServiceString ); TInt error( KErrNone ); @@ -61,7 +61,7 @@ 0 >= aServiceString.Length( ) ) { TFLOGSTRING( "TSY: TSsParser::Parse, error: service string too long or does not exist!" ); -OstTrace0( TRACE_NORMAL, DUP1_TSSPARSER_PARSE, "TSsParser::Parse, error: service string too long or does not exist!" ); +OstTrace0( TRACE_NORMAL, DUP1_TSSPARSER_PARSE_TD, "TSsParser::Parse, error: service string too long or does not exist!" ); error = KErrArgument; } @@ -82,13 +82,13 @@ // convert service code to integer iServiceCode = GetInt( tempBuffer ); TFLOGSTRING2( "TSY: TSsParser::Parse, service code: %d", iServiceCode ); -OstTraceExt1( TRACE_NORMAL, DUP2_TSSPARSER_PARSE, "TSsParser::Parse;iServiceCode=%hu", iServiceCode ); +OstTraceExt1( TRACE_NORMAL, DUP2_TSSPARSER_PARSE_TD, "TSsParser::Parse;iServiceCode=%hu", iServiceCode ); if( SS_UNKNOWN_SERVICE == iServiceCode ) { error = KErrArgument; TFLOGSTRING( "TSY: TSsParser::Parse, error: illegal sevice code!" ); -OstTrace0( TRACE_NORMAL, DUP3_TSSPARSER_PARSE, "TSsParser::Parse, error: illegal sevice code!" ); +OstTrace0( TRACE_NORMAL, DUP3_TSSPARSER_PARSE_TD, "TSsParser::Parse, error: illegal sevice code!" ); } } @@ -121,7 +121,7 @@ { error = KErrArgument; TFLOGSTRING( "TSY: TSsParser::Parse, error: illegal end mark!" ); -OstTrace0( TRACE_NORMAL, DUP4_TSSPARSER_PARSE, "TSsParser::Parse, error: illegal end mark!" ); +OstTrace0( TRACE_NORMAL, DUP4_TSSPARSER_PARSE_TD, "TSsParser::Parse, error: illegal end mark!" ); break; } } @@ -131,17 +131,17 @@ } TFLOGSTRING2( "TSY: TSsParser::Parse, SS code: %d", iSsOperation ); -OstTraceExt1( TRACE_NORMAL, DUP5_TSSPARSER_PARSE, "TSsParser::Parse;iSsOperation=%hhu", iSsOperation ); +OstTraceExt1( TRACE_NORMAL, DUP5_TSSPARSER_PARSE_TD, "TSsParser::Parse;iSsOperation=%hhu", iSsOperation ); TFLOGSTRING2( "TSY: TSsParser::Parse, SS code: %d", iServiceCode ); -OstTraceExt1( TRACE_NORMAL, DUP6_TSSPARSER_PARSE, "TSsParser::Parse;iServiceCode=%hu", iServiceCode ); +OstTraceExt1( TRACE_NORMAL, DUP6_TSSPARSER_PARSE_TD, "TSsParser::Parse;iServiceCode=%hu", iServiceCode ); TFLOGSTRING2( "TSY: TSsParser::Parse, SS info A: %S", &iSupplementaryInfoA ); -OstTraceExt1( TRACE_NORMAL, DUP7_TSSPARSER_PARSE, "TSsParser::Parse;iSupplementaryInfoA=%S", iSupplementaryInfoA ); +OstTraceExt1( TRACE_NORMAL, DUP7_TSSPARSER_PARSE_TD, "TSsParser::Parse;iSupplementaryInfoA=%S", iSupplementaryInfoA ); TFLOGSTRING2( "TSY: TSsParser::Parse, SS info B: %S", &iSupplementaryInfoB ); -OstTraceExt1( TRACE_NORMAL, DUP8_TSSPARSER_PARSE, "TSsParser::Parse;iSupplementaryInfoB=%S", iSupplementaryInfoB ); +OstTraceExt1( TRACE_NORMAL, DUP8_TSSPARSER_PARSE_TD, "TSsParser::Parse;iSupplementaryInfoB=%S", iSupplementaryInfoB ); TFLOGSTRING2( "TSY: TSsParser::Parse, SS info C: %S", &iSupplementaryInfoC ); -OstTraceExt1( TRACE_NORMAL, DUP9_TSSPARSER_PARSE, "TSsParser::Parse;iSupplementaryInfoC=%S", iSupplementaryInfoC ); +OstTraceExt1( TRACE_NORMAL, DUP9_TSSPARSER_PARSE_TD, "TSsParser::Parse;iSupplementaryInfoC=%S", iSupplementaryInfoC ); TFLOGSTRING2( "TSY: TSsParser::Parse, SS string left: %S", &iServiceString ); -OstTraceExt1( TRACE_NORMAL, DUP10_TSSPARSER_PARSE, "TSsParser::Parse;iServiceString=%S", iServiceString ); +OstTraceExt1( TRACE_NORMAL, DUP10_TSSPARSER_PARSE_TD, "TSsParser::Parse;iServiceString=%S", iServiceString ); return error; } @@ -156,7 +156,7 @@ void TSsParser::GetSsOperation( TUint8& aSsOperation ) const { TFLOGSTRING( "TSY: TSsParser::GetSsOperation" ); -OstTrace0( TRACE_NORMAL, TSSPARSER_GETSSOPERATION, "TSsParser::GetSsOperation" ); +OstTrace0( TRACE_NORMAL, TSSPARSER_GETSSOPERATION_TD, "TSsParser::GetSsOperation" ); aSsOperation = iSsOperation; } @@ -170,7 +170,7 @@ void TSsParser::GetServiceCode( TUint16& aServiceCode ) const { TFLOGSTRING("TSY: TSsParser::GetServiceCode" ); -OstTrace0( TRACE_NORMAL, TSSPARSER_GETSERVICECODE, "TSsParser::GetServiceCode" ); +OstTrace0( TRACE_NORMAL, TSSPARSER_GETSERVICECODE_TD, "TSsParser::GetServiceCode" ); aServiceCode = iServiceCode; } @@ -187,7 +187,7 @@ TPtrC& aSupplementaryInfoC ) const { TFLOGSTRING( "TSY: TSsParser::GetServiceInfo" ); -OstTrace0( TRACE_NORMAL, TSSPARSER_GETSERVICEINFO, "TSsParser::GetServiceInfo" ); +OstTrace0( TRACE_NORMAL, TSSPARSER_GETSERVICEINFO_TD, "TSsParser::GetServiceInfo" ); aSupplementaryInfoA.Set( iSupplementaryInfoA ); aSupplementaryInfoB.Set( iSupplementaryInfoB ); aSupplementaryInfoC.Set( iSupplementaryInfoC ); @@ -203,7 +203,7 @@ TUint8 TSsParser::ExtractSsOperation( ) { TFLOGSTRING( "TSY: TSsParser::ExtractSsOperation" ); -OstTrace0( TRACE_NORMAL, TSSPARSER_EXTRACTSSOPERATION, "TSsParser::ExtractSsOperation" ); +OstTrace0( TRACE_NORMAL, TSSPARSER_EXTRACTSSOPERATION_TD, "TSsParser::ExtractSsOperation" ); TInt error( KErrNone ); // SS operation is one or two first characters in the service string @@ -212,41 +212,41 @@ iSsOperation = SS_ERASURE; // unregister and deactivate iServiceString.Set( iServiceString.Mid( 2 ) ); // extract remaining part TFLOGSTRING2( "TSY: TSsParser::ExtractSsOperation, SS operation: erasure (%d)", iSsOperation ); -OstTraceExt1( TRACE_NORMAL, DUP1_TSSPARSER_EXTRACTSSOPERATION, "TSsParser::ExtractSsOperation;SS operation: erasure (%hhu)", iSsOperation ); +OstTraceExt1( TRACE_NORMAL, DUP1_TSSPARSER_EXTRACTSSOPERATION_TD, "TSsParser::ExtractSsOperation;SS operation: erasure (%hhu)", iSsOperation ); } else if( iServiceString.Left( 2 ) == KSsOperationInterrogation ) { iSsOperation = SS_INTERROGATION; // check status iServiceString.Set( iServiceString.Mid ( 2 ) ); TFLOGSTRING2( "TSY: TSsParser::ExtractSsOperation, SS operation: interrogation (%d)", iSsOperation ); -OstTraceExt1( TRACE_NORMAL, DUP2_TSSPARSER_EXTRACTSSOPERATION, "TSsParser::ExtractSsOperation;SS operation: interrogation (%hhu)", iSsOperation ); +OstTraceExt1( TRACE_NORMAL, DUP2_TSSPARSER_EXTRACTSSOPERATION_TD, "TSsParser::ExtractSsOperation;SS operation: interrogation (%hhu)", iSsOperation ); } else if( iServiceString.Left( 2 ) == KSsOperationRegistration ) { iSsOperation = SS_REGISTRATION; // register and activate iServiceString.Set( iServiceString.Mid( 2 ) ); TFLOGSTRING2( "TSY: TSsParser::ExtractSsOperation, SS operation: registration (%d)", iSsOperation ); -OstTraceExt1( TRACE_NORMAL, DUP3_TSSPARSER_EXTRACTSSOPERATION, "TSsParser::ExtractSsOperation;SS operation: registration (%hhu)", iSsOperation ); +OstTraceExt1( TRACE_NORMAL, DUP3_TSSPARSER_EXTRACTSSOPERATION_TD, "TSsParser::ExtractSsOperation;SS operation: registration (%hhu)", iSsOperation ); } else if( iServiceString.Left( 1 ) == KSsOperationActivation ) { iSsOperation = SS_ACTIVATION; // activate iServiceString.Set( iServiceString.Mid( 1 ) ); TFLOGSTRING2( "TSY: TSsParser::ExtractSsOperation, SS operation: activation (%d)", iSsOperation ); -OstTraceExt1( TRACE_NORMAL, DUP4_TSSPARSER_EXTRACTSSOPERATION, "TSsParser::ExtractSsOperation;SS operation: activation (%hhu)", iSsOperation ); +OstTraceExt1( TRACE_NORMAL, DUP4_TSSPARSER_EXTRACTSSOPERATION_TD, "TSsParser::ExtractSsOperation;SS operation: activation (%hhu)", iSsOperation ); } else if( iServiceString.Left( 1 ) == KSsOperationDeactivation ) { iSsOperation = SS_DEACTIVATION; // unregister iServiceString.Set( iServiceString.Mid( 1 ) ); TFLOGSTRING2( "TSY: TSsParser::ExtractSsOperation, SS operation: deactivation (%d)", iSsOperation ); -OstTraceExt1( TRACE_NORMAL, DUP5_TSSPARSER_EXTRACTSSOPERATION, "TSsParser::ExtractSsOperation;SS operation: deactivation (%hhu)", iSsOperation ); +OstTraceExt1( TRACE_NORMAL, DUP5_TSSPARSER_EXTRACTSSOPERATION_TD, "TSsParser::ExtractSsOperation;SS operation: deactivation (%hhu)", iSsOperation ); } else { iSsOperation = SS_OPERATION_UNDEFINED; TFLOGSTRING2( "TSY: TSsParser::ExtractSsOperation, SS operation: undefined (%d)", iSsOperation ); -OstTraceExt1( TRACE_NORMAL, DUP6_TSSPARSER_EXTRACTSSOPERATION, "TSsParser::ExtractSsOperation;SS operation: undefined (%hhu)", iSsOperation ); +OstTraceExt1( TRACE_NORMAL, DUP6_TSSPARSER_EXTRACTSSOPERATION_TD, "TSsParser::ExtractSsOperation;SS operation: undefined (%hhu)", iSsOperation ); error = KErrArgument; } @@ -263,7 +263,7 @@ void TSsParser::ExtractPart( TPtrC& aPart ) { TFLOGSTRING( "TSY: TSsParser::ExtractPart" ); -OstTrace0( TRACE_NORMAL, TSSPARSER_EXTRACTPART, "TSsParser::ExtractPart" ); +OstTrace0( TRACE_NORMAL, TSSPARSER_EXTRACTPART_TD, "TSsParser::ExtractPart" ); TUint i( 0 ); // service code and supplementary info ends to '*' or '#' // if there is no data to be extracted, empty buffer is returned. @@ -276,7 +276,7 @@ // extracted part is returned as reference variable aPart.Set( iServiceString.Left( i ) ); TFLOGSTRING2( "TSY: TSsParser::ExtractPart, extracted string: %S", &aPart ); -OstTraceExt1( TRACE_NORMAL, DUP1_TSSPARSER_EXTRACTPART, "TSsParser::ExtractPart;aPart=%S", aPart ); +OstTraceExt1( TRACE_NORMAL, DUP1_TSSPARSER_EXTRACTPART_TD, "TSsParser::ExtractPart;aPart=%S", aPart ); // set remaining part of service string iServiceString.Set( iServiceString.Mid( i ) ); } @@ -291,7 +291,7 @@ TCharacter TSsParser::ExtractSeparator( ) { TFLOGSTRING( "TSY: TSsParser::ExtractSeparator" ); -OstTrace0( TRACE_NORMAL, TSSPARSER_EXTRACTSEPARATOR, "TSsParser::ExtractSeparator" ); +OstTrace0( TRACE_NORMAL, TSSPARSER_EXTRACTSEPARATOR_TD, "TSsParser::ExtractSeparator" ); TCharacter mark( ECharacterIllegal ); // There should be at least the end mark '#' left in string if( iServiceString.Length() > 0 ) @@ -299,13 +299,13 @@ if( '#' == iServiceString[0] ) { TFLOGSTRING( "TSY: TSsParser::ExtractSeparator: end mark '#'" ); -OstTrace0( TRACE_NORMAL, DUP1_TSSPARSER_EXTRACTSEPARATOR, "TSsParser::ExtractSeparator, end mark '#'" ); +OstTrace0( TRACE_NORMAL, DUP1_TSSPARSER_EXTRACTSEPARATOR_TD, "TSsParser::ExtractSeparator, end mark '#'" ); mark = ECharacterEndMark; } else if( '*' == iServiceString[0] ) { TFLOGSTRING( "TSY: TSsParser::ExtractSeparator: separator mark '*'" ); -OstTrace0( TRACE_NORMAL, DUP2_TSSPARSER_EXTRACTSEPARATOR, "TSsParser::ExtractSeparator, separator mark '*'" ); +OstTrace0( TRACE_NORMAL, DUP2_TSSPARSER_EXTRACTSEPARATOR_TD, "TSsParser::ExtractSeparator, separator mark '*'" ); mark = ECharacterSeparator; } // no else @@ -314,7 +314,7 @@ else // end mark was missing { TFLOGSTRING( "TSY: TSsParser::ExtractSeparator: illegal ss string, no end mark!" ); -OstTrace0( TRACE_NORMAL, DUP3_TSSPARSER_EXTRACTSEPARATOR, "TSsParser::ExtractSeparator, illegal ss string, no end mark!" ); +OstTrace0( TRACE_NORMAL, DUP3_TSSPARSER_EXTRACTSEPARATOR_TD, "TSsParser::ExtractSeparator, illegal ss string, no end mark!" ); } return mark; } @@ -329,7 +329,7 @@ TInt TSsParser::GetInt( const TDesC& aString ) { TFLOGSTRING( "TSY: TSsParser::GetInt" ); -OstTrace0( TRACE_NORMAL, TSSPARSER_GETINT, "TSsParser::GetInt" ); +OstTrace0( TRACE_NORMAL, TSSPARSER_GETINT_TD, "TSsParser::GetInt" ); TInt code; if( TLex( aString ).Val( code ) != KErrNone) diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/inc/satcc.h --- a/adaptationlayer/tsy/simatktsy_dll/inc/satcc.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/inc/satcc.h Tue Oct 19 13:16:20 2010 +0300 @@ -171,7 +171,7 @@ * @param aCcstruct structure containing data to be sent * @return phonet sender status */ - TInt SendUSSDEnvelope( const TCallControl& aCcstruct ); + TInt SendUSSDEnvelopeL( const TCallControl& aCcstruct ); /** * send (to sim) call control envelope for Call operation @@ -200,7 +200,7 @@ * @param aIsiMessage Received UICC_CAT_RESP * @return void */ - void UiccCatRespEnvelopeReceived( const TIsiReceiveC& aIsiMessage ); + void UiccCatRespEnvelopeReceivedL( const TIsiReceiveC& aIsiMessage ); /* * This methods returns ETrue when a Ussd string contains @@ -225,7 +225,7 @@ * @param aIsiMessage CALL_MODEM_RESOURCE_IND * @return none */ - void CallModemResourceInd( const TIsiReceiveC& aIsiMessage ); + void CallModemResourceIndL( const TIsiReceiveC& aIsiMessage ); /** * Creates resource control response for modem Call server @@ -234,7 +234,7 @@ * @param aAtkData possible additional response data provided by (U)SIM * @return none */ - void SendCallModemResourceReq( + void SendCallModemResourceReqL( const TCallControl& aTcc, const TUint8 aResult, TPtrC8 aAtkData ); @@ -244,7 +244,7 @@ * @param aIsiMessage SS_RESOURCE_CONTROL_IND * @return none */ - void SsResourceControlInd( const TIsiReceiveC& aIsiMessage ); + void SsResourceControlIndL( const TIsiReceiveC& aIsiMessage ); /** * Creates resource control response for modem SS server @@ -255,7 +255,7 @@ * @param aAtkData possible additional response data provided by (U)SIM * @return none */ - void SendSsResourceControlReq( + void SendSsResourceControlReqL( const TCallControl& aTcc, const TUint8 aSw1, const TUint8 aSw2, diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/inc/satdatadownload.h --- a/adaptationlayer/tsy/simatktsy_dll/inc/satdatadownload.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/inc/satdatadownload.h Tue Oct 19 13:16:20 2010 +0300 @@ -142,7 +142,7 @@ * @param aIsiMessage ISI message received by Phonetsy * @return None */ - void SmsSimMsgIndReceived( const TIsiReceiveC& aIsiMessage ); + void SmsSimMsgIndReceivedL( const TIsiReceiveC& aIsiMessage ); /** * Build an SMS RECEIVE MSG report to SMS server diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/inc/satmesshandler.h --- a/adaptationlayer/tsy/simatktsy_dll/inc/satmesshandler.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/inc/satmesshandler.h Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 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" @@ -40,17 +40,17 @@ // Bitmask for status bit of call control in USIM const TUint8 KCallControlBitMaskUsim( 0x20 ); // Bitmask for status bit of call control in SIM -const TUint8 KCallControlBitMaskSim( 0x08 ); +const TUint8 KCallControlBitMaskSim( 0xC0 ); // Bitmask for status bit of SMS PP DD in USIM const TUint8 KSmsPpDdBitMaskUsim( 0x08 ); // Bitmask for status bit of SMS PP DD in SIM -const TUint8 KSmsPpDdBitMaskSim( 0x02 ); +const TUint8 KSmsPpDdBitMaskSim( 0x0C ); // Bitmask for status bit of MO SMS control in USIM const TUint8 KMoSmsControlBitMaskUsim( 0x40 ); // Bitmask for status bit of MO SMS control in SIM -const TUint8 KMoSmsControlBitMaskSim( 0x10 ); +const TUint8 KMoSmsControlBitMaskSim( 0x03 ); // Bitmask for status bit of USSD CC in SIM -const TUint8 KMoUssdCallControlBitMaskSim( 0x01 ); +const TUint8 KMoUssdCallControlBitMaskSim( 0x03 ); // Unique transaction IDs for UICC messages const TUint8 KUiccTrIdCommon( 0xFA ); const TUint8 KUiccTrIdReadSatIcon( 0xFB ); @@ -58,9 +58,9 @@ const TUint8 KUiccTrIdReadIconInstancePhase1( 0xF7 ); const TUint8 KUiccTrIdReadIconInstancePhase2( 0xF6 ); const TUint8 KUiccTrIdServiceTableByte4( 0xFC ); -const TUint8 KUiccTrIdServiceTableByte5( 0xF9 ); +const TUint8 KUiccTrIdServiceTableByte10( 0xF9 ); const TUint8 KUiccTrIdServiceTableByte7( 0xFD ); -const TUint8 KUiccTrIdServiceTableByte6( 0xFF ); +const TUint8 KUiccTrIdServiceTableByte11( 0xFF ); // PollInterval, PollingOff const TUint8 KDefaultPollInterval( 0x00 ); @@ -550,7 +550,7 @@ * @param TIsiReceiveC& aIsiMessage response to envelope * @return none */ - void InfoSerialNumberReadResp( const TIsiReceiveC& aIsiMessage ); + //void InfoSerialNumberReadResp( const TIsiReceiveC& aIsiMessage ); /** * Send NET_NEIGHBOUR_CELLS_REQ message to Phonet. @@ -634,7 +634,7 @@ * @param aStatus SIM server status * @return none */ - void RefreshResult( TUint8 aStatus ); + void RefreshResultL( TUint8 aStatus ); /** * Method to check SIM server response to a set polling request @@ -688,7 +688,7 @@ * @param aTarget: requested data * return value TInt : success/failure value */ - TInt InfoSerialNumberReadReq( TUint8 aTransId, TUint8 aTarget ); + //TInt InfoSerialNumberReadReq( TUint8 aTransId, TUint8 aTarget ); /** * Creates NET_CELL_INFO_GET_REQ ISI message and sends it to Phonet @@ -815,7 +815,7 @@ * @param aIsiMessage received indication * @return none */ - void InfoPpReadResp( const TIsiReceiveC& aIsiMessage ); + void InfoPpReadRespL( const TIsiReceiveC& aIsiMessage ); /** * Validates lengths of simple tlv objects inside BER TLV @@ -1085,14 +1085,14 @@ * @param aIsiMsg proactive command * @return none */ - void PhoneInfoMessageReceived( const TIsiReceiveC& aIsiMessage ); + //void PhoneInfoMessageReceivedL( const TIsiReceiveC& aIsiMessage ); /** * Handles the UICC server related messages * @param aIsiMessage received ISI message * @return Information about handling of response */ - TBool UiccServerMessageReceived( const TIsiReceiveC& aIsiMessage ); + TBool UiccServerMessageReceivedL( const TIsiReceiveC& aIsiMessage ); /** * Handles the Sms server related messages @@ -1129,19 +1129,6 @@ const TIsiReceiveC& aIsiMessage ); /** - * Sends a PN_ATK message with the data given as parameter - * @since NCP 5.1 - * @param aReceiverObject: Receiver object ID - * @param aTransactionId: Message Transaction ID - * @param aMessageId: Message identifier - * @param aData: Message data to be sent - * @return Error/Success value from sending the message - */ - TInt CSatMessHandler::SendPnAtkMessage( const TUint8 aReceiverObject, - const TUint8 aTransactionId, const TInt aMessageId, - const TDesC8& aData ); - - /** * Breaks UICC_APPL_CMD_RESP ISI message * @param aReceiverObject: Receiver object ID * @return None @@ -1153,7 +1140,7 @@ * @param aIsiMessage Received ISI message * @return None */ - void UiccCatInd( const TIsiReceiveC& aIsiMessage ); + void UiccCatIndL( const TIsiReceiveC& aIsiMessage ); private: // Data @@ -1172,6 +1159,9 @@ // Save the SimReadField transaction id used by DataDownload. TInt iDataDownloadSimReadFieldTraId; + // Save the SMS_CB_ROUTING_REQ transaction id used by DataDownload. + TInt iCbRoutingReqTraId; + // Variable for storing card id TUint8 iCardId; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/inc/satmosmsctrl.h --- a/adaptationlayer/tsy/simatktsy_dll/inc/satmosmsctrl.h Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/inc/satmosmsctrl.h Tue Oct 19 13:16:20 2010 +0300 @@ -188,6 +188,31 @@ */ void FormSmsResourceReqSb( const TUint8 status,TDes8& data, const TDes8& address1, const TDes8& address2 ); + /* + * Forms MO SMS Ctrl envelope to be sent to the SIM card + * @return void + */ + void FormMoSmsCtrlEnvelope(); + + /* + * Constructs and sends SMS_RESOURCE_REQ to SMS server + * @param aResourceStatus resource status used in req + * @param aCauseType cause type used in req + * @param aCause cause used in req + * @return void + */ + void SendSmsResourceReq( + TUint8 aResourceStatus, + TUint8 aCauseType, + TUint8 aCause ); + + /* + * Fetches TP-DA contents from TPDU + * @param aTpdu input TPDU + * @param aTpda holds resulting Tpda + * @return TUint8 message type + */ + static TUint8 FetchTpDa( const TDesC8& aTpdu, TPtrC8& aTpda ); private: // Data diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/src/ber_tlv.cpp --- a/adaptationlayer/tsy/simatktsy_dll/src/ber_tlv.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/src/ber_tlv.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -42,7 +42,7 @@ TUint8 aTag //tag ) { - OstTrace0( TRACE_DETAILED, TTLVBASE_BEGIN, "TTlvBase::Begin" ); + OstTrace0( TRACE_INTERNALS, TTLVBASE_BEGIN_TD, "TTlvBase::Begin" ); TFLOGSTRING("TSY: TTlvBase::Begin"); iData.Zero(); iData.Append( aTag ); @@ -59,7 +59,7 @@ TUint8 aTag //tag ) { - OstTrace0( TRACE_DETAILED, TTLVBASE_ADDTAG, "TTlvBase::AddTag" ); + OstTrace0( TRACE_INTERNALS, TTLVBASE_ADDTAG_TD, "TTlvBase::AddTag" ); TFLOGSTRING("TSY: TTlvBase::AddTag"); iData.Append( aTag ); // tag iData.Append( 0 ); // length @@ -76,7 +76,7 @@ TUint8 aValue ) { - OstTrace0( TRACE_DETAILED, TTLVBASE_ADDBYTE, "TTlvBase::AddByte" ); + OstTrace0( TRACE_INTERNALS, TTLVBASE_ADDBYTE_TD, "TTlvBase::AddByte" ); TFLOGSTRING("TSY: TTlvBase::AddByte"); iData.Append( aValue ); iData[iLenIndex]++; @@ -92,7 +92,7 @@ const TDesC8& aValue ) { - OstTrace0( TRACE_DETAILED, TTLVBASE_ADDDATA, "TTlvBase::AddData" ); + OstTrace0( TRACE_INTERNALS, TTLVBASE_ADDDATA_TD, "TTlvBase::AddData" ); TFLOGSTRING("TSY: TTlvBase::AddData"); iData.Append( aValue ); iData[iLenIndex] = TUint8(iData[iLenIndex] + aValue.Length()); @@ -108,7 +108,7 @@ // const TDesC8& TTlvBase::End() { - OstTrace0( TRACE_DETAILED, TTLVBASE_END, "TTlvBase::End" ); + OstTrace0( TRACE_INTERNALS, TTLVBASE_END_TD, "TTlvBase::End" ); TFLOGSTRING("TSY: TTlvBase::End"); _LIT8( KLenTag, "\x81" ); @@ -149,7 +149,7 @@ // const TDesC8& TTlvBase::GetDataWithoutTopLevelTag() { - OstTrace0( TRACE_DETAILED, TTLVBASE_GETDATAWITHOUTTOPLEVELTAG, "TTlvBase::GetDataWithoutTopLevelTag" ); + OstTrace0( TRACE_INTERNALS, TTLVBASE_GETDATAWITHOUTTOPLEVELTAG_TD, "TTlvBase::GetDataWithoutTopLevelTag" ); TFLOGSTRING("TSY: TTlvBase::GetDataWithoutTopLevelTag"); _LIT8( KLenTag, "\x81" ); @@ -180,7 +180,7 @@ // CBerTlv::CBerTlv() { - OstTrace0( TRACE_DETAILED, CBERTLV_CBERTLV, "CBerTlv::CBerTlv" ); + OstTrace0( TRACE_INTERNALS, CBERTLV_CBERTLV_TD, "CBerTlv::CBerTlv" ); TFLOGSTRING("TSY: CBerTlv::CBerTlv"); //none } @@ -200,7 +200,7 @@ TInt aItemNbr //item number ) { - OstTrace0( TRACE_DETAILED, CBERTLV_TLVBYTAGVALUE, "CBerTlv::TlvByTagValue" ); + OstTrace0( TRACE_INTERNALS, CBERTLV_TLVBYTAGVALUE_TD, "CBerTlv::TlvByTagValue" ); TFLOGSTRING("TSY: CBerTlv::TlvByTagValue"); TInt currentTlv( 0 ); TInt tlvLength( 0 ); @@ -287,7 +287,7 @@ TUint8 aTlvTagValue // tag of tlv to find ) { - OstTrace0( TRACE_DETAILED, CBERTLV_TLVBYTAGVALUEMULTI, "CBerTlv::TlvByTagValueMulti" ); + OstTrace0( TRACE_INTERNALS, CBERTLV_TLVBYTAGVALUEMULTI_TD, "CBerTlv::TlvByTagValueMulti" ); TFLOGSTRING("TSY: CBerTlv::TlvByTagValueMulti"); TInt currentTlv( 0 ); @@ -363,7 +363,7 @@ // CTlv::CTlv() { - OstTrace0( TRACE_DETAILED, CTLV_CTLV, "CTlv::CTlv" ); + OstTrace0( TRACE_INTERNALS, CTLV_CTLV_TD, "CTlv::CTlv" ); TFLOGSTRING("TSY: CTlv::CTlv"); //none } @@ -379,7 +379,7 @@ TTlvSpesificDataType aType //Info spesific data type ) { - OstTrace0( TRACE_DETAILED, CTLV_GETSHORTINFO, "CTlv::GetShortInfo" ); + OstTrace0( TRACE_INTERNALS, CTLV_GETSHORTINFO_TD, "CTlv::GetShortInfo" ); TFLOGSTRING("TSY: CTlv::GetShortInfo"); //information is generally at index 2. NOTE! This method should be optimised @@ -908,7 +908,7 @@ { // Data type did not match with any of enumerations TFLOGSTRING2("TSY: CTlv::GetShortInfo, Unknown data type:0x%x", aType); - OstTrace1( TRACE_DETAILED, DUP1_CTLV_GETSHORTINFO, "CTlv::GetShortInfo Unknown data type: %{TTlvSpesificDataType}", aType ); + OstTrace1( TRACE_INTERNALS, DUP1_CTLV_GETSHORTINFO_TD, "CTlv::GetShortInfo Unknown data type: %{TTlvSpesificDataType}", aType ); } @@ -926,7 +926,7 @@ TTlvSpesificDataType aType //Info spesific data type ) { - OstTrace0( TRACE_DETAILED, CTLV_GETDATA, "CTlv::GetData" ); + OstTrace0( TRACE_INTERNALS, CTLV_GETDATA_TD, "CTlv::GetData" ); TFLOGSTRING("TSY: CTlv::GetData"); //information is generally at index 2. @@ -1481,7 +1481,7 @@ { // Data type did not match TFLOGSTRING2("TSY: CTlv::GetData, Unknown data type: 0x%x", aType ); - OstTrace1( TRACE_DETAILED, DUP2_CTLV_GETDATA, "CTlv::GetData Unknown data type: %{TTlvSpesificDataType}", aType ); + OstTrace1( TRACE_INTERNALS, DUP2_CTLV_GETDATA_TD, "CTlv::GetData Unknown data type: %{TTlvSpesificDataType}", aType ); } @@ -1500,7 +1500,7 @@ TTlvSpesificDataType aType //Info spesific data type ) { - OstTrace0( TRACE_DETAILED, CTLV_GETLONGINFO, "CTlv::GetLongInfo" ); + OstTrace0( TRACE_INTERNALS, CTLV_GETLONGINFO_TD, "CTlv::GetLongInfo" ); TFLOGSTRING("TSY: CTlv::GetLongInfo"); TUint16 ret( 0x0000 ); @@ -1568,7 +1568,7 @@ { // Data type did not match TFLOGSTRING2("TSY: CTlv::GetLongInfo, Unknown data type:0x%x", aType ); - OstTrace1( TRACE_DETAILED, DUP1_CTLV_GETLONGINFO, "CTlv::GetLongInfo, Unknown data type: %{TTlvSpesificDataType}", aType ); + OstTrace1( TRACE_INTERNALS, DUP1_CTLV_GETLONGINFO_TD, "CTlv::GetLongInfo, Unknown data type: %{TTlvSpesificDataType}", aType ); } return ret; @@ -1584,7 +1584,7 @@ // TInt CBerTlv::BerTlv( const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_DETAILED, CBERTLV_BERTLV, "CBerTlv::BerTlv" ); + OstTrace0( TRACE_INTERNALS, CBERTLV_BERTLV_TD, "CBerTlv::BerTlv" ); TFLOGSTRING("TSY: CBerTlv::BerTlv"); TInt result ( KErrNotFound ); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/src/satcc.cpp --- a/adaptationlayer/tsy/simatktsy_dll/src/satcc.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/src/satcc.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 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" @@ -67,6 +67,7 @@ const TUint8 KMSBMask = 0x80; const TUint8 KSw1Sw2Unknown = 0; const TUint8 KValidTonNpi = 0x3F; +const TUint8 KSw1Sw2Length = 2; // ==================== MEMBER FUNCTIONS ==================================== @@ -88,7 +89,7 @@ iTonNpiPresent( EFalse ), iEnvelopeResponseData( NULL ) { - OstTrace0( TRACE_NORMAL, CSATCC_CSATCC, "CSatCC::CSatCC" ); + OstTrace0( TRACE_NORMAL, CSATCC_CSATCC_TD, "CSatCC::CSatCC" ); } // ----------------------------------------------------------------------------- @@ -98,7 +99,7 @@ // void CSatCC::ConstructL() { - OstTrace0( TRACE_NORMAL, CSATCC_CONSTRUCTL, "CSatCC::ConstructL" ); + OstTrace0( TRACE_NORMAL, CSATCC_CONSTRUCTL_TD, "CSatCC::ConstructL" ); TFLOGSTRING("TSY: CSatCC::ConstructL"); // Create array for CC request information storing @@ -118,7 +119,7 @@ CTsySatMessaging* aSatMessaging //Pointer to satmessaging class ) { - OstTrace0( TRACE_NORMAL, CSATCC_NEWL, "CSatCC::NewL" ); + OstTrace0( TRACE_NORMAL, CSATCC_NEWL_TD, "CSatCC::NewL" ); TFLOGSTRING("TSY: CSatCC::NewL"); CSatCC* self = new( ELeave ) CSatCC( aSatMessHandler, aSatMessaging ); @@ -138,7 +139,7 @@ // CSatCC::~CSatCC() { - OstTrace0( TRACE_NORMAL, DUP1_CSATCC_CSATCC, "CSatCC::~CSatCC" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATCC_CSATCC_TD, "CSatCC::~CSatCC" ); TFLOGSTRING("TSY: CSatCC::~CSatCC"); if( iCallControlArray ) @@ -165,7 +166,7 @@ const TInt &aTid ) { - OstTrace0( TRACE_NORMAL, CSATCC_GETARRAYINDEXBYID, "CSatCC::GetArrayIndexById" ); + OstTrace0( TRACE_NORMAL, CSATCC_GETARRAYINDEXBYID_TD, "CSatCC::GetArrayIndexById" ); TFLOGSTRING("TSY: CSatCC::GetArrayIndexById"); TInt ret ( KErrNotFound ); @@ -184,7 +185,7 @@ if ( KErrNotFound == ret) { TFLOGSTRING3("TSY: CSatCC::GetArrayIndexById, Error:ID 0x%x not found. Array size: %d", aTid, arraySize ); - OstTraceExt2( TRACE_NORMAL, DUP1_CSATCC_GETARRAYINDEXBYID, "CSatCC::GetArrayIndexById, Error: ID 0x%x not found. Array size: %d", aTid, arraySize ); + OstTraceExt2( TRACE_NORMAL, DUP1_CSATCC_GETARRAYINDEXBYID_TD, "CSatCC::GetArrayIndexById, Error: ID 0x%x not found. Array size: %d", aTid, arraySize ); } } else @@ -205,7 +206,7 @@ TTlv& aTlv //Tlv to be sent ) { - OstTrace0( TRACE_NORMAL, CSATCC_ADDLOCATIONINFORMATIONTOTLV, "CSatCC::AddLocationInformationToTlv" ); + OstTrace0( TRACE_NORMAL, CSATCC_ADDLOCATIONINFORMATIONTOTLV_TD, "CSatCC::AddLocationInformationToTlv" ); TFLOGSTRING("TSY: CSatCC::AddLocationInformationToTlv"); const CSatMessHandler::TLocationInfo& locInfo @@ -231,7 +232,7 @@ const TCallControl& aCcstruct //Structure containing call event info ) { - OstTrace0( TRACE_NORMAL, CSATCC_SENDSSENVELOPE, "CSatCC::SendSSEnvelope" ); + OstTrace0( TRACE_NORMAL, CSATCC_SENDSSENVELOPE_TD, "CSatCC::SendSSEnvelope" ); TFLOGSTRING("TSY: CSatCC::SendSSEnvelope"); // create envelope @@ -358,16 +359,17 @@ // ----------------------------------------------------------------------------- -// CSatCC::SendUSSDEnvelope +// CSatCC::SendUSSDEnvelopeL // Sends call control USSD envelope // ----------------------------------------------------------------------------- // -TInt CSatCC::SendUSSDEnvelope +TInt CSatCC::SendUSSDEnvelopeL ( const TCallControl& aCcstruct //Structure containing call event info ) { - OstTrace0( TRACE_NORMAL, CSATCC_SENDUSSDENVELOPE, "CSatCC::SendUSSDEnvelope" ); + TFLOGSTRING( "TSY: CSatCC::SendUSSDEnvelopeL" ); + OstTrace0( TRACE_NORMAL, CSATCC_SENDUSSDENVELOPEL_TD, "CSatCC::SendUSSDEnvelopeL" ); TInt ret( KErrNone ); // create envelope @@ -419,11 +421,11 @@ // impossible. Remove the created CcStruct from the CC array and // send CC event response. TPtrC8 atkData; - SendSsResourceControlReq( - aCcstruct, - KSw1Sw2Unknown, - KSw1Sw2Unknown, - KError, + SendSsResourceControlReqL( + aCcstruct, + KSw1Sw2Unknown, + KSw1Sw2Unknown, + KError, atkData ); TInt index( GetArrayIndexById( aCcstruct.iTransId ) ); @@ -449,7 +451,7 @@ const TCallControl& aCallControl //Structure containing call event info ) { - OstTrace0( TRACE_NORMAL, CSATCC_SENDCALLENVELOPE, "CSatCC::SendCallEnvelope" ); + OstTrace0( TRACE_NORMAL, CSATCC_SENDCALLENVELOPE_TD, "CSatCC::SendCallEnvelope" ); // create envelope TTlv envelope; @@ -517,7 +519,7 @@ const TDesC8& aPdpContextActivationParams ) { - OstTrace0( TRACE_NORMAL, CSATCC_SENDPDPCONTEXTACTIVATIONENVELOPE, "CSatCC::SendPdpContextActivationEnvelope" ); + OstTrace0( TRACE_NORMAL, CSATCC_SENDPDPCONTEXTACTIVATIONENVELOPE_TD, "CSatCC::SendPdpContextActivationEnvelope" ); TFLOGSTRING( "TSY: CSatCC::SendPdpContextActivationEnvelope" ); // Create envelope TTlv envelope; @@ -537,14 +539,14 @@ } // ----------------------------------------------------------------------------- -// CSatCC::UiccCatRespEnvelopeReceived +// CSatCC::UiccCatRespEnvelopeReceivedL // Handler function of incoming call control related data notification messages // ----------------------------------------------------------------------------- // -void CSatCC::UiccCatRespEnvelopeReceived( const TIsiReceiveC& aIsiMessage ) +void CSatCC::UiccCatRespEnvelopeReceivedL( const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATCC_UICCCATRESPENVELOPERECEIVED, "CSatCC::UiccCatRespEnvelopeReceived" ); - TFLOGSTRING( "TSY:CSatCC::UiccCatRespEnvelopeReceived" ); + OstTrace0( TRACE_NORMAL, CSATCC_UICCCATRESPENVELOPERECEIVEDL_TD, "CSatCC::UiccCatRespEnvelopeReceivedL" ); + TFLOGSTRING( "TSY:CSatCC::UiccCatRespEnvelopeReceivedL" ); TUint8 status( aIsiMessage.Get8bit( ISI_HEADER_SIZE + UICC_CAT_RESP_OFFSET_STATUS ) ); @@ -585,20 +587,20 @@ { case PN_MODEM_CALL: { - SendCallModemResourceReq( + SendCallModemResourceReqL( ( *iCallControlArray )[ccIndex], result, - apduData ); + apduData.Mid( 0, apduData.Length() - KSw1Sw2Length ) ); break; } case PN_SS: { - SendSsResourceControlReq( + SendSsResourceControlReqL( ( *iCallControlArray )[ccIndex], sw1, sw2, result, - apduData ); + apduData.Mid( 0, apduData.Length() - KSw1Sw2Length ) ); break; } case PN_GPDS: @@ -606,7 +608,7 @@ SendGpdsResourceControlReq( ( *iCallControlArray )[ccIndex], result, - apduData ); + apduData.Mid( 0, apduData.Length() - KSw1Sw2Length ) ); break; } default: @@ -620,8 +622,8 @@ } else // Subblock is mandatory { - TFLOGSTRING("TSY: CSatMessHandler::UiccCatRespEnvelopeReceived - Mandatory subblock UICC_SB_APDU not found"); - OstTrace0( TRACE_NORMAL, DUP1_CSATCC_UICCCATRESPENVELOPERECEIVED, "CSatCC::UiccCatRespEnvelopeReceived - Mandatory subblock UICC_SB_APDU not found" ); + TFLOGSTRING("TSY: CSatMessHandler::UiccCatRespEnvelopeReceivedL - Mandatory subblock UICC_SB_APDU not found"); + OstTrace0( TRACE_NORMAL, DUP1_CSATCC_UICCCATRESPENVELOPERECEIVEDL_TD, "CSatCC::UiccCatRespEnvelopeReceivedL - Mandatory subblock UICC_SB_APDU not found" ); } } // End of if ( UICC_STATUS_OK == status ) } @@ -636,7 +638,7 @@ // void CSatCC::ClearArraysForRefresh() { - OstTrace0( TRACE_NORMAL, CSATCC_CLEARARRAYSFORREFRESH, "CSatCC::ClearArraysForRefresh" ); + OstTrace0( TRACE_NORMAL, CSATCC_CLEARARRAYSFORREFRESH_TD, "CSatCC::ClearArraysForRefresh" ); TFLOGSTRING("TSY: CSatCC::ClearArraysForRefresh"); iCallControlArray->Reset(); @@ -652,7 +654,7 @@ TBool aStatus ) { - OstTrace0( TRACE_NORMAL, CSATCC_SETSTATUSOFUSSDSUPPORT, "CSatCC::SetStatusOfUssdSupport" ); + OstTrace0( TRACE_NORMAL, CSATCC_SETSTATUSOFUSSDSUPPORT_TD, "CSatCC::SetStatusOfUssdSupport" ); TFLOGSTRING("TSY: CSatCC::SetStatusOfUssdSupport"); iUssdTlvSupported = aStatus; } @@ -670,7 +672,7 @@ TPtrC8 aUSSDString ) { - OstTrace0( TRACE_NORMAL, CSATCC_ISONLYDIGITSINUSSD, "CSatCC::IsOnlyDigitsInUssd" ); + OstTrace0( TRACE_NORMAL, CSATCC_ISONLYDIGITSINUSSD_TD, "CSatCC::IsOnlyDigitsInUssd" ); TFLOGSTRING("TSY: CSatCC::IsOnlyDigitsInUssd"); // Unpack it @@ -706,7 +708,7 @@ const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATCC_MESSAGERECEIVEDL, "CSatCC::MessageReceivedL" ); + OstTrace0( TRACE_NORMAL, CSATCC_MESSAGERECEIVEDL_TD, "CSatCC::MessageReceivedL" ); TFLOGSTRING("TSY: CSatCC::MessageReceivedL"); TUint8 resource( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) ); @@ -719,13 +721,13 @@ { case CALL_MODEM_RESOURCE_IND: { - CallModemResourceInd( aIsiMessage ); + CallModemResourceIndL( aIsiMessage ); break; } case CALL_MODEM_RESOURCE_CONF_IND: { TFLOGSTRING("TSY: CSatCC::MessageReceived, CALL_MODEM_RESOURCE_CONF_IND"); - OstTrace0( TRACE_NORMAL, DUP1_CSATCC_MESSAGERECEIVED, "TSY: CSatCC::MessageReceived, CALL_MODEM_RESOURCE_CONF_IND" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATCC_MESSAGERECEIVED_TD, "TSY: CSatCC::MessageReceived, CALL_MODEM_RESOURCE_CONF_IND" ); if ( CALL_MODEM_RES_CONF_STARTUP == aIsiMessage.Get8bit( ISI_HEADER_SIZE + @@ -753,14 +755,14 @@ case CALL_MODEM_RESOURCE_CONF_RESP: { TFLOGSTRING("TSY: CSatCC::MessageReceived, CALL_MODEM_RESOURCE_CONF_RESP"); - OstTrace0( TRACE_NORMAL, DUP2_CSATCC_MESSAGERECEIVED, "TSY: CSatCC::MessageReceived, CALL_MODEM_RESOURCE_CONF_RESP" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATCC_MESSAGERECEIVED_TD, "TSY: CSatCC::MessageReceived, CALL_MODEM_RESOURCE_CONF_RESP" ); if ( CALL_MODEM_RES_CONF_SET == aIsiMessage.Get8bit( ISI_HEADER_SIZE + CALL_MODEM_RESOURCE_CONF_RESP_OFFSET_CONFOPERATION ) ) { TFLOGSTRING("TSY: CSatCC::MessageReceived, CALL_MODEM_RESOURCE_CONF_RESP Resource configured"); - OstTrace0( TRACE_NORMAL, DUP3_CSATCC_MESSAGERECEIVED, "TSY: CSatCC::MessageReceived, CALL_MODEM_RESOURCE_CONF_RESP Resource configured" ); + OstTrace0( TRACE_NORMAL, DUP3_CSATCC_MESSAGERECEIVED_TD, "TSY: CSatCC::MessageReceived, CALL_MODEM_RESOURCE_CONF_RESP Resource configured" ); } break; @@ -768,7 +770,7 @@ case CALL_MODEM_RESOURCE_RESP: { TFLOGSTRING("TSY: CSatCC::MessageReceived, CALL_MODEM_RESOURCE_RESP Resource control sequence done"); - OstTrace0( TRACE_NORMAL, DUP4_CSATCC_MESSAGERECEIVED, "TSY: CSatCC::MessageReceived, CALL_MODEM_RESOURCE_RESP Resource control sequence done" ); + OstTrace0( TRACE_NORMAL, DUP4_CSATCC_MESSAGERECEIVED_TD, "TSY: CSatCC::MessageReceived, CALL_MODEM_RESOURCE_RESP Resource control sequence done" ); break; } @@ -786,13 +788,13 @@ { case SS_RESOURCE_CONTROL_IND: { - SsResourceControlInd( aIsiMessage ); + SsResourceControlIndL( aIsiMessage ); break; } case SS_RESOURCE_CONF_IND: { TFLOGSTRING("TSY: CSatCC::MessageReceived, SS_RESOURCE_CONF_IND"); - OstTrace0( TRACE_NORMAL, DUP5_CSATCC_MESSAGERECEIVED, "TSY: CSatCC::MessageReceived, SS_RESOURCE_CONF_IND" ); + OstTrace0( TRACE_NORMAL, DUP5_CSATCC_MESSAGERECEIVED_TD, "TSY: CSatCC::MessageReceived, SS_RESOURCE_CONF_IND" ); if ( SS_RESOURCE_CONF_READY == aIsiMessage.Get8bit( ISI_HEADER_SIZE + @@ -813,7 +815,7 @@ SS_RESOURCE_CONF_RESP_OFFSET_CONFOPERATION ) ) { TFLOGSTRING("TSY: CSatCC::MessageReceived, SS_RESOURCE_CONF_RESP Resource configured"); - OstTrace0( TRACE_NORMAL, DUP6_CSATCC_MESSAGERECEIVED, "TSY: CSatCC::MessageReceived, SS_RESOURCE_CONF_RESP Resource configured" ); + OstTrace0( TRACE_NORMAL, DUP6_CSATCC_MESSAGERECEIVED_TD, "TSY: CSatCC::MessageReceived, SS_RESOURCE_CONF_RESP Resource configured" ); } break; @@ -859,14 +861,14 @@ case GPDS_RESOURCE_CONTROL_RESP: { TFLOGSTRING("TSY: CSatCC::MessageReceived, GPDS_RESOURCE_CONTROL_RESP Resource control sequence done"); - OstTrace0( TRACE_NORMAL, DUP7_CSATCC_MESSAGERECEIVED, "TSY: CSatCC::MessageReceived, GPDS_RESOURCE_CONTROL_RESP Resource control sequence done" ); + OstTrace0( TRACE_NORMAL, DUP7_CSATCC_MESSAGERECEIVED_TD, "TSY: CSatCC::MessageReceived, GPDS_RESOURCE_CONTROL_RESP Resource control sequence done" ); break; } case GPDS_RESOURCE_CONF_IND: { TFLOGSTRING("TSY: CSatCC::MessageReceived, GPDS_RESOURCE_CONF_IND"); - OstTrace0( TRACE_NORMAL, DUP8_CSATCC_MESSAGERECEIVED, "TSY: CSatCC::MessageReceived, GPDS_RESOURCE_CONF_IND" ); + OstTrace0( TRACE_NORMAL, DUP8_CSATCC_MESSAGERECEIVED_TD, "TSY: CSatCC::MessageReceived, GPDS_RESOURCE_CONF_IND" ); if ( iCallControlOnGPRSEnabled ) { @@ -881,7 +883,7 @@ GPDS_RESOURCE_CONF_RESP_OFFSET_CONFOPERATION ) ) { TFLOGSTRING("TSY: CSatCC::MessageReceived, GPDS_RESOURCE_CONF_RESP Resource configured"); - OstTrace0( TRACE_NORMAL, DUP9_CSATCC_MESSAGERECEIVED, "TSY: CSatCC::MessageReceived, GPDS_RESOURCE_CONF_RESP Resource configured" ); + OstTrace0( TRACE_NORMAL, DUP9_CSATCC_MESSAGERECEIVED_TD, "TSY: CSatCC::MessageReceived, GPDS_RESOURCE_CONF_RESP Resource configured" ); } break; @@ -930,52 +932,82 @@ // Check call control status if ( KUiccTrIdServiceTableByte4 == trId ) { - TUint8 usedBitMaskCallControl( KCallControlBitMaskUsim ); - if ( UICC_CARD_TYPE_ICC == cardType ) - { - usedBitMaskCallControl = KCallControlBitMaskSim; - } + TInt ret( KErrNone ); // Bit 6 is the status bit of call control - if ( fileData[0] & usedBitMaskCallControl ) + if ( fileData[0] & KCallControlBitMaskUsim ) { // Call control enabled in (U)SIM iCallControlEnabled = ETrue; - iSatMessHandler->CallModemResourceConfReq( + ret = iSatMessHandler->CallModemResourceConfReq( CALL_MODEM_RES_ID_MO_INIT | CALL_MODEM_RES_ID_MT_INIT, CALL_MODEM_RES_ID_MASK_MO_INIT | CALL_MODEM_RES_ID_MASK_MT_INIT ); - iSatMessHandler->SsResourceConfReq(); + User::LeaveIfError( ret ); + ret = iSatMessHandler->SsResourceConfReq(); + User::LeaveIfError( ret ); } else { // Call control disabled in (U)SIM iCallControlEnabled = EFalse; - iSatMessHandler->CallModemResourceConfReq( + ret = iSatMessHandler->CallModemResourceConfReq( CALL_MODEM_RES_ID_MT_INIT, CALL_MODEM_RES_ID_MASK_MT_INIT ); + User::LeaveIfError( ret ); } } - // Check call control GPRS status + // Check call control GPRS status (UICC) or + // Call control status (ICC) else if ( KUiccTrIdServiceTableByte7 == trId ) { - if ( fileData[0] & KCallControlBitMaskUsim ) + TInt ret( KErrNone ); + if ( UICC_CARD_TYPE_UICC == cardType ) + { + if ( fileData[0] & KCallControlBitMaskUsim ) + { + // Call control on GPRS enabled in USIM + iCallControlOnGPRSEnabled = ETrue; + ret = iSatMessHandler->GpdsResourceConfReq(); + User::LeaveIfError( ret ); + } + else + { + // Call control on GPRS disabled in USIM + iCallControlOnGPRSEnabled = EFalse; + } + } + else if ( UICC_CARD_TYPE_ICC == cardType ) { - // Call control on GPRS enabled in USIM - iCallControlOnGPRSEnabled = ETrue; - iSatMessHandler->GpdsResourceConfReq(); - } - else - { - // Call control on GPRS disabled in USIM - iCallControlOnGPRSEnabled = EFalse; + if ( KCallControlBitMaskSim == ( fileData[0] & KCallControlBitMaskSim ) ) + { + // Call control enabled in (U)SIM + iCallControlEnabled = ETrue; + ret = iSatMessHandler->CallModemResourceConfReq( + CALL_MODEM_RES_ID_MO_INIT | + CALL_MODEM_RES_ID_MT_INIT, + CALL_MODEM_RES_ID_MASK_MO_INIT | + CALL_MODEM_RES_ID_MASK_MT_INIT ); + User::LeaveIfError( ret ); + ret = iSatMessHandler->SsResourceConfReq(); + User::LeaveIfError( ret ); + } + else + { + // Call control disabled in (U)SIM + iCallControlEnabled = EFalse; + ret = iSatMessHandler->CallModemResourceConfReq( + CALL_MODEM_RES_ID_MT_INIT, + CALL_MODEM_RES_ID_MASK_MT_INIT ); + User::LeaveIfError( ret ); + } } } } else // Subblock is mandatory { TFLOGSTRING("TSY: CSatCC::MessageReceivedL - Mandatory subblock UICC_SB_FILE_DATA not found"); - OstTrace0( TRACE_NORMAL, DUP1_CSATCC_MESSAGERECEIVEDL, "CSatCC::MessageReceivedL - - Mandatory subblock UICC_SB_FILE_DATA not found" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATCC_MESSAGERECEIVEDL_TD, "CSatCC::MessageReceivedL - - Mandatory subblock UICC_SB_FILE_DATA not found" ); } } // End of if ( UICC_STATUS_OK == status break; @@ -988,7 +1020,7 @@ ISI_HEADER_SIZE + UICC_CAT_RESP_OFFSET_SERVICETYPE ) ); if ( UICC_CAT_ENVELOPE == serviceType ) { - UiccCatRespEnvelopeReceived( aIsiMessage ); + UiccCatRespEnvelopeReceivedL( aIsiMessage ); } break; } @@ -1012,7 +1044,7 @@ const TUint8 aTonNpi ) { - OstTrace0( TRACE_NORMAL, CSATCC_SETTONNPI, "CSatCC::SetTonNpi" ); + OstTrace0( TRACE_NORMAL, CSATCC_SETTONNPI_TD, "CSatCC::SetTonNpi" ); TFLOGSTRING("TSY: CSatCC::SetTonNpi"); iTonNpiForSS = aTonNpi; @@ -1020,14 +1052,14 @@ } // ----------------------------------------------------------------------------- -// CSatCC::CallModemResourceInd +// CSatCC::CallModemResourceIndL // Handles resource control request from modem Call server // ----------------------------------------------------------------------------- // -void CSatCC::CallModemResourceInd( const TIsiReceiveC& aIsiMessage ) +void CSatCC::CallModemResourceIndL( const TIsiReceiveC& aIsiMessage ) { - TFLOGSTRING("TSY: CSatCC::CallModemResourceInd"); - OstTrace0( TRACE_NORMAL, CSATCC_CALLMODEMRESOURCEIND, "CSatCC::CallModemResourceInd" ); + TFLOGSTRING("TSY: CSatCC::CallModemResourceIndL"); + OstTrace0( TRACE_NORMAL, CSATCC_CALLMODEMRESOURCEINDL_TD, "CSatCC::CallModemResourceIndL" ); TUint sbStartOffset( 0 ); // Check if resource control is requested for MO call. @@ -1121,7 +1153,7 @@ { // Do not make SIM call control, allow emergency calls always TPtrC8 atkData; - SendCallModemResourceReq( + SendCallModemResourceReqL( callcontrol, KAllowed, atkData ); @@ -1137,17 +1169,17 @@ } // ----------------------------------------------------------------------------- -// CSatCC::SendCallModemResourceReq +// CSatCC::SendCallModemResourceReqL // Creates resource control response for modem Call server // ----------------------------------------------------------------------------- // -void CSatCC::SendCallModemResourceReq( +void CSatCC::SendCallModemResourceReqL( const TCallControl& aTcc, const TUint8 aResult, TPtrC8 aApduData ) { - TFLOGSTRING("TSY: CSatCC::SendCallModemResourceReq"); - OstTrace0( TRACE_NORMAL, CSATCC_SENDCALLMODEMRESOURCEREQ, "CSatCC::SendCallModemResourceReq" ); + TFLOGSTRING("TSY: CSatCC::SendCallModemResourceReqL"); + OstTrace0( TRACE_NORMAL, CSATCC_SENDCALLMODEMRESOURCEREQL_TD, "CSatCC::SendCallModemResourceReqL" ); TBuf8 isiMessage; TInt ret( KErrNotFound ); @@ -1311,8 +1343,8 @@ else { // use default TON/NPI in reserved cases - isiMessage.Append( - CALL_MODEM_NBR_TYPE_UNKNOWN | + isiMessage.Append( + CALL_MODEM_NBR_TYPE_UNKNOWN | CALL_MODEM_NBR_PLAN_ISDN_TELEPHONY ); } @@ -1324,10 +1356,10 @@ TSatUtility::BCDToAscii( addressTlv.GetValue().Mid( 1 ), asciiAddress ); - // let's check is new number "112". This because of if number - // is "112" emergency call is needed to establish. otherwise - // normal call needs to be established, even new number is found - // from EFecc. So if number is not "112" we need to add subblock + // let's check is new number "112". This because of if number + // is "112" emergency call is needed to establish. otherwise + // normal call needs to be established, even new number is found + // from EFecc. So if number is not "112" we need to add subblock // CALL_MODEM_CHECK_INFO with CALL_MODEM_CHK_DISABLE_EMERG _LIT8(KEccNbr, "112"); if( 0 != asciiAddress.Compare( KEccNbr ) ) @@ -1419,7 +1451,7 @@ CMmDataPackage dataPackage; TUint8 callId( aTcc.iCallId ); dataPackage.PackData( &callId, &ccresult ); - iSatMessaging->GetMessageRouter()->ExtFuncL( + iSatMessaging->GetMessageRouter()->ExtFuncL( ESatNotifyCallControlRequest, &dataPackage ); // send request iSatMessHandler->CallModemResourceReq( aTcc.iTransId, isiMessage ); @@ -1435,14 +1467,14 @@ } // ----------------------------------------------------------------------------- -// CSatCC::SsResourceControlInd +// CSatCC::SsResourceControlIndL // Handles resource control request from modem SS server // ----------------------------------------------------------------------------- // -void CSatCC::SsResourceControlInd( const TIsiReceiveC& aIsiMessage ) +void CSatCC::SsResourceControlIndL( const TIsiReceiveC& aIsiMessage ) { - TFLOGSTRING("TSY: CSatCC::SsResourceControlInd"); - OstTrace0( TRACE_NORMAL, CSATCC_SSRESOURCECONTROLIND, "CSatCC::SsResourceControlInd" ); + TFLOGSTRING("TSY: CSatCC::SsResourceControlIndL"); + OstTrace0( TRACE_NORMAL, CSATCC_SSRESOURCECONTROLINDL_TD, "CSatCC::SsResourceControlIndL" ); TCallControl callcontrol; TInt stringLength; @@ -1506,24 +1538,24 @@ } else { - SendUSSDEnvelope( callcontrol ); + SendUSSDEnvelopeL( callcontrol ); } } // ----------------------------------------------------------------------------- -// CSatCC::SendSsResourceControlReq +// CSatCC::SendSsResourceControlReqL // Creates resource control response for modem SS server // ----------------------------------------------------------------------------- // -void CSatCC::SendSsResourceControlReq( +void CSatCC::SendSsResourceControlReqL( const TCallControl& aTcc, const TUint8 aSw1, const TUint8 aSw2, const TUint8 aResult, TPtrC8 aApduData ) { - TFLOGSTRING("TSY: CSatCC::SendSsResourceControlReq"); - OstTrace0( TRACE_NORMAL, CSATCC_SENDSSRESOURCECONTROLREQ, "CSatCC::SendSsResourceControlReq" ); + TFLOGSTRING("TSY: CSatCC::SendSsResourceControlReqL"); + OstTrace0( TRACE_NORMAL, CSATCC_SENDSSRESOURCECONTROLREQL_TD, "CSatCC::SendSsResourceControlReqL" ); TBuf8 isiMessage; CBerTlv response; @@ -1633,10 +1665,20 @@ else if ( KErrNone == response.TlvByTagValue( &ssServerString, KTlvUssdStringTag ) ) { - // USSD string has been modified to new USSD string - isiMessage.Append( SS_RESOURCE_ALLOWED ); - isiMessage.Append( KPadding ); - internalCcResult = KModified; + // Check if modified USSD string has valid DCS + if ( ESmsUnknownOrReservedDcs + != TSatUtility::DecodeCbsDcs( ssServerString.GetValue()[0] ) ) + { + // USSD string has been modified to new USSD string + isiMessage.Append( SS_RESOURCE_ALLOWED ); + internalCcResult = KModified; + } + else + { + // Not valid DCS, do not send USSD to network + isiMessage.Append( SS_RESOURCE_DENIED ); + internalCcResult = KRejected; + } } } break; @@ -1721,7 +1763,7 @@ } } - // SS_SB_RESOURCE_CONTROL_INFO [O] with sw1, sw2 and result + // SS_SB_RESOURCE_CONTROL_INFO [O] with sw1, sw2 and result TIsiSubBlock resourceCtrlInfo( isiMessage, SS_SB_RESOURCE_CONTROL_INFO, @@ -1765,7 +1807,7 @@ void CSatCC::GpdsResourceControlInd( const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CSatCC::GpdsResourceControlInd"); - OstTrace0( TRACE_NORMAL, CSATCC_GPDSRESOURCECONTROLIND, "CSatCC::GpdsResourceControlInd" ); + OstTrace0( TRACE_NORMAL, CSATCC_GPDSRESOURCECONTROLIND_TD, "CSatCC::GpdsResourceControlInd" ); TCallControl callcontrol; TInt paramsLength; @@ -1815,7 +1857,7 @@ TPtrC8 aAtkData ) { TFLOGSTRING("TSY: CSatCC::SendGpdsResourceControlReq"); - OstTrace0( TRACE_NORMAL, CSATCC_SENDGPDSRESOURCECONTROLREQ, "CSatCC::SendGpdsResourceControlReq" ); + OstTrace0( TRACE_NORMAL, CSATCC_SENDGPDSRESOURCECONTROLREQ_TD, "CSatCC::SendGpdsResourceControlReq" ); TBuf8 isiMessage; CBerTlv response; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/src/satdatadownload.cpp --- a/adaptationlayer/tsy/simatktsy_dll/src/satdatadownload.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/src/satdatadownload.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2009 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" @@ -50,6 +50,8 @@ const TUint8 KMaxInfoLength = 82; // SMS Delivery report buffer size const TUint8 KDeliveryReportSize = 248; +// Length of sw1 and sw2 +const TUint8 KSw1Sw2Length = 2; // ==================== MEMBER FUNCTIONS ==================================== @@ -74,7 +76,7 @@ iSmsPpDdOngoing( EFalse ), // No SMS PP DD on going during construction iSmsPpDdSupported( ETrue ) // Most likely SIM supports SMS PP DD { - OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_CSATDATADOWNLOAD, "CSatDataDownload::CSatDataDownload" ); + OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_CSATDATADOWNLOAD_TD, "CSatDataDownload::CSatDataDownload" ); } @@ -85,7 +87,7 @@ // void CSatDataDownload::ConstructL() { - OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_CONSTRUCTL, "CSatDataDownload::ConstructL" ); + OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_CONSTRUCTL_TD, "CSatDataDownload::ConstructL" ); } // ----------------------------------------------------------------------------- @@ -99,7 +101,7 @@ CTsySatMessaging* aSatMessaging ) { - OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_NEWL, "CSatDataDownload::NewL" ); + OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_NEWL_TD, "CSatDataDownload::NewL" ); TFLOGSTRING("TSY: CSatDataDownload::NewL"); CSatDataDownload* self = @@ -120,7 +122,7 @@ // CSatDataDownload::~CSatDataDownload() { - OstTrace0( TRACE_NORMAL, DUP1_CSATDATADOWNLOAD_CSATDATADOWNLOAD, "CSatDataDownload::~CSatDataDownload" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATDATADOWNLOAD_CSATDATADOWNLOAD_TD, "CSatDataDownload::~CSatDataDownload" ); TFLOGSTRING("TSY: CSatDataDownload::~CSatDataDownload"); } @@ -134,7 +136,7 @@ const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED, "CSatDataDownload::UiccCatRespEnvelopeReceived" ); + OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED_TD, "CSatDataDownload::UiccCatRespEnvelopeReceived" ); TFLOGSTRING("TSY:CSatDataDownload::UiccCatRespEnvelopeReceived"); TUint8 status( aIsiMessage.Get8bit( @@ -158,35 +160,49 @@ apduData.Set( aIsiMessage.GetData( uiccSbApduOffset + UICC_SB_APDU_OFFSET_APDU, apduLength ) ); - // Status bytes are two last bytes in APDU - TUint8 sw1( apduData[apduLength - 2] ); - TUint8 sw2( apduData[apduLength - 1] ); + if( KSw1Sw2Length <= apduLength ) + { + // Status bytes are two last bytes in APDU + sw1 = apduData[apduLength - 2]; + sw2 = apduData[apduLength - 1]; + } } else // Subblock is mandatory { TFLOGSTRING("TSY: CSatMessHandler::UiccCatRespEnvelopeReceived - Mandatory subblock UICC_SB_APDU not found"); - OstTrace0( TRACE_NORMAL, DUP1_CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED, "CSatDataDownload::UiccCatRespEnvelopeReceived- Mandatory subblock UICC_SB_APDU not found" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED_TD, "CSatDataDownload::UiccCatRespEnvelopeReceived- Mandatory subblock UICC_SB_APDU not found" ); } } + TTpFailure result; + // Create delivery report according to SW result if ( KError != TSatUtility::Sw1Sw2Check( sw1, sw2 ) ) { TFLOGSTRING("TSY: CSatDataDownload::UiccCatRespEnvelopeReceived, OK"); - OstTrace0( TRACE_NORMAL, DUP2_CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED, "CSatDataDownload::UiccCatRespEnvelopeReceived" ); - BuildSimMsgReport( ENone, apduData ); + OstTrace0( TRACE_NORMAL, DUP2_CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED_TD, "CSatDataDownload::UiccCatRespEnvelopeReceived" ); + result = ENone; } else if ( KAtkSwDataNtfSw1busy == sw1 ) { TFLOGSTRING("TSY:CSatDataDownload::UiccCatRespEnvelopeReceived, SIM Busy"); - OstTrace0( TRACE_NORMAL, DUP3_CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED, "CSatDataDownload::UiccCatRespEnvelopeReceived" ); - BuildSimMsgReport( ESatBusy, apduData ); + OstTrace0( TRACE_NORMAL, DUP3_CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED_TD, "CSatDataDownload::UiccCatRespEnvelopeReceived" ); + result = ESatBusy; } else { TFLOGSTRING("TSY:CSatDataDownload::UiccCatRespEnvelopeReceived, Data Download Error"); - OstTrace0( TRACE_NORMAL, DUP4_CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED, "CSatDataDownload::UiccCatRespEnvelopeReceived" ); - BuildSimMsgReport( ESatDlError, apduData ); + OstTrace0( TRACE_NORMAL, DUP4_CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED_TD, "CSatDataDownload::UiccCatRespEnvelopeReceived" ); + result = ESatDlError; + } + + if( KSw1Sw2Length <= apduData.Length() ) + { + BuildSimMsgReport( result, apduData.Mid( 0, apduData.Length() - KSw1Sw2Length ) ); + } + else + { + BuildSimMsgReport( result, KNullDesC8 ); } } @@ -204,7 +220,7 @@ const TDesC8& aUserData ) { - OstTraceExt2( TRACE_NORMAL, CSATDATADOWNLOAD_BUILDSIMMSGREPORT, "CSatDataDownload::BuildSimMsgReport TpFailure: %{TTpFailure}, UserDataLen: %d", aTpFailure, aUserData.Length() ); + OstTraceExt2( TRACE_NORMAL, CSATDATADOWNLOAD_BUILDSIMMSGREPORT_TD, "CSatDataDownload::BuildSimMsgReport TpFailure: %{TTpFailure}, UserDataLen: %d", aTpFailure, aUserData.Length() ); TFLOGSTRING3("TSY:CSatDataDownload::BuildSimMsgReport TpFailure: %x, UserDataLen: %d", aTpFailure, aUserData.Length() ); // Select Cause and CauseType according to routing result @@ -237,12 +253,12 @@ msgBuffer.Append( 0 ); // no of sublocks // Add SMS_SB_DELIVER_REPORT subblock if any failure is there - if( ENone != aTpFailure || + if( ENone != aTpFailure || 0 < dataLen ) { TFLOGSTRING("TSY:CSatDataDownload::BuildSimMsgReport \ Adding SMS_SB_DELIVER_REPORT" ); - OstTrace0( TRACE_NORMAL, DUP1_CSATDATADOWNLOAD_BUILDSIMMSGREPORT, "CSatDataDownload::BuildSimMsgReport Adding SMS_SB_DELIVER_REPORT" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATDATADOWNLOAD_BUILDSIMMSGREPORT_TD, "CSatDataDownload::BuildSimMsgReport Adding SMS_SB_DELIVER_REPORT" ); TIsiSubBlock deliverReport( msgBuffer, SMS_SB_DELIVER_REPORT,EIsiSubBlockTypeId16Len16 ); @@ -264,7 +280,7 @@ { TFLOGSTRING("TSY:CSatDataDownload::BuildSimMsgReport \ Adding SMS_SB_PARAM_INDICATOR & SMS_SB_USER_DATA" ); - OstTrace0( TRACE_NORMAL, DUP2_CSATDATADOWNLOAD_BUILDSIMMSGREPORT, "CSatDataDownload::BuildSimMsgReport Adding SMS_SB_PARAM_INDICATOR AND SMS_SB_USER_DATA" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATDATADOWNLOAD_BUILDSIMMSGREPORT_TD, "CSatDataDownload::BuildSimMsgReport Adding SMS_SB_PARAM_INDICATOR AND SMS_SB_USER_DATA" ); // Add two more Sublock: // SMS_SB_PARAM_INDICATOR @@ -339,7 +355,7 @@ const TIsiReceiveC& aIsiMessage // SMS_GSM(_TEMP)_CB_ROUTING_NTF ) { - OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_CELLBROADCASTRECEIVED, "CSatDataDownload::CellBroadcastReceived" ); + OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_CELLBROADCASTRECEIVED_TD, "CSatDataDownload::CellBroadcastReceived" ); TFLOGSTRING( "TSY:CSatDataDownload::CellBroadcastReceived" ); TBuf8 cbsMsg; @@ -423,19 +439,19 @@ } // ----------------------------------------------------------------------------- -// CSatDataDownload::SmsSimMsgIndReceived +// CSatDataDownload::SmsSimMsgIndReceivedL // Breaks a sms point to point isi message // Sends envelope // ----------------------------------------------------------------------------- // -void CSatDataDownload::SmsSimMsgIndReceived +void CSatDataDownload::SmsSimMsgIndReceivedL ( const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_SMSSIMMSGINDRECEIVED, "CSatDataDownload::SmsSimMsgIndReceived" ); - TFLOGSTRING( "TSY:CSatDataDownload::SmsSimMsgIndReceived" ); + OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_SMSSIMMSGINDRECEIVEDL_TD, "CSatDataDownload::SmsSimMsgIndReceivedL" ); + TFLOGSTRING( "TSY:CSatDataDownload::SmsSimMsgIndReceivedL" ); TBuf8 bcdSmscAddress; // to store Service centre number TBuf8 smsTpdu; // Temporary buffer to store TPDU data @@ -478,13 +494,13 @@ smsTpdu.Append( aIsiMessage.GetData( sbDeliver + SMS_SB_TPDU_OFFSET_DATABYTES, userDataLen )); // Destination Address Length - // 1st Byte of destination address contains no os semioctets + // 1st Byte of destination address contains no os semioctets //in address bytes // +1 to calculate correct nos of bytes in address // divide by 2 to convert semioctets to no of octets // +2 to add type of address byte and no of - TUint8 tpduIndexCalc( ( ( smsTpdu[1] + 1 )/2 ) + 2 ); + TUint8 tpduIndexCalc( ( ( smsTpdu[1] + 1 )/2 ) + 2 ); // Storing protocol id and datacoding scheme from TPDU data buffer iSmsPpProtocolId = smsTpdu[ tpduIndexCalc + 1 ]; @@ -496,8 +512,8 @@ if( iSmsPpDdSupported ) // Check for SMS PP-DATA Download supported { - TFLOGSTRING( "TSY:CSatDataDownload::SmsSimMsgIndReceived SMS SIM Supported, sending Envelope..." ); - OstTrace0( TRACE_NORMAL, DUP1_CSATDATADOWNLOAD_SMSSIMMSGINDRECEIVED, "CSatDataDownload::SmsSimMsgIndReceived SMS Sim Supported, sending Envelope..." ); + TFLOGSTRING( "TSY:CSatDataDownload::SmsSimMsgIndReceivedL SMS SIM Supported, sending Envelope..." ); + OstTrace0( TRACE_NORMAL, DUP1_CSATDATADOWNLOAD_SMSSIMMSGINDRECEIVEDL_TD, "CSatDataDownload::SmsSimMsgIndReceivedL SMS Sim Supported, sending Envelope..." ); iSmsPpTransactionId = iSatMessaging->GetTransactionId(); // Data Download supported, send envelope @@ -508,8 +524,8 @@ } else { - TFLOGSTRING( "TSY:CSatDataDownload::SmsSimMsgIndReceived SMS SIM not supported, storing SMS..." ); - OstTrace0( TRACE_NORMAL, DUP2_CSATDATADOWNLOAD_SMSSIMMSGINDRECEIVED, "CSatDataDownload::SmsSimMsgIndReceived SMS SIM not supported, storing SMS..." ); + TFLOGSTRING( "TSY:CSatDataDownload::SmsSimMsgIndReceivedL SMS SIM not supported, storing SMS..." ); + OstTrace0( TRACE_NORMAL, DUP2_CSATDATADOWNLOAD_SMSSIMMSGINDRECEIVEDL_TD, "CSatDataDownload::SmsSimMsgIndReceivedL SMS SIM not supported, storing SMS..." ); // Save the SMS instead. RMobileSmsStore::TMobileGsmSmsEntryV1 smsEntry; @@ -553,7 +569,7 @@ TDesC8& aPdu ) { - OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_SENDCELLBROADCASTDDLENVELOPE, "CSatDataDownload::SendCellBroadcastDdlEnvelope" ); + OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_SENDCELLBROADCASTDDLENVELOPE_TD, "CSatDataDownload::SendCellBroadcastDdlEnvelope" ); TFLOGSTRING( "TSY:CSatDataDownload::SendEnvelopeForCellBroadcast" ); TTlv envelope; @@ -583,7 +599,7 @@ TDesC8& aPdu ) { - OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_SENDSMSPPDDLENVELOPE, "CSatDataDownload::SendSmsPpDdlEnvelope" ); + OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_SENDSMSPPDDLENVELOPE_TD, "CSatDataDownload::SendSmsPpDdlEnvelope" ); TFLOGSTRING( "TSY:CSatDataDownload::SendEnvelopeForSmsPpDownload" ); TTlv envelope; @@ -612,7 +628,7 @@ TBool aStatus ) { - OstTrace1( TRACE_NORMAL, CSATDATADOWNLOAD_SMSPPDLSUPPORTED, "CSatDataDownload::SmsPpDlSupported: %d", aStatus ); + OstTrace1( TRACE_NORMAL, CSATDATADOWNLOAD_SMSPPDLSUPPORTED_TD, "CSatDataDownload::SmsPpDlSupported: %d", aStatus ); TFLOGSTRING2( "TSY: CSatDataDownload::SmsPpDlSupported: %d", aStatus ); iSmsPpDdSupported = aStatus; @@ -630,7 +646,7 @@ const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_MESSAGERECEIVEDL, "CSatDataDownload::MessageReceivedL" ); + OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_MESSAGERECEIVEDL_TD, "CSatDataDownload::MessageReceivedL" ); TFLOGSTRING( "TSY:CSatDataDownload::MessageReceivedL" ); TInt resource( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) ); @@ -653,7 +669,7 @@ { // Receive SMS PP Data Download Indication , Send by SMS Server // on reception of message on network - SmsSimMsgIndReceived(aIsiMessage); + SmsSimMsgIndReceivedL(aIsiMessage); break; } default: diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/src/sateventdownload.cpp --- a/adaptationlayer/tsy/simatktsy_dll/src/sateventdownload.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/src/sateventdownload.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -37,6 +37,9 @@ const TUint8 KMaxCallModemDetailedCause = 248; const TUint8 KCallModemOriginCsAddressMaxLength = 246; const TUint8 KMSBMask = 0x80; +const TUint8 KNbrIndexWithoutIndicatorInfo = 1; +const TUint8 KNbrIndexWithIndicatorInfo = 2; +const TUint8 KExtMask = 0x80; // ==================== MEMBER FUNCTIONS ==================================== @@ -61,7 +64,7 @@ iLocationStatusEnvelopePending( EFalse ), iNetCellInfoIndReceived( EFalse ) { - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_CSATEVENTDOWNLOAD, "CSatEventDownload::CSatEventDownload" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_CSATEVENTDOWNLOAD_TD, "CSatEventDownload::CSatEventDownload" ); iLocInfo.iOperatorCode.FillZ( iLocInfo.iOperatorCode.MaxLength() ); iLocInfo.iLac.FillZ( iLocInfo.iLac.MaxLength() ); iLocInfo.iCellId.FillZ( iLocInfo.iCellId.MaxLength() ); @@ -75,7 +78,7 @@ // void CSatEventDownload::ConstructL() { - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_CONSTRUCTL, "CSatEventDownload::ConstructL" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_CONSTRUCTL_TD, "CSatEventDownload::ConstructL" ); // None. Reserved for future use. } @@ -91,7 +94,7 @@ CTsySatMessaging* aSatMessaging ) { - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_NEWL, "CSatEventDownload::NewL" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_NEWL_TD, "CSatEventDownload::NewL" ); TFLOGSTRING("TSY: CSatEventDownload::NewL"); CSatEventDownload* self = @@ -112,7 +115,7 @@ // CSatEventDownload::~CSatEventDownload() { - OstTrace0( TRACE_NORMAL, DUP1_CSATEVENTDOWNLOAD_CSATEVENTDOWNLOAD, "CSatEventDownload::~CSatEventDownload" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATEVENTDOWNLOAD_CSATEVENTDOWNLOAD_TD, "CSatEventDownload::~CSatEventDownload" ); TFLOGSTRING("TSY: CSatEventDownload::~CSatEventDownload"); } @@ -124,7 +127,7 @@ // TUint8 CSatEventDownload::GetTransactionId() { - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_GETTRANSACTIONID, "CSatEventDownload::GetTransactionId" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_GETTRANSACTIONID_TD, "CSatEventDownload::GetTransactionId" ); TFLOGSTRING("TSY: CSatEventDownload::GetTransactionId"); return iSatMessaging->GetTransactionId(); } @@ -139,7 +142,7 @@ TUint32 aEvents // bit mask of enabled events ) { - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_SETUPEVENTLIST, "CSatEventDownload::SetUpEventList" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_SETUPEVENTLIST_TD, "CSatEventDownload::SetUpEventList" ); TFLOGSTRING("TSY: CSatEventDownload::SetUpEventList"); iEventList.Set( aEvents ); @@ -167,7 +170,7 @@ const TDesC8& aCalledPartySubAddress // Calling Party Subaddress ) { - OstTraceExt1( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDMTCALLENVELOPE, "CSatEventDownload::SendMTCallEnvelope (transactionId=%hhu)", aTransactionId ); + OstTraceExt1( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDMTCALLENVELOPE_TD, "CSatEventDownload::SendMTCallEnvelope (transactionId=%hhu)", aTransactionId ); TFLOGSTRING2("TSY: CSatEventDownload::SendMTCallEnvelope\ (transactionId=%d)", TInt( aTransactionId ) ); @@ -221,7 +224,7 @@ TBool aNearEnd ) { - OstTraceExt1( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDCALLCONNECTEDENVELOPE, "CSatEventDownload::SendCallConnectedEnvelope (transactionId=%hhu)", aTransactionId ); + OstTraceExt1( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDCALLCONNECTEDENVELOPE_TD, "CSatEventDownload::SendCallConnectedEnvelope (transactionId=%hhu)", aTransactionId ); TFLOGSTRING2("TSY: CSatEventDownload::SendCallConnectedEnvelope\ (transactionId=%d)", TInt( aTransactionId ) ); @@ -274,7 +277,7 @@ const TDesC8& aCause ) { - OstTraceExt1( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDCALLDISCONNECTEDENVELOPE, "CSatEventDownload::SendCallDisconnectedEnvelope (transactionId=%hhu)", aTransactionId ); + OstTraceExt1( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDCALLDISCONNECTEDENVELOPE_TD, "CSatEventDownload::SendCallDisconnectedEnvelope (transactionId=%hhu)", aTransactionId ); TFLOGSTRING2("TSY: CSatEventDownload::SendCallDisconnectedEnvelope\ (transactionId=%d)", TInt( aTransactionId ) ); @@ -321,7 +324,7 @@ const CSatMessHandler::TLocationInfo& aNewLocInfo ) { - OstTrace1( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDLOCATIONSTATUSENVELOPE, "CSatEventDownload::SendLocationStatusEnvelope locationStatus = %d", aNewLocInfo.iRegStatus ); + OstTrace1( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDLOCATIONSTATUSENVELOPE_TD, "CSatEventDownload::SendLocationStatusEnvelope locationStatus = %d", aNewLocInfo.iRegStatus ); TFLOGSTRING2("TSY: CSatEventDownload::SendLocationStatusEnvelope \ locationStatus = %d", TInt( aNewLocInfo.iRegStatus ) ); @@ -337,7 +340,7 @@ { TFLOGSTRING("TSY: CSatEventDownload::SendLocationStatusEnvelope \ Saving and sending"); - OstTrace0( TRACE_NORMAL, DUP1_CSATEVENTDOWNLOAD_SENDLOCATIONSTATUSENVELOPE, "CSatEventDownload::SendLocationStatusEnvelope Saving and sending" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATEVENTDOWNLOAD_SENDLOCATIONSTATUSENVELOPE_TD, "CSatEventDownload::SendLocationStatusEnvelope Saving and sending" ); // Cache values iLocInfo = aNewLocInfo; @@ -397,7 +400,7 @@ { TFLOGSTRING("TSY: CSatEventDownload::SendLocationStatusEnvelope \ Location Info already received, envelope sending omitted."); - OstTrace0( TRACE_NORMAL, DUP2_CSATEVENTDOWNLOAD_SENDLOCATIONSTATUSENVELOPE, "CSatEventDownload::SendLocationStatusEnvelope Location Info already received, envelope sending omitted." ); + OstTrace0( TRACE_NORMAL, DUP2_CSATEVENTDOWNLOAD_SENDLOCATIONSTATUSENVELOPE_TD, "CSatEventDownload::SendLocationStatusEnvelope Location Info already received, envelope sending omitted." ); } @@ -413,7 +416,7 @@ // TInt CSatEventDownload::SendUserActivityEnvelope() { - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDUSERACTIVITYENVELOPE, "CSatEventDownload::SendUserActivityEnvelope" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDUSERACTIVITYENVELOPE_TD, "CSatEventDownload::SendUserActivityEnvelope" ); TFLOGSTRING("TSY: CSatEventDownload::SendUserActivityEnvelope"); TInt ret = KErrNone; @@ -451,7 +454,7 @@ // TInt CSatEventDownload::SendIdleScreenAvailableEnvelope() { - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDIDLESCREENAVAILABLEENVELOPE, "CSatEventDownload::SendIdleScreenAvailableEnvelope" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDIDLESCREENAVAILABLEENVELOPE_TD, "CSatEventDownload::SendIdleScreenAvailableEnvelope" ); TFLOGSTRING("TSY: CSatEventDownload::SendIdleScreenAvailableEnvelope"); TInt ret = KErrNone; @@ -495,7 +498,7 @@ RSat::TBrowserTerminationCause aCause ) { - OstTrace1( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDBROWSERTERMINATIONENVELOPE, "CSatEventDownload::SendBrowserTerminationEnvelope (cause=%d)", TInt(aCause) ); + OstTrace1( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDBROWSERTERMINATIONENVELOPE_TD, "CSatEventDownload::SendBrowserTerminationEnvelope (cause=%d)", TInt(aCause) ); TFLOGSTRING2("TSY: CSatEventDownload::SendBrowserTerminationEnvelope\ (cause=%d)", TInt( aCause ) ); @@ -540,7 +543,7 @@ TUint16 aLanguage ) { - OstTraceExt1( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDLANGUAGESELECTIONENVELOPE, "CSatEventDownload::SendLanguageSelectionEnvelope (language=%hu)", aLanguage ); + OstTraceExt1( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDLANGUAGESELECTIONENVELOPE_TD, "CSatEventDownload::SendLanguageSelectionEnvelope (language=%hu)", aLanguage ); TFLOGSTRING2("TSY: CSatEventDownload::SendLanguageSelectionEnvelope\ (language=%d)", TInt ( aLanguage ) ); @@ -585,7 +588,7 @@ const TDataPackage& aPackage ) { - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_EXTFUNC, "CSatEventDownload::ExtFunc" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_EXTFUNC_TD, "CSatEventDownload::ExtFunc" ); TFLOGSTRING("TSY: CSatEventDownload::ExtFunc"); TInt ret ( KErrNotSupported ); @@ -681,7 +684,7 @@ const TTsyReqHandle /*aTsyReqHandle*/ ) { - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_CANCEL, "CSatEventDownload::Cancel" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_CANCEL_TD, "CSatEventDownload::Cancel" ); TFLOGSTRING("TSY: CSatEventDownload::Cancel"); // since event download is served at once. // we don't have anything to do here @@ -699,7 +702,7 @@ ) { TFLOGSTRING("TSY: CSatEventDownload::CallModemMessageIndReceived"); -OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED, "CSatEventDownload::CallModemMessageIndReceived" ); +OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED_TD, "CSatEventDownload::CallModemMessageIndReceived" ); // CALL_MODEM_SB_DETAILED_CAUSE length max value is 248 TBuf8 cause; @@ -753,16 +756,33 @@ sbStartOffset + CALL_MODEM_SB_ORIGIN_CS_ADDRESS_OFFSET_ADDRLEN ) ); - // Set address type (TON/NPI) in correct form - BCDAddress.Append( aIsiMessage.Get8bit( + // According to 24.008, chapter 10.5.4.9, octet containing + // TON/NPI info contains also ext bit (bit8). If ext bit + // is 0, next octet after TON/NPI contains different + // kind of indicator info and it must be skipped when address + // data is copied. If ext is 1, address data starts right + // after TON/NPI octet. + TUint8 tonNpi( aIsiMessage.Get8bit( sbStartOffset + - CALL_MODEM_SB_ORIGIN_CS_ADDRESS_OFFSET_ADDR ) - | KMSBMask ); - // Append BCD address. Skip TON/NPI + CALL_MODEM_SB_ORIGIN_CS_ADDRESS_OFFSET_ADDR ) ); + TUint8 addrIndex( KNbrIndexWithIndicatorInfo ); + + if( KExtMask == ( tonNpi & KExtMask ) ) + { + // ext bit is 1, so address data starts rigth after + // TON/NPI + addrIndex = KNbrIndexWithoutIndicatorInfo; + } + + // Set address type (TON/NPI) in correct form + BCDAddress.Append( tonNpi | KMSBMask ); + + // Append BCD address. Skip TON/NPI and possible + // indicator information BCDAddress.Append( aIsiMessage.GetData( sbStartOffset + - CALL_MODEM_SB_ORIGIN_CS_ADDRESS_OFFSET_ADDR + 1, - addressLength - 1 ) ); + CALL_MODEM_SB_ORIGIN_CS_ADDRESS_OFFSET_ADDR + addrIndex, + addressLength - addrIndex ) ); } // Extract subaddress retValue = aIsiMessage.FindSubBlockOffsetById( @@ -782,7 +802,7 @@ subAddressLength ) ); } TFLOGSTRING( "CSatEventDownload::CallModemMessageIndReceived Send MT call event" ); -OstTrace0( TRACE_NORMAL, DUP1_CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED, "CSatEventDownload::CallModemMessageIndReceived Send MT call event" ); +OstTrace0( TRACE_NORMAL, DUP1_CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED_TD, "CSatEventDownload::CallModemMessageIndReceived Send MT call event" ); SendMTCallEnvelope( transactionId, @@ -799,7 +819,7 @@ if ( CALL_MODEM_MSG_DIRECT_RECEIVED == messageDirection ) { TFLOGSTRING("CSatEventDownload::CallModemMessageIndReceived Creating a call"); -OstTrace0( TRACE_NORMAL, DUP2_CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED, "CSatEventDownload::CallModemMessageIndReceived Creating a call" ); +OstTrace0( TRACE_NORMAL, DUP2_CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED_TD, "CSatEventDownload::CallModemMessageIndReceived Creating a call" ); SendCallConnectedEnvelope( transactionId, @@ -808,7 +828,7 @@ else if ( CALL_MODEM_MSG_DIRECT_SENT == messageDirection ) { TFLOGSTRING("CSatEventDownload::CallModemMessageIndReceived Incoming call arrives"); -OstTrace0( TRACE_NORMAL, DUP3_CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED, "CSatEventDownload::CallModemMessageIndReceived Incoming call arrives" ); +OstTrace0( TRACE_NORMAL, DUP3_CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED_TD, "CSatEventDownload::CallModemMessageIndReceived Incoming call arrives" ); SendCallConnectedEnvelope( transactionId, @@ -843,7 +863,7 @@ // 2.33.11 Event Indications on Mobile Originated Call // Clearing (GSM) TFLOGSTRING( "CSatEventDownload::CallModemMessageIndReceived MO call clearing "); -OstTrace0( TRACE_NORMAL, DUP4_CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED, "CSatEventDownload::CallModemMessageIndReceived MO call clearing" ); +OstTrace0( TRACE_NORMAL, DUP4_CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED_TD, "CSatEventDownload::CallModemMessageIndReceived MO call clearing" ); SendCallDisconnectedEnvelope( transactionId, @@ -856,7 +876,7 @@ // 2.33.12 Event indications on Mobile Terminated Call // Clearing (GSM) TFLOGSTRING( "CSatEventDownload::CallModemMessageIndReceived MT call clearing"); -OstTrace0( TRACE_NORMAL, DUP7_CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED, "CSatEventDownload::CallModemMessageIndReceived MT call clearing" ); +OstTrace0( TRACE_NORMAL, DUP7_CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED_TD, "CSatEventDownload::CallModemMessageIndReceived MT call clearing" ); SendCallDisconnectedEnvelope( transactionId, @@ -868,7 +888,7 @@ { // 2.33.13 Event indications on radio link failure TFLOGSTRING( "CSatEventDownload::CallModemMessageIndReceived radiolink failure"); -OstTrace0( TRACE_NORMAL, DUP5_CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED, "CSatEventDownload::CallModemMessageIndReceived Radiolink failure" ); +OstTrace0( TRACE_NORMAL, DUP5_CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED_TD, "CSatEventDownload::CallModemMessageIndReceived Radiolink failure" ); // In the case of a radio link timeout, the Cause data // object shall be included, with a value part of zero // length. @@ -886,7 +906,7 @@ default: { TFLOGSTRING( "CSatEventDownload::CallModemMessageIndReceived UNKNOWN" ); -OstTrace0( TRACE_NORMAL, DUP6_CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED, "CSatEventDownload::CallModemMessageIndReceived UNKNOWN" ); +OstTrace0( TRACE_NORMAL, DUP6_CSATEVENTDOWNLOAD_CALLMODEMMESSAGEINDRECEIVED_TD, "CSatEventDownload::CallModemMessageIndReceived UNKNOWN" ); // do nothing break; } @@ -905,7 +925,7 @@ TInt8 aLength // Channel data length ) { - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDDATAAVAILABLEENVELOPE, "CSatEventDownload::SendDataAvailableEnvelope" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDDATAAVAILABLEENVELOPE_TD, "CSatEventDownload::SendDataAvailableEnvelope" ); TFLOGSTRING( "TSY: CSatEventDownload::SendDataAvailableEnvelope" ); TInt ret = KErrNone; @@ -951,7 +971,7 @@ RSat::TChannelStatus aStatus // Status of the channel ) { - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDCHANNELSTATUSENVELOPE, "CSatEventDownload::SendChannelStatusEnvelope" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDCHANNELSTATUSENVELOPE_TD, "CSatEventDownload::SendChannelStatusEnvelope" ); TFLOGSTRING("TSY: CSatEventDownload::SendChannelStatusEnvelope"); TInt ret = KErrNone; @@ -996,7 +1016,7 @@ const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_MESSAGERECEIVED, "CSatEventDownload::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_MESSAGERECEIVED_TD, "CSatEventDownload::MessageReceived" ); TFLOGSTRING("TSY: CSatEventDownload::MessageReceived"); // Get resource and message id's TInt resource( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) ); @@ -1099,7 +1119,7 @@ const TBool aStatus // SetUpCall status ) { - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_SETSETUPCALLSTATUS, "CSatEventDownload::SetSetUpCallStatus" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_SETSETUPCALLSTATUS_TD, "CSatEventDownload::SetSetUpCallStatus" ); TFLOGSTRING("TSY: CSatEventDownload::SetSetUpCallStatus"); iSetUpCallOngoing = aStatus; } @@ -1114,7 +1134,7 @@ TUint8 accTechChange //Acc Tech ) { - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDACCESSTECHNOLOGYCHANGEENVELOPE, "CSatEventDownload::SendAccessTechnologyChangeEnvelope" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_SENDACCESSTECHNOLOGYCHANGEENVELOPE_TD, "CSatEventDownload::SendAccessTechnologyChangeEnvelope" ); TFLOGSTRING("TSY: CSatEventDownload::SendAccessTechnologyChangeEnvelope"); TInt ret = KErrNone; @@ -1123,7 +1143,7 @@ { TFLOGSTRING("TSY: CSatEventDownload::SendAccessTechnologyChangeEnvelope\ - Event enabled: sending envelope"); - OstTrace0( TRACE_NORMAL, DUP1_CSATEVENTDOWNLOAD_SENDACCESSTECHNOLOGYCHANGEENVELOPE, "CSatEventDownload::SendAccessTechnologyChangeEnvelope - Event enabled: sending envelope" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATEVENTDOWNLOAD_SENDACCESSTECHNOLOGYCHANGEENVELOPE_TD, "CSatEventDownload::SendAccessTechnologyChangeEnvelope - Event enabled: sending envelope" ); // create envelope TTlv envelope; envelope.Begin ( KBerTlvEventDownloadTag ); @@ -1159,7 +1179,7 @@ TInt CSatEventDownload::ForceLocationStatusEnvelope() { TFLOGSTRING("TSY: CSatEventDownload::ForceLocationStatusEnvelope"); - OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_FORCELOCATIONSTATUSENVELOPE, "CSatEventDownload::ForceLocationStatusEnvelope" ); + OstTrace0( TRACE_NORMAL, CSATEVENTDOWNLOAD_FORCELOCATIONSTATUSENVELOPE_TD, "CSatEventDownload::ForceLocationStatusEnvelope" ); TInt ret( KErrNone ); if ( iEventList.IsEnabled( RSat::KLocationStatus ) @@ -1167,7 +1187,7 @@ && iNetCellInfoIndReceived ) { TFLOGSTRING("TSY: CSatEventDownload::ForceLocationStatusEnvelope, Event list includes Location status and ENS is supported in PP"); - OstTrace0( TRACE_NORMAL, DUP1_CSATEVENTDOWNLOAD_FORCELOCATIONSTATUSENVELOPE, "CSatEventDownload::ForceLocationStatusEnvelope, Event list includes Location status and ENS is supported in PP" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATEVENTDOWNLOAD_FORCELOCATIONSTATUSENVELOPE_TD, "CSatEventDownload::ForceLocationStatusEnvelope, Event list includes Location status and ENS is supported in PP" ); ret = SendLocationStatusEnvelope( iSatMessHandler->LocationInfo() ); } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/src/satflightmodestatus.cpp --- a/adaptationlayer/tsy/simatktsy_dll/src/satflightmodestatus.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/src/satflightmodestatus.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -70,7 +70,7 @@ CTsySatMessaging* aSatMessaging ) { - OstTrace0( TRACE_NORMAL, CSATFLIGHTMODESTATUS_NEWL, "CSatFlightModeStatus::NewL" ); + OstTrace0( TRACE_NORMAL, CSATFLIGHTMODESTATUS_NEWL_TD, "CSatFlightModeStatus::NewL" ); TFLOGSTRING("TSY: CSatFlightModeStatus::NewL"); CSatFlightModeStatus* self = @@ -97,7 +97,7 @@ ,iSatMessHandler( aSatMessHandler ) ,iSatMessaging( aSatMessaging ) { - OstTrace0( TRACE_NORMAL, CSATFLIGHTMODESTATUS_CSATFLIGHTMODESTATUS, "CSatFlightModeStatus::CSatFlightModeStatus" ); + OstTrace0( TRACE_NORMAL, CSATFLIGHTMODESTATUS_CSATFLIGHTMODESTATUS_TD, "CSatFlightModeStatus::CSatFlightModeStatus" ); TFLOGSTRING("TSY: CSatFlightModeStatus::CSatFlightModeStatus"); CActiveScheduler::Add( this ); @@ -110,7 +110,7 @@ // CSatFlightModeStatus::~CSatFlightModeStatus() { - OstTrace0( TRACE_NORMAL, DUP1_CSATFLIGHTMODESTATUS_CSATFLIGHTMODESTATUS, "CSatFlightModeStatus::~CSatFlightModeStatus" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATFLIGHTMODESTATUS_CSATFLIGHTMODESTATUS_TD, "CSatFlightModeStatus::~CSatFlightModeStatus" ); TFLOGSTRING("TSY: CSatFlightModeStatus::~CSatFlightModeStatus"); Cancel(); @@ -125,7 +125,7 @@ // void CSatFlightModeStatus::ConstructL() { - OstTrace0( TRACE_NORMAL, CSATFLIGHTMODESTATUS_CONSTRUCTL, "CSatFlightModeStatus::ConstructL" ); + OstTrace0( TRACE_NORMAL, CSATFLIGHTMODESTATUS_CONSTRUCTL_TD, "CSatFlightModeStatus::ConstructL" ); TFLOGSTRING("TSY: CSatFlightModeStatus::ConstructL"); // Initialization @@ -143,7 +143,7 @@ if ( KErrNone == errValue && ESwStateNormalRfOn == systemStateValue ) { TFLOGSTRING("TSY: CSatFlightModeStatus::ConstructL - RF status already RF ON"); - OstTrace0( TRACE_NORMAL, DUP1_CSATFLIGHTMODESTATUS_CONSTRUCTL, "CSatFlightModeStatus::ConstructL - RF status already RF ON" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATFLIGHTMODESTATUS_CONSTRUCTL_TD, "CSatFlightModeStatus::ConstructL - RF status already RF ON" ); // Flight mode Off, RF On. iFlightModeActive = EFalse; @@ -162,7 +162,7 @@ // void CSatFlightModeStatus::DoCancel() { - OstTrace0( TRACE_NORMAL, CSATFLIGHTMODESTATUS_DOCANCEL, "CSatFlightModeStatus::DoCancel" ); + OstTrace0( TRACE_NORMAL, CSATFLIGHTMODESTATUS_DOCANCEL_TD, "CSatFlightModeStatus::DoCancel" ); TFLOGSTRING("TSY: CSatFlightModeStatus::DoCancel"); // Cancels an outstanding subscription request for this property handle. @@ -176,7 +176,7 @@ // void CSatFlightModeStatus::RunL() { - OstTrace0( TRACE_NORMAL, CSATFLIGHTMODESTATUS_RUNL, "CSatFlightModeStatus::RunL" ); + OstTrace0( TRACE_NORMAL, CSATFLIGHTMODESTATUS_RUNL_TD, "CSatFlightModeStatus::RunL" ); TFLOGSTRING("TSY: CSatFlightModeStatus::RunL"); // Check possible error. @@ -199,7 +199,7 @@ // TInt CSatFlightModeStatus::RunError( TInt aError ) { - OstTrace1( TRACE_NORMAL, CSATFLIGHTMODESTATUS_RUNERROR, "CSatFlightModeStatus::RunError %d", aError ); + OstTrace1( TRACE_NORMAL, CSATFLIGHTMODESTATUS_RUNERROR_TD, "CSatFlightModeStatus::RunError %d", aError ); TFLOGSTRING2("TSY: CSatFlightModeStatus::RunError %d", aError); if ( KErrCancel != aError && !IsActive() ) @@ -219,7 +219,7 @@ // void CSatFlightModeStatus::CheckStatusChange() { - OstTrace0( TRACE_NORMAL, CSATFLIGHTMODESTATUS_CHECKSTATUSCHANGE, "CSatFlightModeStatus::CheckStatusChange" ); + OstTrace0( TRACE_NORMAL, CSATFLIGHTMODESTATUS_CHECKSTATUSCHANGE_TD, "CSatFlightModeStatus::CheckStatusChange" ); TFLOGSTRING("TSY: CSatFlightModeStatus::CheckStatusChange"); // Gets system state value of this property. @@ -239,7 +239,7 @@ if ( iSatMessHandler->GetSatReadyStatus() ) { TFLOGSTRING("TSY: CSatFlightModeStatus::CheckStatusChange - RF ON - ENHANCED FETCH HANDLING ENABLED"); - OstTrace0( TRACE_NORMAL, DUP1_CSATFLIGHTMODESTATUS_CHECKSTATUSCHANGE, "CSatFlightModeStatus::CheckStatusChange - RF ON - ENHANCED FETCH HANDLING ENABLED" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATFLIGHTMODESTATUS_CHECKSTATUSCHANGE_TD, "CSatFlightModeStatus::CheckStatusChange - RF ON - ENHANCED FETCH HANDLING ENABLED" ); // Enable CAT support. iSatMessHandler->UiccCatReq( UICC_CAT_ENABLE ); @@ -254,7 +254,7 @@ if ( iSatMessHandler->GetSatReadyStatus() ) { TFLOGSTRING("TSY: CSatFlightModeStatus::CheckStatusChange - RF OFF - ENHANCED FETCH HANDLING DISABLED"); - OstTrace0( TRACE_NORMAL, DUP2_CSATFLIGHTMODESTATUS_CHECKSTATUSCHANGE, "CSatFlightModeStatus::CheckStatusChange - RF OFF - ENHANCED FETCH HANDLING DISABLED" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATFLIGHTMODESTATUS_CHECKSTATUSCHANGE_TD, "CSatFlightModeStatus::CheckStatusChange - RF OFF - ENHANCED FETCH HANDLING DISABLED" ); // Disable CAT support. iSatMessHandler->UiccCatReq( UICC_CAT_DISABLE ); @@ -264,7 +264,7 @@ default: { TFLOGSTRING("TSY: CSatFlightModeStatus::CheckStatusChange - Default - state value not interested"); - OstTrace0( TRACE_NORMAL, DUP3_CSATFLIGHTMODESTATUS_CHECKSTATUSCHANGE, "CSatFlightModeStatus::CheckStatusChange - Default - state value not interested" ); + OstTrace0( TRACE_NORMAL, DUP3_CSATFLIGHTMODESTATUS_CHECKSTATUSCHANGE_TD, "CSatFlightModeStatus::CheckStatusChange - Default - state value not interested" ); // we are not interested of other state changes. break; @@ -275,7 +275,7 @@ { // There was error when getting system state value. Just continue. TFLOGSTRING2("TSY: CSatFlightModeStatus::CheckStatusChange - Error= %d", errValue); - OstTrace1( TRACE_NORMAL, DUP4_CSATFLIGHTMODESTATUS_CHECKSTATUSCHANGE, "CSatFlightModeStatus::CheckStatusChange - Error= %d", errValue ); + OstTrace1( TRACE_NORMAL, DUP4_CSATFLIGHTMODESTATUS_CHECKSTATUSCHANGE_TD, "CSatFlightModeStatus::CheckStatusChange - Error= %d", errValue ); } // End of if. } @@ -286,7 +286,7 @@ // TBool CSatFlightModeStatus::FlightModeStatusValue() { - OstTrace0( TRACE_NORMAL, CSATFLIGHTMODESTATUS_FLIGHTMODESTATUSVALUE, "CSatFlightModeStatus::FlightModeStatusValue" ); + OstTrace0( TRACE_NORMAL, CSATFLIGHTMODESTATUS_FLIGHTMODESTATUSVALUE_TD, "CSatFlightModeStatus::FlightModeStatusValue" ); TFLOGSTRING("TSY: CSatFlightModeStatus::FlightModeStatusValue"); return iFlightModeActive; } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/src/saticon.cpp --- a/adaptationlayer/tsy/simatktsy_dll/src/saticon.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/src/saticon.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -58,7 +58,7 @@ iRecordNumber( KZero ), iImageInstanceNoInRecord( KZero ) { - OstTrace0( TRACE_NORMAL, CSATICON_CSATICON, "CSatIcon::CSatIcon" ); + OstTrace0( TRACE_NORMAL, CSATICON_CSATICON_TD, "CSatIcon::CSatIcon" ); iRecordData.Zero(); } @@ -70,7 +70,7 @@ // void CSatIcon::ConstructL() { - OstTrace0( TRACE_NORMAL, CSATICON_CONSTRUCTL, "CSatIcon::ConstructL" ); + OstTrace0( TRACE_NORMAL, CSATICON_CONSTRUCTL_TD, "CSatIcon::ConstructL" ); // None. Reserved for future use. } @@ -86,7 +86,7 @@ CTsySatMessaging* aSatMessaging ) { - OstTrace0( TRACE_NORMAL, CSATICON_NEWL, "CSatIcon::NewL" ); + OstTrace0( TRACE_NORMAL, CSATICON_NEWL_TD, "CSatIcon::NewL" ); TFLOGSTRING("TSY: CSatIcon::NewL"); CSatIcon* self = new( ELeave ) CSatIcon( aSatMessHandler, aSatMessaging ); @@ -106,7 +106,7 @@ // CSatIcon::~CSatIcon() { - OstTrace0( TRACE_NORMAL, DUP1_CSATICON_CSATICON, "CSatIcon::~CSatIcon" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATICON_CSATICON_TD, "CSatIcon::~CSatIcon" ); TFLOGSTRING("TSY: CSatIcon::~CSatIcon"); } @@ -124,7 +124,7 @@ TTsyReqHandle aTsyReqHandle // Request handle ) { - OstTrace0( TRACE_NORMAL, CSATICON_GETICON, "CSatIcon::GetIcon" ); + OstTrace0( TRACE_NORMAL, CSATICON_GETICON_TD, "CSatIcon::GetIcon" ); TFLOGSTRING("TSY: CSatIcon::GetIcon"); iImageInstanceNoInRecord = 0; @@ -133,7 +133,7 @@ if ( iIconTsyReqHandle ) { TFLOGSTRING("TSY: CSatIcon::GetIcon : KErrServerBusy"); - OstTrace0( TRACE_NORMAL, DUP1_CSATICON_GETICON, "CSatIcon::GetIcon : KErrServerBusy" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATICON_GETICON_TD, "CSatIcon::GetIcon : KErrServerBusy" ); iSatMessaging->ReqCompleted( aTsyReqHandle, KErrServerBusy); } @@ -152,7 +152,7 @@ } TFLOGSTRING2("TSY: CSatIcon::GetIcon, ret: %d", ret ); - OstTrace1( TRACE_NORMAL, DUP3_CSATICON_GETICON, "CSatIcon::GetIcon, ret: %d", ret ); + OstTrace1( TRACE_NORMAL, DUP3_CSATICON_GETICON_TD, "CSatIcon::GetIcon, ret: %d", ret ); return ret; @@ -170,7 +170,7 @@ const TDesC8& aInfo // Icon info block ) { - OstTrace0( TRACE_NORMAL, CSATICON_COMPLETEICONREQUEST, "CSatIcon::CompleteIconRequest" ); + OstTrace0( TRACE_NORMAL, CSATICON_COMPLETEICONREQUEST_TD, "CSatIcon::CompleteIconRequest" ); TFLOGSTRING("TSY: CSatIcon::CompleteIconRequest, entered"); if ( iIconTsyReqHandle ) @@ -232,7 +232,7 @@ iIconData = NULL; iGetIconFlag = EFalse; TFLOGSTRING2("TSY: CSatIcon::CompleteIconRequest, aStatus: %d", aStatus ); - OstTrace1( TRACE_NORMAL, DUP1_CSATICON_COMPLETEICONREQUEST, "CSatIcon::CompleteIconRequest, aStatus: %d", aStatus ); + OstTrace1( TRACE_NORMAL, DUP1_CSATICON_COMPLETEICONREQUEST_TD, "CSatIcon::CompleteIconRequest, aStatus: %d", aStatus ); iSatMessaging->ReqCompleted( iIconTsyReqHandle, aStatus ); iIconTsyReqHandle = NULL; @@ -253,7 +253,7 @@ TTsyReqHandle aTsyReqHandle // request handle ) { - OstTrace0( TRACE_NORMAL, CSATICON_GETIMAGEINSTANCE, "CSatIcon::GetImageInstance" ); + OstTrace0( TRACE_NORMAL, CSATICON_GETIMAGEINSTANCE_TD, "CSatIcon::GetImageInstance" ); TFLOGSTRING("TSY: CSatIcon::GetImageInstance"); TInt ret( KErrNotFound ); @@ -261,7 +261,7 @@ if( iIconTsyReqHandle ) { TFLOGSTRING("TSY: CSatIcon::GetImageInstance : KErrServerBusy"); - OstTrace0( TRACE_NORMAL, DUP1_CSATICON_GETIMAGEINSTANCE, "CSatIcon::GetImageInstance : KErrServerBusy" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATICON_GETIMAGEINSTANCE_TD, "CSatIcon::GetImageInstance : KErrServerBusy" ); iSatMessaging->ReqCompleted( aTsyReqHandle, KErrServerBusy); } @@ -313,7 +313,7 @@ } } TFLOGSTRING2("TSY: CSatIcon::GetImageInstance, ret: %d", ret ); - OstTrace1( TRACE_NORMAL, DUP3_CSATICON_GETIMAGEINSTANCE, "CSatIcon::GetImageInstance, ret: %d", ret ); + OstTrace1( TRACE_NORMAL, DUP3_CSATICON_GETIMAGEINSTANCE_TD, "CSatIcon::GetImageInstance, ret: %d", ret ); return ret; } @@ -332,14 +332,14 @@ TTsyReqHandle aTsyReqHandle // Request handle ) { - OstTrace0( TRACE_NORMAL, CSATICON_GETCLUT, "CSatIcon::GetClut" ); + OstTrace0( TRACE_NORMAL, CSATICON_GETCLUT_TD, "CSatIcon::GetClut" ); TFLOGSTRING("TSY: CSatIcon::GetClut"); TInt ret( KErrNotFound ); if( iIconTsyReqHandle ) { TFLOGSTRING("TSY: CSatIcon::GetClut : KErrServerBusy"); - OstTrace0( TRACE_NORMAL, DUP1_CSATICON_GETCLUT, "CSatIcon::GetClut : KErrServerBusy" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATICON_GETCLUT_TD, "CSatIcon::GetClut : KErrServerBusy" ); iSatMessaging->ReqCompleted( aTsyReqHandle, KErrServerBusy); } @@ -359,7 +359,7 @@ } } TFLOGSTRING2("TSY: CSatIcon::GetClut, ret: %d", ret ); - OstTrace1( TRACE_NORMAL, DUP3_CSATICON_GETCLUT, "CSatIcon::GetClut, ret: %d", ret ); + OstTrace1( TRACE_NORMAL, DUP3_CSATICON_GETCLUT_TD, "CSatIcon::GetClut, ret: %d", ret ); iImageInstanceNoInRecord = 0; return ret; diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/src/satmessaging.cpp --- a/adaptationlayer/tsy/simatktsy_dll/src/satmessaging.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/src/satmessaging.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -103,7 +103,7 @@ iSatAppName( aName ), iSendSmsTsyReqHandle( NULL ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_CTSYSATMESSAGING, "CTsySatMessaging::CTsySatMessaging" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_CTSYSATMESSAGING_TD, "CTsySatMessaging::CTsySatMessaging" ); TFLOGSTRING("TSY: CTsySatMessaging::CTsySatMessaging"); /* None */ } @@ -116,7 +116,7 @@ ) { - OstTrace0( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_CTSYSATMESSAGING, "CTsySatMessaging::CTsySatMessaging" ); + OstTrace0( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_CTSYSATMESSAGING_TD, "CTsySatMessaging::CTsySatMessaging" ); iPnSend = aPnSend; iPnReceive = aPnReceive; @@ -136,7 +136,7 @@ // void CTsySatMessaging::ConstructL() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_CONSTRUCTL, "CTsySatMessaging::ConstructL" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_CONSTRUCTL_TD, "CTsySatMessaging::ConstructL" ); TFLOGSTRING("TSY: CTsySatMessaging::ConstructL"); // Create message handler object, to receive ISI messages from ISA CellMo @@ -230,12 +230,12 @@ iSatIcon = CSatIcon::NewL( iSatMessHandler, this ); // Request IMEI code. Needed in provide local info proactive command. - iSatMessHandler->InfoSerialNumberReadReq( - GetTransactionId(), INFO_SB_SN_IMEI_PLAIN ); + /*iSatMessHandler->InfoSerialNumberReadReq( + GetTransactionId(), INFO_SB_SN_IMEI_PLAIN );*/ // Request IMEI-SV code. Needed in provide local info proactive command. - iSatMessHandler->InfoSerialNumberReadReq( - GetTransactionId(), INFO_SN_IMEI_SV_TO_NET ); + /*iSatMessHandler->InfoSerialNumberReadReq( + GetTransactionId(), INFO_SN_IMEI_SV_TO_NET );*/ // Request Network status iSatMessHandler->NetCellInfoGetReq( @@ -246,7 +246,7 @@ -#ifdef INFO_PP_SIM_OLD_POLL_INTERVAL +/*#ifdef INFO_PP_SIM_OLD_POLL_INTERVAL // Check old poll interval is supported by ME's Product Profile iSatMessHandler->InfoPpReadReq( INFO_PP_SIM_OLD_POLL_INTERVAL ); #endif @@ -254,7 +254,7 @@ #ifdef INFO_PP_ENHANCED_NETWORK_SELECTION // Check INFO_PP_ENHANCED_NETWORK_SELECTION status in product profile iSatMessHandler->InfoPpReadReq( INFO_PP_ENHANCED_NETWORK_SELECTION ); -#endif +#endif*/ } // ----------------------------------------------------------------------------- @@ -270,7 +270,7 @@ TName aName ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NEWL, "CTsySatMessaging::NewL" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NEWL_TD, "CTsySatMessaging::NewL" ); TFLOGSTRING("TSY: CTsySatMessaging::NewL"); // First check that given arguments are not NULL pointers @@ -278,7 +278,7 @@ { TFLOGSTRING("TSY: CTsySatMessaging::NewL, NULL pointers were given \ leaving!"); - OstTrace0( TRACE_NORMAL, DUP2_CTSYSATMESSAGING_NEWL, "CTsySatMessaging::NewL, NULL pointers were given leaving!" ); + OstTrace0( TRACE_NORMAL, DUP2_CTSYSATMESSAGING_NEWL_TD, "CTsySatMessaging::NewL, NULL pointers were given leaving!" ); User::Leave( KErrArgument ); } @@ -298,7 +298,7 @@ // This may happen if LicenseeTSY stub is used with real SIM_ATK_TSY TFLOGSTRING("TSY: CTsySatMessaging::NewL, Construction failed \ PhoNet is not initialized, leaving!"); - OstTrace0( TRACE_NORMAL, DUP5_CTSYSATMESSAGING_NEWL, "CTsySatMessaging::NewL, Construction failed PhoNet is not initialized, leaving!" ); + OstTrace0( TRACE_NORMAL, DUP5_CTSYSATMESSAGING_NEWL_TD, "CTsySatMessaging::NewL, Construction failed PhoNet is not initialized, leaving!" ); User::Leave( KErrArgument ); } @@ -316,7 +316,7 @@ CMmMessageRouter* aRouter ) { - OstTrace0( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_NEWL, "CTsySatMessaging::NewL" ); + OstTrace0( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_NEWL_TD, "CTsySatMessaging::NewL" ); TFLOGSTRING("TSY: CTsySatMessaging::NewL"); // First check that given arguments are not NULL pointers @@ -324,7 +324,7 @@ { TFLOGSTRING("TSY: CTsySatMessaging::NewL, NULL pointers were given \ leaving!"); - OstTrace0( TRACE_NORMAL, DUP3_CTSYSATMESSAGING_NEWL, "CTsySatMessaging::NewL, NULL pointers were given leaving!" ); + OstTrace0( TRACE_NORMAL, DUP3_CTSYSATMESSAGING_NEWL_TD, "CTsySatMessaging::NewL, NULL pointers were given leaving!" ); User::Leave( KErrArgument ); } @@ -343,7 +343,7 @@ // This may happen if LicenseeTSY stub is used with real SIM_ATK_TSY TFLOGSTRING("TSY: CTsySatMessaging::NewL, Construction failed \ PhoNet is not initialized, leaving!"); - OstTrace0( TRACE_NORMAL, DUP4_CTSYSATMESSAGING_NEWL, "CTsySatMessaging::NewL, Construction failed PhoNet is not initialized, leaving!" ); + OstTrace0( TRACE_NORMAL, DUP4_CTSYSATMESSAGING_NEWL_TD, "CTsySatMessaging::NewL, Construction failed PhoNet is not initialized, leaving!" ); User::Leave( KErrArgument ); } @@ -364,7 +364,7 @@ // CTsySatMessaging::~CTsySatMessaging() { - OstTrace0( TRACE_NORMAL, DUP2_CTSYSATMESSAGING_CTSYSATMESSAGING, "CTsySatMessaging::~CTsySatMessaging" ); + OstTrace0( TRACE_NORMAL, DUP2_CTSYSATMESSAGING_CTSYSATMESSAGING_TD, "CTsySatMessaging::~CTsySatMessaging" ); TFLOGSTRING("TSY: CTsySatMessaging::~CTsySatMessaging"); // Delete message handler object, SAT SMS sending @@ -429,7 +429,7 @@ const TDesC& /* aName */ // Name of the object ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_OPENNEWOBJECTBYNAMEL, "CTsySatMessaging::OpenNewObjectByNameL" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_OPENNEWOBJECTBYNAMEL_TD, "CTsySatMessaging::OpenNewObjectByNameL" ); TFLOGSTRING("TSY: CTsySatMessaging::OpenNewObjectByNameL"); User::Leave( KErrNotSupported ); return NULL; @@ -446,7 +446,7 @@ TDes& /*aNewName*/ // Name of the new object ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_OPENNEWOBJECTL, "CTsySatMessaging::OpenNewObjectL" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_OPENNEWOBJECTL_TD, "CTsySatMessaging::OpenNewObjectL" ); TFLOGSTRING("TSY: CTsySatMessaging::OpenNewObjectL"); User::Leave( KErrNotSupported ); return NULL; @@ -466,7 +466,7 @@ const TDataPackage& aPackage // Contains parameters for request ) { - OstTraceExt2( TRACE_NORMAL, CTSYSATMESSAGING_EXTFUNC, "CTsySatMessaging::ExtFunc ReqHandle: %d IPC: %d", TInt(aTsyReqHandle), aIpc ); + OstTraceExt2( TRACE_NORMAL, CTSYSATMESSAGING_EXTFUNC_TD, "CTsySatMessaging::ExtFunc ReqHandle: %d IPC: %d", TInt(aTsyReqHandle), aIpc ); TFLOGSTRING3("TSY: CTsySatMessaging::ExtFunc ReqHandle=%d IPC=%d", aTsyReqHandle, aIpc); @@ -499,7 +499,7 @@ const TDataPackage& aPackage // Contains parameters for request ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_DOEXTFUNCL, "CTsySatMessaging::DoExtFuncL" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_DOEXTFUNCL_TD, "CTsySatMessaging::DoExtFuncL" ); TFLOGSTRING("TSY: CTsySatMessaging::DoExtFuncL"); TAny* dataPtr=aPackage.Ptr1(); TAny* dataPtr2=aPackage.Ptr2(); @@ -711,7 +711,7 @@ default: { TFLOGSTRING2("TSY: CTsySatMessaging::DoExtFuncL unsupported IPC %d", aIpc); - OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_DOEXTFUNCL, "CTsySatMessaging::DoExtFuncL unsupported IPC %d", aIpc ); + OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_DOEXTFUNCL_TD, "CTsySatMessaging::DoExtFuncL unsupported IPC %d", aIpc ); ReqCompleted( aTsyReqHandle, KErrNotSupported ); break; @@ -732,7 +732,7 @@ const TTsyReqHandle aTsyReqHandle // Request handle ) { - OstTraceExt2( TRACE_NORMAL, CTSYSATMESSAGING_CANCELSERVICE, "CTsySatMessaging::CancelService ReqHandle=%d, IPC=%d", TInt(aTsyReqHandle), aIpc ); + OstTraceExt2( TRACE_NORMAL, CTSYSATMESSAGING_CANCELSERVICE_TD, "CTsySatMessaging::CancelService ReqHandle=%d, IPC=%d", TInt(aTsyReqHandle), aIpc ); TFLOGSTRING3("TSY: CTsySatMessaging::CancelService ReqHandle=%d IPC=%d",aTsyReqHandle, aIpc); TInt ret( KErrNone ); switch ( aIpc ) @@ -898,7 +898,7 @@ default: { TFLOGSTRING2("TSY: CTsySatMessaging::CancelService invalid IPC %d",aIpc); - OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_CANCELSERVICE, "CTsySatMessaging::CancelService invalid IPC %d", aIpc ); + OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_CANCELSERVICE_TD, "CTsySatMessaging::CancelService invalid IPC %d", aIpc ); ret = KErrGeneral; break; @@ -918,7 +918,7 @@ const TInt aIpc // IPC number of request ) { - OstTrace1( TRACE_NORMAL, CTSYSATMESSAGING_REQMODEL, "CTsySatMessaging::ReqModeL, IPC=%d", aIpc ); + OstTrace1( TRACE_NORMAL, CTSYSATMESSAGING_REQMODEL_TD, "CTsySatMessaging::ReqModeL, IPC=%d", aIpc ); TFLOGSTRING2("TSY: CTsySatMessaging::ReqModeL, IPC = %d",aIpc); CTelObject::TReqMode ret = 0; switch ( aIpc ) @@ -974,7 +974,7 @@ default: { TFLOGSTRING2( "TSY: CTsySatMessaging::ReqModeL unsupported IPC %d", aIpc ); - OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_REQMODEL, "CTsySatMessaging::ReqModeL unsupported IPC %d", aIpc ); + OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_REQMODEL_TD, "CTsySatMessaging::ReqModeL unsupported IPC %d", aIpc ); User::Leave( KErrNotSupported ); break; @@ -991,7 +991,7 @@ // void CTsySatMessaging::Init() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_INIT, "CTsySatMessaging::Init" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_INIT_TD, "CTsySatMessaging::Init" ); TFLOGSTRING("TSY: CTsySatMessaging::Init"); // none } @@ -1007,7 +1007,7 @@ const TInt aIpc // IPC number of request ) { - OstTrace1( TRACE_NORMAL, CTSYSATMESSAGING_REGISTERNOTIFICATION, "CTsySatMessaging::RegisterNotification, IPC = %d", aIpc ); + OstTrace1( TRACE_NORMAL, CTSYSATMESSAGING_REGISTERNOTIFICATION_TD, "CTsySatMessaging::RegisterNotification, IPC = %d", aIpc ); TFLOGSTRING2("TSY: CTsySatMessaging::RegisterNotification, IPC = %d",aIpc); // Initialize return value TInt ret( KErrNone ); @@ -1049,7 +1049,7 @@ { // Unknown or invalid IPC TFLOGSTRING2("TSY: CTsySatMessaging::RegisterNotification, unsupported IPC %d", aIpc); - OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_REGISTERNOTIFICATION, "CTsySatMessaging::RegisterNotification unsupported IPC %d", aIpc ); + OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_REGISTERNOTIFICATION_TD, "CTsySatMessaging::RegisterNotification unsupported IPC %d", aIpc ); ret = KErrNotSupported; break; @@ -1070,7 +1070,7 @@ const TInt aIpc // IPC number of request ) { - OstTrace1( TRACE_NORMAL, CTSYSATMESSAGING_DEREGISTERNOTIFICATION, "CTsySatMessaging::DeregisterNotification, IPC = %d", aIpc ); + OstTrace1( TRACE_NORMAL, CTSYSATMESSAGING_DEREGISTERNOTIFICATION_TD, "CTsySatMessaging::DeregisterNotification, IPC = %d", aIpc ); TFLOGSTRING2( "TSY: CTsySatMessaging::DeregisterNotification\ IPC = %d", aIpc ); // Initialize return value @@ -1114,7 +1114,7 @@ // Unknown or invalid IPC TFLOGSTRING2("TSY: CTsySatMessaging::DeregisterNotification \ unsupported IPC %d", aIpc); - OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_DEREGISTERNOTIFICATION, "CTsySatMessaging::DeregisterNotification unsupported IPC %d", aIpc ); + OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_DEREGISTERNOTIFICATION_TD, "CTsySatMessaging::DeregisterNotification unsupported IPC %d", aIpc ); ret = KErrNotSupported; break; @@ -1134,7 +1134,7 @@ const TInt aIpc // IPC number of request ) { - OstTrace1( TRACE_NORMAL, CTSYSATMESSAGING_NUMBEROFSLOTSL, "CTsySatMessaging::NumberOfSlotsL IPC %d", aIpc ); + OstTrace1( TRACE_NORMAL, CTSYSATMESSAGING_NUMBEROFSLOTSL_TD, "CTsySatMessaging::NumberOfSlotsL IPC %d", aIpc ); TFLOGSTRING2("TSY: CTsySatMessaging::NumberOfSlotsL IPC %d", aIpc); TInt numberOfSlots( 1 ); switch ( aIpc ) @@ -1215,7 +1215,7 @@ // Unknown or invalid IPC TFLOGSTRING2( "TSY: CTsySatMessaging::NumberOfSlotsL\ unsupported IPC %d", aIpc ); - OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_NUMBEROFSLOTSL, "CTsySatMessaging::NumberOfSlotsL unsupported IPC %d", aIpc ); + OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_NUMBEROFSLOTSL_TD, "CTsySatMessaging::NumberOfSlotsL unsupported IPC %d", aIpc ); User::Leave( KErrNotSupported ); break; @@ -1232,7 +1232,7 @@ // CSatMessHandler* CTsySatMessaging::GetSatMessHandler() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETSATMESSHANDLER, "CTsySatMessaging::GetSatMessHandler" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETSATMESSHANDLER_TD, "CTsySatMessaging::GetSatMessHandler" ); TFLOGSTRING("TSY:CTsySatMessaging::GetSatMessHandler"); // Pointer to SAT message handler return iSatMessHandler; @@ -1246,7 +1246,7 @@ // CSatFlightModeStatus* CTsySatMessaging::GetSatFlightModeStatus() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETSATFLIGHTMODESTATUS, "CTsySatMessaging::GetSatFlightModeStatus" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETSATFLIGHTMODESTATUS_TD, "CTsySatMessaging::GetSatFlightModeStatus" ); TFLOGSTRING("TSY:CTsySatMessaging::GetSatFlightModeStatus"); // Pointer to SAT flight mode status return iSatFlightModeStatus; @@ -1264,7 +1264,7 @@ TInt aStatus // Message sending status from MMSMS ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_COMPLETESENDSMSMESSAGE, "CTsySatMessaging::CompleteSendSmsMessage" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_COMPLETESENDSMSMESSAGE_TD, "CTsySatMessaging::CompleteSendSmsMessage" ); TFLOGSTRING("TSY: CTsySatMessaging::CompleteSendSmsMessage, entered"); if ( iSendSmsTsyReqHandle ) { @@ -1286,7 +1286,7 @@ TTsyReqHandle aTsyReqHandle // Request handle ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_MENUSELECTION, "CTsySatMessaging::MenuSelection" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_MENUSELECTION_TD, "CTsySatMessaging::MenuSelection" ); TFLOGSTRING("TSY:CTsySatMessaging::MenuSelection"); TInt ret( KErrNone ); RSat::TMenuSelectionV1Pckg* aPckg = @@ -1294,8 +1294,8 @@ RSat::TMenuSelectionV1& selectionV1 = ( *aPckg ) (); TFLOGSTRING3("TSY:CTsySatMessaging::MenuSelection, iItemId %x, Help: %c", selectionV1.iItemId, selectionV1.iHelp ); - OstTraceExt1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_MENUSELECTION, "CTsySatMessaging::MenuSelection iItemId: %hhu", selectionV1.iItemId ); - OstTrace1( TRACE_NORMAL, DUP2_CTSYSATMESSAGING_MENUSELECTION, "CTsySatMessaging::MenuSelection Help: %{THelpRequest}", selectionV1.iHelp ); + OstTraceExt1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_MENUSELECTION_TD, "CTsySatMessaging::MenuSelection iItemId: %hhu", selectionV1.iItemId ); + OstTrace1( TRACE_NORMAL, DUP2_CTSYSATMESSAGING_MENUSELECTION_TD, "CTsySatMessaging::MenuSelection Help: %{THelpRequest}", selectionV1.iHelp ); // Creating the menu selection message if ( selectionV1.iHelp == RSat::EHelpRequested ) @@ -1329,7 +1329,7 @@ TTsyReqHandle aTsyReqHandle //tsy request handle ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCBDOWNLOAD, "CTsySatMessaging::NotifyCbDownload" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCBDOWNLOAD_TD, "CTsySatMessaging::NotifyCbDownload" ); TFLOGSTRING("TSY:CTsySatMessaging::NotifyCbDownload"); TInt ret( KErrNone ); ReqCompleted( aTsyReqHandle, ret ); @@ -1349,7 +1349,7 @@ TTsyReqHandle aTsyReqHandle //tsy request handle ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYSMSPPDOWNLOAD, "CTsySatMessaging::NotifySmsPpDownload" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYSMSPPDOWNLOAD_TD, "CTsySatMessaging::NotifySmsPpDownload" ); TFLOGSTRING("TSY:CTsySatMessaging::NotifySmsPpDownload"); TInt ret( KErrNone ); ReqCompleted( aTsyReqHandle, ret ); @@ -1369,7 +1369,7 @@ TTsyReqHandle aTsyReqHandle // Request handle ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL, "CTsySatMessaging::SendMessageNoLoggingL" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL_TD, "CTsySatMessaging::SendMessageNoLoggingL" ); TFLOGSTRING("TSY: CTsySatMessaging::SendMessageNoLoggingL"); TInt ret( KErrNone ); // Save Reqhandle for CompleteSendSmsMessage @@ -1448,7 +1448,7 @@ CMmSmsTsy* mmSmsTsy = iMmPhone->SmsSession(); TFLOGSTRING2("TSY: CTsySatMessaging::SendMessageNoLoggingL, \ mmSmsTsy: %x", mmSmsTsy ); - OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL, "CTsySatMessaging::SendMessageNoLoggingL, mmSmsTsy: %x", mmSmsTsy ); + OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL_TD, "CTsySatMessaging::SendMessageNoLoggingL, mmSmsTsy: %x", mmSmsTsy ); if ( mmSmsTsy ) // Check that SMS session exist { @@ -1457,7 +1457,7 @@ &numberPlan, EFalse, aTsyReqHandle ); TFLOGSTRING2("TSY: CTsySatMessaging::SendMessageNoLoggingL, \ SendSmsMessage done, ret: %x", ret ); - OstTrace1( TRACE_NORMAL, DUP2_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL, "CTsySatMessaging::SendMessageNoLoggingL, SendSmsMessage done, ret: %d", ret ); + OstTrace1( TRACE_NORMAL, DUP2_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL_TD, "CTsySatMessaging::SendMessageNoLoggingL, SendSmsMessage done, ret: %d", ret ); } else { @@ -1465,7 +1465,7 @@ ret = KErrNotReady; TFLOGSTRING("TSY: CTsySatMessaging::SendMessageNoLoggingL, \ no SMS session!"); - OstTrace0( TRACE_NORMAL, DUP3_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL, "CTsySatMessaging::SendMessageNoLoggingL, no SMS session!" ); + OstTrace0( TRACE_NORMAL, DUP3_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL_TD, "CTsySatMessaging::SendMessageNoLoggingL, no SMS session!" ); } #else //NCP_COMMON_S60_VERSION_SUPPORT // Deliver attributes to message handler by using @@ -1513,7 +1513,7 @@ ret = KErrGeneral; TFLOGSTRING("TSY: CTsySatMessaging::SendMessageNoLoggingL, \ SCA missing"); - OstTrace0( TRACE_NORMAL, DUP4_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL, "CTsySatMessaging::SendMessageNoLoggingL, SCA missing" ); + OstTrace0( TRACE_NORMAL, DUP4_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL_TD, "CTsySatMessaging::SendMessageNoLoggingL, SCA missing" ); } // Failure in sending of SAT SMS, call complete method @@ -1522,7 +1522,7 @@ CompleteSendSmsMessage( ret ); TFLOGSTRING("TSY: CTsySatMessaging::SendMessageNoLoggingL, \ failure sending SAT SMS, complete"); - OstTrace0( TRACE_NORMAL, DUP5_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL, "CTsySatMessaging::SendMessageNoLoggingL, failure sending SAT SMS, complete" ); + OstTrace0( TRACE_NORMAL, DUP5_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL_TD, "CTsySatMessaging::SendMessageNoLoggingL, failure sending SAT SMS, complete" ); } return ret; @@ -1542,7 +1542,7 @@ TTsyReqHandle aTsyReqHandle // Request handle ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_TERMINALRESPONSE, "CTsySatMessaging::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_TERMINALRESPONSE_TD, "CTsySatMessaging::TerminalResponse" ); TFLOGSTRING("TSY: CTsySatMessaging::TerminalResponse"); TInt ret( KErrNone ); switch ( *aPCmd ) @@ -1618,7 +1618,7 @@ default: TFLOGSTRING("TSY: CTsySatMessaging::TerminalResponse, \ PCmd not supported"); - OstTrace0( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_TERMINALRESPONSE, "CTsySatMessaging::TerminalResponse, PCmd not supported" ); + OstTrace0( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_TERMINALRESPONSE_TD, "CTsySatMessaging::TerminalResponse, PCmd not supported" ); ret = KErrGeneral; break; @@ -1637,7 +1637,7 @@ // void CTsySatMessaging::PCmdReceivedL( const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_PCMDRECEIVEDL, "CTsySatMessaging::PCmdReceivedL" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_PCMDRECEIVEDL_TD, "CTsySatMessaging::PCmdReceivedL" ); TFLOGSTRING("TSY: CTsySatMessaging::PCmdReceivedL"); CBerTlv berTlv; berTlv.BerTlv( aIsiMessage ); @@ -1730,7 +1730,7 @@ default: { TFLOGSTRING("TSY: CTsySatMessaging::PCmdReceivedL, PCmd not supported"); - OstTrace0( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_PCMDRECEIVEDL, "CTsySatMessaging::PCmdReceivedL, PCmd not supported" ); + OstTrace0( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_PCMDRECEIVEDL_TD, "CTsySatMessaging::PCmdReceivedL, PCmd not supported" ); // If proactive command is not supported, terminal response // with "Command is beyond ME's capabilities" information @@ -1764,7 +1764,7 @@ TUint32 aTimerValue ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_TIMEREXPIRATION, "CTsySatMessaging::TimerExpiration" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_TIMEREXPIRATION_TD, "CTsySatMessaging::TimerExpiration" ); TFLOGSTRING("TSY: CTsySatMessaging::TimerExpiration"); TUint8 time[3] = {0, 0, 0}; TInt num[3]; @@ -1791,7 +1791,7 @@ // CSatTimer* CTsySatMessaging::GetSatTimer() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETSATTIMER, "CTsySatMessaging::GetSatTimer" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETSATTIMER_TD, "CTsySatMessaging::GetSatTimer" ); // Pointer to SAT timer return iSatTimer; } @@ -1804,7 +1804,7 @@ // CSatNotifyRefresh* CTsySatMessaging::GetNotifyRefresh() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETNOTIFYREFRESH, "CTsySatMessaging::GetNotifyRefresh" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETNOTIFYREFRESH_TD, "CTsySatMessaging::GetNotifyRefresh" ); return iNotifyRefresh; } @@ -1816,7 +1816,7 @@ // CSatDataDownload* CTsySatMessaging::GetDataDownload() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETDATADOWNLOAD, "CTsySatMessaging::GetDataDownload" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETDATADOWNLOAD_TD, "CTsySatMessaging::GetDataDownload" ); return iSatDataDownload; } @@ -1828,7 +1828,7 @@ // CSatNotifyPollInterval* CTsySatMessaging::GetNotifyPollInterval() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETNOTIFYPOLLINTERVAL, "CTsySatMessaging::GetNotifyPollInterval" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETNOTIFYPOLLINTERVAL_TD, "CTsySatMessaging::GetNotifyPollInterval" ); return iNotifyPollInterval; } @@ -1840,7 +1840,7 @@ // CSatMoSmsCtrl* CTsySatMessaging::GetMoSmsCtrl() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETMOSMSCTRL, "CTsySatMessaging::GetMoSmsCtrl" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETMOSMSCTRL_TD, "CTsySatMessaging::GetMoSmsCtrl" ); return iSatMoSmsCtrl; } @@ -1852,7 +1852,7 @@ // CSatEventDownload* CTsySatMessaging::GetEventDownload() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETEVENTDOWNLOAD, "CTsySatMessaging::GetEventDownload" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETEVENTDOWNLOAD_TD, "CTsySatMessaging::GetEventDownload" ); return iEventDownload; } @@ -1864,7 +1864,7 @@ // CSatNotifyPollingOff* CTsySatMessaging::GetNotifyPollingOff() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETNOTIFYPOLLINGOFF, "CTsySatMessaging::GetNotifyPollingOff" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETNOTIFYPOLLINGOFF_TD, "CTsySatMessaging::GetNotifyPollingOff" ); return iNotifyPollingOff; } @@ -1876,7 +1876,7 @@ // CSatNotifyLocalInfo* CTsySatMessaging::GetNotifyLocalInfo() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETNOTIFYLOCALINFO, "CTsySatMessaging::GetNotifyLocalInfo" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETNOTIFYLOCALINFO_TD, "CTsySatMessaging::GetNotifyLocalInfo" ); return iNotifyLocalInfo; } @@ -1891,7 +1891,7 @@ const TIsiReceiveC& aIsiMessage //Event download message ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_EVENTDOWNLOADRECEIVED, "CTsySatMessaging::EventDownloadReceived" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_EVENTDOWNLOADRECEIVED_TD, "CTsySatMessaging::EventDownloadReceived" ); iEventDownload->MessageReceived( aIsiMessage ); } @@ -1906,7 +1906,7 @@ TUint32 aEvents //events to be monitored ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SETUPEVENTLIST, "CTsySatMessaging::SetUpEventList" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SETUPEVENTLIST_TD, "CTsySatMessaging::SetUpEventList" ); iEventDownload->SetUpEventList( aEvents ); } @@ -1921,7 +1921,7 @@ const TIsiReceiveC& aIsiMessage //message ending session ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SESSIONEND, "CTsySatMessaging::SessionEnd" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SESSIONEND_TD, "CTsySatMessaging::SessionEnd" ); iNotifySimSessionEnd->MessageReceived( aIsiMessage ); } @@ -1937,7 +1937,7 @@ RSat::TControlResult aResult ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCLIENTABOUTCALLCONTROLEVENT, "CTsySatMessaging::NotifyClientAboutCallControlEvent" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCLIENTABOUTCALLCONTROLEVENT_TD, "CTsySatMessaging::NotifyClientAboutCallControlEvent" ); iNotifyCallControlRequest->CompleteNotification( aAlphaId, aResult ); } @@ -1953,7 +1953,7 @@ TPtrC8 aEnvelopeResponse ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCLIENTABOUTCALLCONTROLEVENTL, "CTsySatMessaging::NotifyClientAboutCallControlEventL" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCLIENTABOUTCALLCONTROLEVENTL_TD, "CTsySatMessaging::NotifyClientAboutCallControlEventL" ); iNotifyCallControlRequest->CompleteNotificationL( aCcResult, aEnvelopeResponse ); } @@ -1969,7 +1969,7 @@ const RSat::TControlResult aResult ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCLIENTABOUTGPRSCALLCONTROLEVENT, "CTsySatMessaging::NotifyClientAboutGprsCallControlEvent" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCLIENTABOUTGPRSCALLCONTROLEVENT_TD, "CTsySatMessaging::NotifyClientAboutGprsCallControlEvent" ); iNotifyCallControlRequest->CompleteNotification( aAlphaId, aResult ); @@ -1987,7 +1987,7 @@ RSat::TControlResult aResult ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCLIENTABOUTMOSMCONTROLEVENT, "CTsySatMessaging::NotifyClientAboutMoSmControlEvent" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCLIENTABOUTMOSMCONTROLEVENT_TD, "CTsySatMessaging::NotifyClientAboutMoSmControlEvent" ); iNotifyMoSmControlRequest->CompleteNotification( aAlphaId, aResult ); } @@ -1999,7 +1999,7 @@ // TUint8 CTsySatMessaging::GetTransactionId() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETTRANSACTIONID, "CTsySatMessaging::GetTransactionId" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETTRANSACTIONID_TD, "CTsySatMessaging::GetTransactionId" ); return iTransIdMsg->GetTransactionId( ); } @@ -2014,7 +2014,7 @@ TUint8 aMsg // Message to be retrieved ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SATREADY, "CTsySatMessaging::SatReady" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SATREADY_TD, "CTsySatMessaging::SatReady" ); return iPnReceive->SatReady( aMsg ); } @@ -2027,7 +2027,7 @@ // void CTsySatMessaging::ClearCCArrays() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_CLEARCCARRAYS, "CTsySatMessaging::ClearCCArrays" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_CLEARCCARRAYS_TD, "CTsySatMessaging::ClearCCArrays" ); iSatCC->ClearArraysForRefresh(); } @@ -2042,7 +2042,7 @@ const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_CALLCONTROLRECEIVEDL, "CTsySatMessaging::CallControlReceivedL" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_CALLCONTROLRECEIVEDL_TD, "CTsySatMessaging::CallControlReceivedL" ); iSatCC->MessageReceivedL( aIsiMessage ); } @@ -2057,7 +2057,7 @@ const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_DATADOWNLOADRECEIVEDL, "CTsySatMessaging::DataDownloadReceivedL" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_DATADOWNLOADRECEIVEDL_TD, "CTsySatMessaging::DataDownloadReceivedL" ); iSatDataDownload->MessageReceivedL( aIsiMessage ); } @@ -2073,7 +2073,7 @@ ) { TFLOGSTRING("TSY: CTsySatMessaging::MoSmsControlReceivedL"); - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_MOSMSCONTROLRECEIVEDL, "CTsySatMessaging::MoSmsControlReceivedL" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_MOSMSCONTROLRECEIVEDL_TD, "CTsySatMessaging::MoSmsControlReceivedL" ); if ( iSatMoSmsCtrl->IsActivated() ) { iSatMoSmsCtrl->MessageReceivedL( aIsiMessage ); @@ -2089,7 +2089,7 @@ // TBool CTsySatMessaging::IsMoSmControlBySimActivated() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_ISMOSMCONTROLBYSIMACTIVATED, "CTsySatMessaging::IsMoSmControlBySimActivated" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_ISMOSMCONTROLBYSIMACTIVATED_TD, "CTsySatMessaging::IsMoSmControlBySimActivated" ); return iSatMoSmsCtrl->IsActivated(); } @@ -2101,7 +2101,7 @@ // CSatIcon* CTsySatMessaging::GetSatIcon() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETSATICON, "CTsySatMessaging::GetSatIcon" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETSATICON_TD, "CTsySatMessaging::GetSatIcon" ); // Pointer to SAT timer return iSatIcon; } @@ -2117,7 +2117,7 @@ const TDesC8& aEnvelope ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_STORECALLCONNECTEDEVENT, "CTsySatMessaging::StoreCallConnectedEvent" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_STORECALLCONNECTEDEVENT_TD, "CTsySatMessaging::StoreCallConnectedEvent" ); iNotifySetUpCall->StoreCallConnectedEvent( aEnvelope ); } @@ -2132,7 +2132,7 @@ const TBool aStatus ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SETSETUPCALLSTATUS, "CTsySatMessaging::SetSetUpCallStatus" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SETSETUPCALLSTATUS_TD, "CTsySatMessaging::SetSetUpCallStatus" ); iEventDownload->SetSetUpCallStatus( aStatus ); } @@ -2147,7 +2147,7 @@ const TBool aStatus ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SETSTATUSOFUSSDSUPPORT, "CTsySatMessaging::SetStatusOfUssdSupport" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SETSTATUSOFUSSDSUPPORT_TD, "CTsySatMessaging::SetStatusOfUssdSupport" ); iSatCC->SetStatusOfUssdSupport( aStatus ); } @@ -2162,7 +2162,7 @@ const TUint8 aTonNpi ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SETTONNPI, "CTsySatMessaging::SetTonNpi" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SETTONNPI_TD, "CTsySatMessaging::SetTonNpi" ); iSatCC->SetTonNpi( aTonNpi ); } @@ -2177,7 +2177,7 @@ RMobileSmsStore::TMobileGsmSmsEntryV1& aSmsEntry ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_STORESMSL, "CTsySatMessaging::StoreSmsL" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_STORESMSL_TD, "CTsySatMessaging::StoreSmsL" ); #if ( NCP_COMMON_S60_VERSION_SUPPORT == S60_VERSION_32 ) RMobileSmsStore::TMobileGsmSmsEntryV1Pckg smsPckg( aSmsEntry ); @@ -2218,7 +2218,7 @@ // void CTsySatMessaging::UsatClientReadyIndication( TTsyReqHandle aTsyReqHandle ) { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_USATCLIENTREADYINDICATION, "CTsySatMessaging::UsatClientReadyIndication" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_USATCLIENTREADYINDICATION_TD, "CTsySatMessaging::UsatClientReadyIndication" ); TFLOGSTRING("TSY: CTsySatMessaging::UsatClientReadyIndication"); // Set SAT ready flag in satmesshandler @@ -2252,7 +2252,7 @@ // CMmMessageRouter* CTsySatMessaging::GetMessageRouter() { - OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETMESSAGEROUTER, "CTsySatMessaging::GetMessageRouter" ); + OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETMESSAGEROUTER_TD, "CTsySatMessaging::GetMessageRouter" ); return iRouter; } #endif diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/src/satmesshandler.cpp --- a/adaptationlayer/tsy/simatktsy_dll/src/satmesshandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/src/satmesshandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -43,7 +43,6 @@ #include // UICC server #include // GPDS server -#include #include #include #include "OstTraceDefinitions.h" @@ -63,8 +62,6 @@ const TUint8 KTimeZoneNotAvailable = 0xFF; // Access Technology unknown const TUint8 KAccTechUnknown = 0xFF; -// This is a common length constant (2 bytes) -const TUint8 KLengthTwoBytes = 0x02; // Maximum polling interval of legacy phones const TUint8 KMaxLegacyPollInterval = 0x19; // 25 decimal // Size of one clut entry in bytes @@ -118,11 +115,12 @@ iTsySatMessaging( aTsySatMessaging ), iPnSend( aPnSend ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CSATMESSHANDLER, "CSatMessHandler::CSatMessHandler" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CSATMESSHANDLER_TD, "CSatMessHandler::CSatMessHandler" ); // >= 0 if there is ongoing transaction iTerminalRespTraId = KNoTransactionOngoing; iGetIconSimReadFieldTraId = KNoTransactionOngoing; iDataDownloadSimReadFieldTraId = KNoTransactionOngoing; + iCbRoutingReqTraId = KNoTransactionOngoing; iCardId = KZero; iImeiAvailable = EFalse; @@ -186,7 +184,7 @@ // CSatMessHandler::~CSatMessHandler() { - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_CSATMESSHANDLER, "CSatMessHandler::~CSatMessHandler" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_CSATMESSHANDLER_TD, "CSatMessHandler::~CSatMessHandler" ); } // ----------------------------------------------------------------------------- @@ -200,7 +198,7 @@ CMmPhoNetSender* aPnSend ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NEWL, "CSatMessHandler::NewL" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NEWL_TD, "CSatMessHandler::NewL" ); TFLOGSTRING("TSY:CSatMessHandler::NewL"); CSatMessHandler* self = new( ELeave ) CSatMessHandler( aTsySatMessaging, @@ -219,7 +217,7 @@ void CSatMessHandler::ConstructL() { TFLOGSTRING("TSY:CSatMessHandler::ConstructL"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CONSTRUCTL, "CSatMessHandler::ConstructL" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CONSTRUCTL_TD, "CSatMessHandler::ConstructL" ); // This flag is set to 'true' when indication ESatUsatClientReadyIndication // is received from SAT server. CAT can be enabled when the state of this @@ -255,7 +253,7 @@ const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_PROACTIVEPROCEDUREMESSAGERECEIVEDL, "CSatMessHandler::ProactiveProcedureMessageReceivedL" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_PROACTIVEPROCEDUREMESSAGERECEIVEDL_TD, "CSatMessHandler::ProactiveProcedureMessageReceivedL" ); TFLOGSTRING("TSY:CSatMessHandler::ProactiveProcedureMessageReceivedL"); // handle event download and related messages @@ -281,7 +279,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NETSERVERMESSAGERECEIVED, "CSatMessHandler::NetServerMessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NETSERVERMESSAGERECEIVED_TD, "CSatMessHandler::NetServerMessageReceived" ); TFLOGSTRING("TSY:CSatMessHandler::NetServerMessageReceived"); TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); @@ -298,7 +296,7 @@ { TFLOGSTRING("TSY:CSatMessHandler::NetServerMessageReceived \ Sending delayed SMS CB routing request."); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_NETSERVERMESSAGERECEIVED, "CSatMessHandler::NetServerMessageReceived Sending delayed SMS CB routing request." ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_NETSERVERMESSAGERECEIVED_TD, "CSatMessHandler::NetServerMessageReceived Sending delayed SMS CB routing request." ); SmsCbRoutingReq( iTsySatMessaging->GetTransactionId(), SMS_ROUTING_SET ); } @@ -333,17 +331,17 @@ } // ----------------------------------------------------------------------------- -// CSatMessHandler::PhoneInfoMessageReceived +// CSatMessHandler::PhoneInfoMessageReceivedL // Called from SatMessHandler::ReceivedL, handles Phone Info related messages // ----------------------------------------------------------------------------- // -void CSatMessHandler::PhoneInfoMessageReceived +/*void CSatMessHandler::PhoneInfoMessageReceivedL ( const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_PHONEINFOMESSAGERECEIVED, "CSatMessHandler::PhoneInfoMessageReceived" ); - TFLOGSTRING("TSY:CSatMessHandler::PhoneInfoMessageReceived"); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_PHONEINFOMESSAGERECEIVEDL_TD, "CSatMessHandler::PhoneInfoMessageReceivedL" ); + TFLOGSTRING("TSY:CSatMessHandler::PhoneInfoMessageReceivedL"); TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); @@ -356,7 +354,7 @@ } case INFO_PP_READ_RESP: { - InfoPpReadResp( aIsiMessage ); + InfoPpReadRespL( aIsiMessage ); break; } default: @@ -365,7 +363,7 @@ break; } } - } + }*/ // ----------------------------------------------------------------------------- @@ -373,12 +371,12 @@ // Called from SatMessHandler::ReceivedL, handles UICC Server messages // ----------------------------------------------------------------------------- // -TBool CSatMessHandler::UiccServerMessageReceived( +TBool CSatMessHandler::UiccServerMessageReceivedL( const TIsiReceiveC& aIsiMessage ) { TUint8 messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); - OstTraceExt1( TRACE_NORMAL, DUP3_CSATMESSHANDLER_UICCSERVERMESSAGERECEIVED, "CSatMessHandler::UiccServerMessageReceived;messageId=%hhu", messageId ); - TFLOGSTRING2("TSY:CSatMessHandler::UiccServerMessageReceived, message ID: %d", messageId ); + OstTraceExt1( TRACE_NORMAL, DUP3_CSATMESSHANDLER_UICCSERVERMESSAGERECEIVEDL_TD, "CSatMessHandler::UiccServerMessageReceived;messageId=%hhu", messageId ); + TFLOGSTRING2("TSY:CSatMessHandler::UiccServerMessageReceivedL, message ID: %d", messageId ); TBool handled( EFalse ); @@ -386,7 +384,7 @@ { case UICC_CAT_IND: { - UiccCatInd( aIsiMessage ); + UiccCatIndL( aIsiMessage ); break; } case UICC_CAT_RESP: @@ -399,7 +397,7 @@ ISI_HEADER_SIZE + UICC_CAT_RESP_OFFSET_STATUS ) ); TFLOGSTRING3("TSY:CSatMessHandler:: KUiccCatResp: service type %d, status %d", serviceType, status); - OstTraceExt2( TRACE_NORMAL, DUP2_CSATMESSHANDLER_UICCSERVERMESSAGERECEIVED, "CSatMessHandler::KUiccCatResp;serviceType=%hhu;status=%hhu", serviceType, status ); +OstTraceExt2( TRACE_NORMAL, DUP2_CSATMESSHANDLER_UICCSERVERMESSAGERECEIVEDL_TD, "CSatMessHandler::KUiccCatResp;serviceType=%hhu;status=%hhu", serviceType, status ); // If terminal profile was sent succesfully and SAT is ready, // start fetching proactive commands @@ -432,7 +430,7 @@ // Response for refresh command else if ( UICC_CAT_REFRESH == serviceType ) { - RefreshResult( status ); + RefreshResultL( status ); } // Response for polling set command else if ( UICC_CAT_POLLING_SET == serviceType ) @@ -478,19 +476,27 @@ ISI_HEADER_SIZE + UICC_APPLICATION_IND_OFFSET_SERVICETYPE ) ); if ( UICC_APPL_ACTIVATED == serviceType ) { - // USIM and SIM: Read SMS-PP DD and Call Control from byte 4. - // Only USIM: MO-SMS control from byte 4 - UiccReadServiceTableReq( KUiccTrIdServiceTableByte4, 3 ); - + TInt ret( KErrNone ); if ( UICC_CARD_TYPE_UICC == iCardType ) { + // USIM: Read SMS-PP DD, Call Control and MO-SMS control from byte 4. + ret = UiccReadServiceTableReq( KUiccTrIdServiceTableByte4, 3 ); + User::LeaveIfError( ret ); // USIM: Read call control GPRS from byte 7 - UiccReadServiceTableReq( KUiccTrIdServiceTableByte7, 6 ); + ret = UiccReadServiceTableReq( KUiccTrIdServiceTableByte7, 6 ); + User::LeaveIfError( ret ); } else if ( UICC_CARD_TYPE_ICC == iCardType ) { - // SIM: Read MO-SMS control from byte 5 - UiccReadServiceTableReq( KUiccTrIdServiceTableByte5, 4 ); + // SIM: Read MO-SMS control from byte 10 + ret = UiccReadServiceTableReq( KUiccTrIdServiceTableByte10, 9 ); + User::LeaveIfError( ret ); + // SIM: Read SMS-PP DD and Call Control from byte 7 + ret = UiccReadServiceTableReq( KUiccTrIdServiceTableByte7, 6 ); + User::LeaveIfError( ret ); + // SIM: Read Call control in USSD from byte 11. This is supported only in SIM + ret = UiccReadServiceTableReq( KUiccTrIdServiceTableByte11, 10 ); + User::LeaveIfError( ret ); } } break; @@ -513,7 +519,7 @@ const TIsiReceiveC& aIsiMessage // ISI message from SMS server ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SMSSERVERMESSAGERECEIVED, "CSatMessHandler::SmsServerMessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SMSSERVERMESSAGERECEIVED_TD, "CSatMessHandler::SmsServerMessageReceived" ); TFLOGSTRING("TSY:CSatMessHandler::SmsServerMessageReceived"); TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); @@ -534,7 +540,7 @@ { // Take a log because result is always ok TFLOGSTRING("TSY:CSatMoSmsCtrl::SmsResourceConfRespReceived: Response for Resource confoguration Req, Receive response from SMS server"); - OstTrace0( TRACE_NORMAL, DUP1_CSATMOSMSCTRL_SMSRESOURCECONFRESPRECEIVED, "CSatMoSmsCtrl::SmsResourceRespReceived: Response for Resource Configuration Req, Receive response from SMS server" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMOSMSCTRL_SMSRESOURCECONFRESPRECEIVED_TD, "CSatMoSmsCtrl::SmsResourceRespReceived: Response for Resource Configuration Req, Receive response from SMS server" ); break; } default: @@ -554,7 +560,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SSSERVERMESSAGERECEIVED, "CSatMessHandler::SsServerMessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SSSERVERMESSAGERECEIVED_TD, "CSatMessHandler::SsServerMessageReceived" ); TFLOGSTRING("TSY:CSatMessHandler::SsServerMessageReceived"); TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ); @@ -583,7 +589,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GSMSTACKSERVERMESSAGERECEIVED, "CSatMessHandler::GsmStackServerMessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GSMSTACKSERVERMESSAGERECEIVED_TD, "CSatMessHandler::GsmStackServerMessageReceived" ); TFLOGSTRING("TSY:CSatMessHandler::GsmStackServerMessageReceived"); switch ( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) ) @@ -621,7 +627,7 @@ TUint8 aAdditionalInfo // Additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_DISPLAYTEXTTERMINALRESP, "CSatMessHandler::DisplayTextTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_DISPLAYTEXTTERMINALRESP_TD, "CSatMessHandler::DisplayTextTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::DisplayTextTerminalResp"); TTlv tlvSpecificData; @@ -655,7 +661,7 @@ const RSat::TGetInkeyRspV2& aRsp // Response packet from Etel ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GETINKEYTERMINALRESP, "CSatMessHandler::GetInkeyTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GETINKEYTERMINALRESP_TD, "CSatMessHandler::GetInkeyTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::GetInkeyTerminalRespL"); TTlv tlvSpecificData; @@ -778,7 +784,7 @@ TUint8 aDataCodingScheme // Coding scheme ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GETINPUTTERMINALRESP, "CSatMessHandler::GetInputTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GETINPUTTERMINALRESP_TD, "CSatMessHandler::GetInputTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::GetInputTerminalResp"); TTlv tlvSpecificData; @@ -859,7 +865,7 @@ TUint8 aAdditionalInfo // Additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_PLAYTONETERMINALRESP, "CSatMessHandler::PlayToneTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_PLAYTONETERMINALRESP_TD, "CSatMessHandler::PlayToneTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::PlayToneTerminalResp"); TTlv tlvSpecificData; @@ -893,7 +899,7 @@ TUint8 aAdditionalInfo // Additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SETUPMENUTERMINALRESP, "CSatMessHandler::SetUpMenuTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SETUPMENUTERMINALRESP_TD, "CSatMessHandler::SetUpMenuTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::SetUpMenuTerminalResp"); // Create and append response data @@ -930,7 +936,7 @@ TUint8 aAdditionalInfo // Additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SELECTITEMTERMINALRESP, "CSatMessHandler::SelectItemTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SELECTITEMTERMINALRESP_TD, "CSatMessHandler::SelectItemTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::SelectItemTerminalResp"); TTlv tlvSpecificData; @@ -991,7 +997,7 @@ TUint8 aNumOfUnits // Time interval ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_POLLINTERVALTERMINALRESP, "CSatMessHandler::PollIntervalTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_POLLINTERVALTERMINALRESP_TD, "CSatMessHandler::PollIntervalTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::PollIntervalTerminalResp"); TTlv tlvSpecificData; @@ -1046,7 +1052,7 @@ TUint8 aAdditionalInfo // Additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDSMTERMINALRESP, "CSatMessHandler::SendSmTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDSMTERMINALRESP_TD, "CSatMessHandler::SendSmTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::SendSmTerminalResp"); // Create and append response data @@ -1087,7 +1093,7 @@ TDesC8& aAdditionalInfo // Additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDSSTERMINALRESP, "CSatMessHandler::SendSsTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDSSTERMINALRESP_TD, "CSatMessHandler::SendSsTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::SendSsTerminalResp"); // Create and append response data @@ -1122,7 +1128,7 @@ TUint8 aAdditionalInfo // Additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDDTMFTERMINALRESP, "CSatMessHandler::SendDtmfTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDDTMFTERMINALRESP_TD, "CSatMessHandler::SendDtmfTerminalResp" ); TFLOGSTRING("CSatMessHandler::SendDtmfTerminalResp"); TTlv tlvSpecificData; @@ -1159,7 +1165,7 @@ TUint8 aUssdCbsDataCodingScheme ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDUSSDTERMINALRESP, "CSatMessHandler::SendUssdTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDUSSDTERMINALRESP_TD, "CSatMessHandler::SendUssdTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::SendUssdTerminalResp"); TTlv tlvSpecificData; @@ -1168,13 +1174,14 @@ tlvSpecificData.AddTag( KTlvResultTag ); tlvSpecificData.AddByte( aGeneralResult ); - // For the general results '20', '21', '37', '38' + // For the general results '20', '21', '37', '38', '39' // it is mandatory for the ME to provide a specific // cause value as additional if ( ( RSat::KMeUnableToProcessCmd == aGeneralResult ) || ( RSat::KNetworkUnableToProcessCmd == aGeneralResult ) || ( RSat::KUssdReturnError == aGeneralResult) - || ( RSat::KMultipleCardCmdsError == aGeneralResult) ) + || ( RSat::KMultipleCardCmdsError == aGeneralResult) + || ( RSat::KInteractionWithCCPermanentError == aGeneralResult ) ) { tlvSpecificData.AddByte( aAdditionalInfo ); } @@ -1219,7 +1226,7 @@ // branch of the switch. TFLOGSTRING("TSY:CSatMessHandler::SendUssdTerminalResp, \ The DCS sent by the network has a reserved value."); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_SENDUSSDTERMINALRESP, "CSatMessHandler::SendUssdTerminalResp, The DCS sent by the network has a reserved value." ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_SENDUSSDTERMINALRESP_TD, "CSatMessHandler::SendUssdTerminalResp, The DCS sent by the network has a reserved value." ); break; } } @@ -1247,7 +1254,7 @@ TUint8 aAdditionalInfo // Additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SETUPCALLTERMINALRESP, "CSatMessHandler::SetUpCallTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SETUPCALLTERMINALRESP_TD, "CSatMessHandler::SetUpCallTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::SetUpCallTerminalResp"); // Create and append response data @@ -1284,7 +1291,7 @@ TUint8 aAdditionalInfo // Additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_REFRESHTERMINALRESP, "CSatMessHandler::RefreshTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_REFRESHTERMINALRESP_TD, "CSatMessHandler::RefreshTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::RefreshTerminalResp"); // Create and append response data @@ -1318,7 +1325,7 @@ TUint8 aHelp // Help requested status ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_MENUSELECTIONIND, "CSatMessHandler::MenuSelectionInd" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_MENUSELECTIONIND_TD, "CSatMessHandler::MenuSelectionInd" ); TFLOGSTRING("TSY:CSatMessHandler::MenuSelectionInd"); TTlv tlvSpecificData; @@ -1353,7 +1360,7 @@ TUint8 aAdditionalInfo // additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_LAUNCHBROWSERTERMINALRESP, "CSatMessHandler::LaunchBrowserTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_LAUNCHBROWSERTERMINALRESP_TD, "CSatMessHandler::LaunchBrowserTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::LaunchBrowserTerminalResp"); TTlv tlvSpecificData; @@ -1389,7 +1396,7 @@ TUint8 aGeneralResult ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_COMMANDPERFORMEDSUCCESSFULLY, "CSatMessHandler::CommandPerformedSuccessfully" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_COMMANDPERFORMEDSUCCESSFULLY_TD, "CSatMessHandler::CommandPerformedSuccessfully" ); TFLOGSTRING("TSY:CSatMessHandler::CommandPerformedSuccessfully"); TBool ret( EFalse ); @@ -1432,7 +1439,7 @@ TUint8 aAdditionalInfo // Additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SETUPIDLEMODETEXTTERMINALRESP, "CSatMessHandler::SetUpIdleModeTextTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SETUPIDLEMODETEXTTERMINALRESP_TD, "CSatMessHandler::SetUpIdleModeTextTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::SetUpIdleModeTextTerminalResp"); TTlv tlvSpecificData; @@ -1483,7 +1490,7 @@ TBool aStore // Is envelope stored for resending ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCCATREQENVELOPE, "CSatMessHandler::UiccCatReqEnvelope" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCCATREQENVELOPE_TD, "CSatMessHandler::UiccCatReqEnvelope" ); TFLOGSTRING("TSY:CSatMessHandler::UiccCatReqEnvelope"); TIsiSend isiMsg( iPnSend->SendBufferDes() ); @@ -1541,7 +1548,7 @@ const TIsiReceiveC& aIsiMessage ) { -OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_STORENETSERVICESTATUS, "CSatMessHandler::StoreNetServiceStatus" ); +OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_STORENETSERVICESTATUS_TD, "CSatMessHandler::StoreNetServiceStatus" ); TFLOGSTRING("TSY: CSatMessHandler::StoreNetServiceStatus"); // SubBlock offset @@ -1593,7 +1600,7 @@ sbOffset + NET_GSM_CELL_INFO_OFFSET_SERVICESTATUS ); TFLOGSTRING2("TSY: CSatMessHandler::StoreNetServiceStatus: NET_REGISTRATION_STATUS = %d", iLocInfo.iRegStatus ); -OstTrace1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_STORENETSERVICESTATUS, "CSatMessHandler::StoreNetServiceStatus NET_REGISTRATION_STATUS = %d", iLocInfo.iRegStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_STORENETSERVICESTATUS_TD, "CSatMessHandler::StoreNetServiceStatus NET_REGISTRATION_STATUS = %d", iLocInfo.iRegStatus ); if ( NET_SERVICE == iLocInfo.iRegStatus || NET_LIMITED_SERVICE == iLocInfo.iRegStatus ) @@ -1636,7 +1643,7 @@ else { TFLOGSTRING("TSY: CSatMessHandler::StoreNetServiceStatus - NET_GSM_CELL_INFO or NET_WCDMA_CELL_INFO not found!"); -OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_STORENETSERVICESTATUS, "CSatMessHandler::StoreNetServiceStatus NET_GSM_CELL_INFO or NET_WCDMA_CELL_INFO not found!" ); +OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_STORENETSERVICESTATUS_TD, "CSatMessHandler::StoreNetServiceStatus NET_GSM_CELL_INFO or NET_WCDMA_CELL_INFO not found!" ); retValue = KErrNotFound; } @@ -1644,7 +1651,7 @@ else { TFLOGSTRING2("TSY: CSatMessHandler::StoreNetServiceStatus - Unexpected message id: %d", messageId ); -OstTrace1( TRACE_NORMAL, DUP3_CSATMESSHANDLER_STORENETSERVICESTATUS, "CSatMessHandler::StoreNetServiceStatus Unexpected message id: %d", messageId ); +OstTrace1( TRACE_NORMAL, DUP3_CSATMESSHANDLER_STORENETSERVICESTATUS_TD, "CSatMessHandler::StoreNetServiceStatus Unexpected message id: %d", messageId ); retValue = KErrNotFound; } @@ -1666,7 +1673,7 @@ TUint8 aAdditionalInfo // Additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SETUPEVENTLISTTERMINALRESP, "CSatMessHandler::SetUpEventListTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SETUPEVENTLISTTERMINALRESP_TD, "CSatMessHandler::SetUpEventListTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::SetUpEventListTerminalResp"); // create responce data TTlv tlvSpecificData; @@ -1708,7 +1715,7 @@ TUint8 aAdditionalInfo // Additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_POLLINGOFFTERMINALRESP, "CSatMessHandler::PollingOffTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_POLLINGOFFTERMINALRESP_TD, "CSatMessHandler::PollingOffTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::PollingOffTerminalResp"); TTlv tlvSpecificData; @@ -1757,7 +1764,7 @@ TDes& aAdditionalInfo // Additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_LOCALINFOTERMINALRESP, "CSatMessHandler::LocalInfoTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_LOCALINFOTERMINALRESP_TD, "CSatMessHandler::LocalInfoTerminalResp" ); TFLOGSTRING("TSY: CSatMessHandler::LocalInfoTerminalResp"); // Create and append response data TTlv tlvData; @@ -1913,7 +1920,7 @@ { TFLOGSTRING("TSY: CSatMessHandler::LocalInfoTerminalResp,\ TimingAdvance"); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_LOCALINFOTERMINALRESP, "CSatMessHandler::LocalInfoTerminalResp, TimingAdvance" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_LOCALINFOTERMINALRESP_TD, "CSatMessHandler::LocalInfoTerminalResp, TimingAdvance" ); // Timing advance result tlvData.AddTag( KTlvTimingAdvanceTag ); @@ -1925,7 +1932,7 @@ { TFLOGSTRING("TSY: CSatMessHandler::LocalInfoTerminalResp,\ LocalInfoLanguage"); - OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_LOCALINFOTERMINALRESP, "CSatMessHandler::LocalInfoTerminalResp, LocalInfoLanguage" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_LOCALINFOTERMINALRESP_TD, "CSatMessHandler::LocalInfoTerminalResp, LocalInfoLanguage" ); if ( aAdditionalInfo.Length() ) { @@ -1941,7 +1948,7 @@ { TFLOGSTRING("TSY: CSatMessHandler::LocalInfoTerminalResp,\ Access Technology"); - OstTrace0( TRACE_NORMAL, DUP3_CSATMESSHANDLER_LOCALINFOTERMINALRESP, "CSatMessHandler::LocalInfoTerminalResp, Access Technology" ); + OstTrace0( TRACE_NORMAL, DUP3_CSATMESSHANDLER_LOCALINFOTERMINALRESP_TD, "CSatMessHandler::LocalInfoTerminalResp, Access Technology" ); // Access technology result tlvData.AddTag( KTlvAccessTechnologyTag ); @@ -1966,13 +1973,13 @@ // Called from CTsySatMessaging::ConstructL method. // ----------------------------------------------------------------------------- // -TInt CSatMessHandler::InfoSerialNumberReadReq +/*TInt CSatMessHandler::InfoSerialNumberReadReq ( TUint8 aTransId, // Transactio id TUint8 aTarget ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_INFOSERIALNUMBERREADREQ, "CSatMessHandler::InfoSerialNumberReadReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_INFOSERIALNUMBERREADREQ_TD, "CSatMessHandler::InfoSerialNumberReadReq" ); TFLOGSTRING("TSY:CSatMessHandler::InfoSerialNumberReadReq"); //set infoSerialNumberReadReq to point to the send buffer @@ -1988,19 +1995,19 @@ //send message via Phonet return iPnSend->Send( infoSerialNumberReadReq.Complete() ); - } + }*/ // ----------------------------------------------------------------------------- // CSatMessHandler::InfoSerialNumberReadResp // Breaks a INFO_SERIAL_NUMBER_READ_RESP ISI-message. // ----------------------------------------------------------------------------- // -void CSatMessHandler::InfoSerialNumberReadResp +/*void CSatMessHandler::InfoSerialNumberReadResp ( const TIsiReceiveC& aIsiMessage // received ISI-message ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_INFOSERIALNUMBERREADRESP, "CSatMessHandler::InfoSerialNumberReadResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_INFOSERIALNUMBERREADRESP_TD, "CSatMessHandler::InfoSerialNumberReadResp" ); TFLOGSTRING("TSY:CSatMessHandler::InfoSerialNumberReadResp"); TUint sbStartOffset( 0 ); @@ -2019,7 +2026,7 @@ //Set the flag to inform that needed data has been received iImeiAvailable = ETrue; TFLOGSTRING("TSY: SAT, Imei received."); -OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_INFOSERIALNUMBERREADRESP, "SAT, Imei received." ); +OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_INFOSERIALNUMBERREADRESP_TD, "SAT, Imei received." ); } //check if INFO_SB_SN_IMEI_SV_TO_NET sub block is present else if ( KErrNone == aIsiMessage.FindSubBlockOffsetById( @@ -2034,9 +2041,9 @@ INFO_SB_SN_IMEI_SV_TO_NET_OFFSET_STRLEN ) ) ); iImeiSvAvailable = ETrue; TFLOGSTRING("TSY: CSatMessHandler::InfoSerialNumberReadResp IMEISV received"); -OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_INFOSERIALNUMBERREADRESP, "CSatMessHandler::InfoSerialNumberReadResp IMEISV received" ); +OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_INFOSERIALNUMBERREADRESP_TD, "CSatMessHandler::InfoSerialNumberReadResp IMEISV received" ); } - } + }*/ // ----------------------------------------------------------------------------- // CSatMessHandler::NetNeighbourCellsReq @@ -2049,7 +2056,7 @@ TUint8 aCellInfoType // Cell info type ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NETNEIGHBOURCELLSREQ, "CSatMessHandler::NetNeighbourCellsReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NETNEIGHBOURCELLSREQ_TD, "CSatMessHandler::NetNeighbourCellsReq" ); TFLOGSTRING("TSY:CSatMessHandler::NetNeighbourCellsReq"); TBuf8<1> data; @@ -2073,7 +2080,7 @@ const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NETNEIGHBOURCELLRESP, "CSatMessHandler::NetNeighbourCellResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NETNEIGHBOURCELLRESP_TD, "CSatMessHandler::NetNeighbourCellResp" ); TFLOGSTRING("TSY:CSatMessHandler::NetNeighbourCellResp"); TUint8 result( RSat::KSuccess ); @@ -2208,7 +2215,7 @@ ) { TFLOGSTRING("TSY:CSatMessHandler::CallModemResourceReq"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CALLMODEMRESOURCEREQ, "TSY:CSatMessHandler::CallModemResourceReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CALLMODEMRESOURCEREQ_TD, "TSY:CSatMessHandler::CallModemResourceReq" ); return iPnSend->Send( PN_MODEM_CALL, aTransId, CALL_MODEM_RESOURCE_REQ, aMsg ); } @@ -2223,7 +2230,7 @@ TUint16 aResourceIdMask ) { TFLOGSTRING("TSY:CSatMessHandler::CallModemResourceConfReq"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CALLMODEMRESOURCECONFREQ, "TSY:CSatMessHandler::CallModemResourceConfReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CALLMODEMRESOURCECONFREQ_TD, "TSY:CSatMessHandler::CallModemResourceConfReq" ); TBuf8< SIZE_CALL_MODEM_RESOURCE_CONF_REQ + SIZE_CALL_MODEM_SB_RESOURCE_CONF> msg; @@ -2258,7 +2265,7 @@ TInt CSatMessHandler::SsResourceConfReq() { TFLOGSTRING("TSY:CSatMessHandler::SsResourceConfReq"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SSRESOURCECONFREQ, "TSY:CSatMessHandler::SsResourceConfReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SSRESOURCECONFREQ_TD, "TSY:CSatMessHandler::SsResourceConfReq" ); TBuf8< SIZE_SS_RESOURCE_CONF_REQ + SIZE_SS_SB_RESOURCE_CONF > msg; @@ -2296,7 +2303,7 @@ ) { TFLOGSTRING("TSY:CSatMessHandler::SsResourceControlReq"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SSRESOURCECONTROLREQ, "TSY:CSatMessHandler::SsResourceControlReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SSRESOURCECONTROLREQ_TD, "TSY:CSatMessHandler::SsResourceControlReq" ); return iPnSend->Send( PN_SS, @@ -2313,7 +2320,7 @@ TInt CSatMessHandler::GpdsResourceConfReq() { TFLOGSTRING("TSY:CSatMessHandler::GpdsResourceConfReq"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GPDSRESOURCECONFREQ, "TSY:CSatMessHandler::GpdsResourceConfReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GPDSRESOURCECONFREQ_TD, "TSY:CSatMessHandler::GpdsResourceConfReq" ); TBuf8< SIZE_GPDS_RESOURCE_CONF_REQ + SIZE_GPDS_RESOURCE_CONF > msg; @@ -2351,7 +2358,7 @@ ) { TFLOGSTRING("TSY:CSatMessHandler::GpdsResourceControlReq"); -OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GPDSRESOURCECONTROLREQ, "CSatMessHandler::GpdsResourceControlReq" ); +OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GPDSRESOURCECONTROLREQ_TD, "CSatMessHandler::GpdsResourceControlReq" ); return iPnSend->Send( PN_GPDS, @@ -2367,7 +2374,7 @@ // void CSatMessHandler::SetPollingInterval( TUint8 aTraId, TUint8 aValue ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SETPOLLINGINTERVAL, "CSatMessHandler::SetPollingInterval" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SETPOLLINGINTERVAL_TD, "CSatMessHandler::SetPollingInterval" ); TFLOGSTRING("TSY:CSatMessHandler::SetPollingInterval"); iPollingInterval = aValue; @@ -2426,7 +2433,7 @@ TUint8 aAdditionalInfo // Additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_TIMERMGMTTERMINALRESP, "CSatMessHandler::TimerMgmtTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_TIMERMGMTTERMINALRESP_TD, "CSatMessHandler::TimerMgmtTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::TimerMgmtTerminalResp"); // Create and append response data @@ -2472,7 +2479,7 @@ else { TFLOGSTRING("TSY: CSatMessHandler::TimerMgmtTerminalResp, Unknown result."); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_TIMERMGMTTERMINALRESP, "CSatMessHandler::TimerMgmtTerminalResp, Unknown result." ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_TIMERMGMTTERMINALRESP_TD, "CSatMessHandler::TimerMgmtTerminalResp, Unknown result." ); } return UiccCatReqTerminalResponse( @@ -2494,7 +2501,7 @@ TUint8 aTimerValue[3] // Timer Value ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_TIMEREXPIRATIONIND, "CSatMessHandler::TimerExpirationInd" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_TIMEREXPIRATIONIND_TD, "CSatMessHandler::TimerExpirationInd" ); TFLOGSTRING("TSY:CSatMessHandler::TimerExpirationInd"); TTlv data; @@ -2525,15 +2532,15 @@ } // ----------------------------------------------------------------------------- -// CSatMessHandler::RefreshResult +// CSatMessHandler::RefreshResultL // Method to analyze refresh result from SIM Server. // Called by CSatMessHandler::SimAtkResp. // ----------------------------------------------------------------------------- // -void CSatMessHandler::RefreshResult( TUint8 aStatus ) // UICC server status +void CSatMessHandler::RefreshResultL( TUint8 aStatus ) // UICC server status { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_REFRESHRESULT, "CSatMessHandler::RefreshResult" ); - TFLOGSTRING("TSY:CSatMessHandler::RefreshResult"); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_REFRESHRESULTL_TD, "CSatMessHandler::RefreshResultL" ); + TFLOGSTRING("TSY:CSatMessHandler::RefreshResultL"); TUint8 result( RSat::KSuccess ); TUint8 additionalInfo( 0 ); @@ -2546,56 +2553,67 @@ case UICC_STATUS_OK: { // Refresh is done! - TFLOGSTRING("TSY: CSatMessHandler::RefreshResult, ISA has performed refresh successfully "); - TFLOGSTRING("TSY: CSatMessHandler::RefreshResult, Inform S60 to re-read SIM data"); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_REFRESHRESULT, "CSatMessHandler::RefreshResult, ISA has performed refresh successfully " ); - OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_REFRESHRESULT, "CSatMessHandler::RefreshResult, Inform S60 to re-read SIM data" ); + TFLOGSTRING("TSY: CSatMessHandler::RefreshResultL, ISA has performed refresh successfully "); + TFLOGSTRING("TSY: CSatMessHandler::RefreshResultL, Inform S60 to re-read SIM data"); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_REFRESHRESULTL_TD, "CSatMessHandler::RefreshResultL, ISA has performed refresh successfully " ); +OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_REFRESHRESULTL_TD, "CSatMessHandler::RefreshResultL, Inform S60 to re-read SIM data" ); // Read service table if ( CSatNotifyRefresh::KCacheEFSST & iTsySatMessaging->GetNotifyRefresh()->CachedFiles() ) { + TInt ret( KErrNone ); // Re-read EF-UST - // Call control in USSD is supported only in SIM, byte 6 if ( UICC_CARD_TYPE_ICC == iCardType ) { - UiccReadServiceTableReq( KUiccTrIdServiceTableByte6, 5 ); + // Call control in USSD is supported only in SIM, from byte 10 + ret = UiccReadServiceTableReq( KUiccTrIdServiceTableByte11, 10 ); + User::LeaveIfError( ret ); + // SMS-PP DD and Call Control from byte 7 + ret = UiccReadServiceTableReq( KUiccTrIdServiceTableByte7, 6 ); + User::LeaveIfError( ret ); } - - // Call control, byte 4 from service table - UiccReadServiceTableReq( KUiccTrIdServiceTableByte4, 3 ); + else if( UICC_CARD_TYPE_UICC == iCardType ) + { + // Call control, MO-SMS Control and SMS PP Datadownload, from byte 4 + ret = UiccReadServiceTableReq( KUiccTrIdServiceTableByte4, 3 ); + User::LeaveIfError( ret ); + } + #ifdef INFO_PP_ATK_MO_SM_CONTROL // Check MO SMS control is supported by product profile - // USIM: byte 4, SIM: byte 5 + // USIM: byte 4, SIM: byte 10 TUint8 serviceTableTrIdMoSms( KUiccTrIdServiceTableByte4 ); TUint8 serviceTableOffsetMoSms( 3 ); if ( UICC_CARD_TYPE_ICC == iCardType ) { // Transaction ID and byte offset for SIM - serviceTableTrIdMoSms = KUiccTrIdServiceTableByte5; - serviceTableOffsetMoSms = 4; + serviceTableTrIdMoSms = KUiccTrIdServiceTableByte10; + serviceTableOffsetMoSms = 9; } if ( iMoSmsSupportedInPp ) { // ...and by SIM service table - UiccReadServiceTableReq( + ret = UiccReadServiceTableReq( serviceTableTrIdMoSms, serviceTableOffsetMoSms ); + User::LeaveIfError( ret ); } #else // If flag not defined, check feature availability only // from USIM - UiccReadServiceTableReq( + ret = UiccReadServiceTableReq( serviceTableTrIdMoSms, serviceTableOffsetMoSms ); + User::LeaveIfError( ret ); #endif // INFO_PP_ATK_MO_SM_CONTROL } break; } default: { - TFLOGSTRING2("TSY: CSatMessHandler::RefreshResult, refresh failed, UICC STATUS: 0x%x", aStatus ); - OstTraceExt1( TRACE_NORMAL, DUP4_CSATMESSHANDLER_REFRESHRESULT, "CSatMessHandler::RefreshResult, refresh failed, UICC STATUS: 0x%hhx", aStatus ); + TFLOGSTRING2("TSY: CSatMessHandler::RefreshResultL, refresh failed, UICC STATUS: 0x%x", aStatus ); + OstTraceExt1( TRACE_NORMAL, DUP4_CSATMESSHANDLER_REFRESHRESULTL_TD, "CSatMessHandler::RefreshResultL, refresh failed, UICC STATUS: 0x%hhx", aStatus ); result = RSat::KMeUnableToProcessCmd; additionalInfo = RSat::KNoSpecificMeProblem; ret = KErrGeneral; @@ -2634,7 +2652,7 @@ TDesC8& aData ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDSMSREPORTREQ, "CSatMessHandler::SendSmsReportReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDSMSREPORTREQ_TD, "CSatMessHandler::SendSmsReportReq" ); TFLOGSTRING("CSatMessHandler::SendSmsReportReq"); iPnSend->Send( PN_SMS, aTransId, SMS_RECEIVED_MSG_REPORT_REQ, aData ); @@ -2652,7 +2670,7 @@ TDesC8& aData ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SMSRESOURCECONFREQ, "CSatMessHandler::SmsResourceConfReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SMSRESOURCECONFREQ_TD, "CSatMessHandler::SmsResourceConfReq" ); TFLOGSTRING("CSatMessHandler::SmsResourceConfReq"); iPnSend->Send( PN_SMS, aTransId, aMsgId, aData ); @@ -2672,7 +2690,7 @@ TUint8 aInterval ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SETPOLLINGRESULT, "CSatMessHandler::SetPollingResult" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SETPOLLINGRESULT_TD, "CSatMessHandler::SetPollingResult" ); TFLOGSTRING("TSY:CSatMessHandler::SetPollingResult "); if ( UICC_STATUS_OK == aStatus ) @@ -2681,7 +2699,7 @@ if ( iPollingOff ) { TFLOGSTRING("TSY:CSatMessHandler::SetPollingResult, iPollingOff = ETrue"); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_SETPOLLINGRESULT, "CSatMessHandler::SetPollingResult, iPollingOff = ETrue" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_SETPOLLINGRESULT_TD, "CSatMessHandler::SetPollingResult, iPollingOff = ETrue" ); PollingOffTerminalResp( aTransId, iTsySatMessaging->GetNotifyPollingOff()->GetCmdDetails(), @@ -2691,7 +2709,7 @@ else { TFLOGSTRING("TSY:CSatMessHandler::SetPollingResult, iPollingOff = EFalse"); - OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_SETPOLLINGRESULT, "CSatMessHandler::SetPollingResult, iPollingOff = EFalse" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_SETPOLLINGRESULT_TD, "CSatMessHandler::SetPollingResult, iPollingOff = EFalse" ); PollIntervalTerminalResp( aTransId, iTsySatMessaging->GetNotifyPollInterval()->GetCmdDetails(), @@ -2750,7 +2768,7 @@ const TIsiReceiveC& aIsiMessage // received isi message ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CHECKPROACTIVECOMMAND, "CSatMessHandler::CheckProactiveCommand" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CHECKPROACTIVECOMMAND_TD, "CSatMessHandler::CheckProactiveCommand" ); TFLOGSTRING("TSY:CSatMessHandler::CheckProactiveCommand"); TTlv data; @@ -2816,7 +2834,7 @@ else { TFLOGSTRING("TSY: CSatMessHandler::CheckProactiveCommand. Proactive command Ok."); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_CHECKPROACTIVECOMMAND, "CSatMessHandler::CheckProactiveCommand Proactive command Ok." ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_CHECKPROACTIVECOMMAND_TD, "CSatMessHandler::CheckProactiveCommand Proactive command Ok." ); } if ( KErrCorrupt == ret ) @@ -2874,7 +2892,7 @@ TUint8 aGeneralResult // General result ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_MORETIMETERMINALRESP, "CSatMessHandler::MoreTimeTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_MORETIMETERMINALRESP_TD, "CSatMessHandler::MoreTimeTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::MoreTimeTerminalResp"); // Create and append response data @@ -2903,32 +2921,33 @@ TUint8 aRoutingCommand // Routing command ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SMSCBROUTINGREQ, "CSatMessHandler::SmsCbRoutingReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SMSCBROUTINGREQ_TD, "CSatMessHandler::SmsCbRoutingReq" ); TFLOGSTRING("TSY:CSatMessHandler::SmsRoutingReq"); TInt ret( KErrNone ); - - // Routing is ongoing - iSmsCbRoutingComplete = EFalse; - - // TBuf8 because we are sending [U]SIM EF CBMID Message - // Subscription; - TBuf8 data; - - // Append Routing command - data.Append( aRoutingCommand ); - // Append Subscription number - data.Append( SMS_NEW_SUBSCRIPTION ); - // append Subscription type - data.Append( SMS_TYPE_SIM ); - // Append Filler bytes - data.AppendFill( KPadding, 2 ); - // Append no of Subblocks - data.Append( 0 ); - - // Send Subscription request - ret = iPnSend->Send( PN_SMS, aTransId, SMS_CB_ROUTING_REQ, - data ); + iCbRoutingReqTraId = TInt( aTransId ); + + // Routing is ongoing + iSmsCbRoutingComplete = EFalse; + + // TBuf8 because we are sending [U]SIM EF CBMID Message + // Subscription; + TBuf8 data; + + // Append Routing command + data.Append( aRoutingCommand ); + // Append Subscription number + data.Append( SMS_NEW_SUBSCRIPTION ); + // append Subscription type + data.Append( SMS_TYPE_SIM ); + // Append Filler bytes + data.AppendFill( KPadding, 2 ); + // Append no of Subblocks + data.Append( 0 ); + + // Send Subscription request + ret = iPnSend->Send( PN_SMS, aTransId, SMS_CB_ROUTING_REQ, + data ); return ret; } @@ -2943,34 +2962,39 @@ const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SMSCBROUTINGRESP, "CSatMessHandler::SmsCbRoutingResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SMSCBROUTINGRESP_TD, "CSatMessHandler::SmsCbRoutingResp" ); TFLOGSTRING("TSY:CSatMessHandler::SmsCbRoutingResp"); - TUint8 cause( aIsiMessage.Get8bit( - ISI_HEADER_SIZE + SMS_CB_ROUTING_RESP_OFFSET_SMSCAUSE ) ); - - switch ( cause ) + if ( iCbRoutingReqTraId == aIsiMessage.Get8bit( + ISI_HEADER_OFFSET_TRANSID ) ) { - case SMS_ERR_CS_INACTIVE: - case SMS_ERR_SUBJECT_COUNT_OVERFLOW: - case SMS_ERR_DCS_COUNT_OVERFLOW: + TUint8 cause( aIsiMessage.Get8bit( + ISI_HEADER_SIZE + SMS_CB_ROUTING_RESP_OFFSET_SMSCAUSE ) ); + iCbRoutingReqTraId = KNoTransactionOngoing; + + switch ( cause ) { - TFLOGSTRING2("TSY:CSatMessHandler::SmsCbRoutingResp \ - Routing req failed on temporary problem: %d", cause ); - OstTraceExt1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_SMSCBROUTINGRESP, "CSatMessHandler::SmsCbRoutingResp Routing req failed on temporary problem: %hhu", cause ); - iSmsCbRoutingComplete = EFalse; - break; - } - case SMS_OK: - case SMS_ERR_INVALID_SUBSCRIPTION_NR: - case SMS_ERR_INVALID_PARAMETER: - case SMS_ERR_ALL_SUBSCRIPTIONS_ALLOCATED: - default: - { - // Routing req was either completed successfully, or permanent - // problem occured. In both cases, no need to retry. - iSmsCbRoutingComplete = ETrue; - break; + case SMS_ERR_CS_INACTIVE: + case SMS_ERR_SUBJECT_COUNT_OVERFLOW: + case SMS_ERR_DCS_COUNT_OVERFLOW: + { + TFLOGSTRING2("TSY:CSatMessHandler::SmsCbRoutingResp \ + Routing req failed on temporary problem: %d", cause ); + OstTraceExt1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_SMSCBROUTINGRESP_TD, "CSatMessHandler::SmsCbRoutingResp Routing req failed on temporary problem: %hhu", cause ); + iSmsCbRoutingComplete = EFalse; + break; + } + case SMS_OK: + case SMS_ERR_INVALID_SUBSCRIPTION_NR: + case SMS_ERR_INVALID_PARAMETER: + case SMS_ERR_ALL_SUBSCRIPTIONS_ALLOCATED: + default: + { + // Routing req was either completed successfully, or permanent + // problem occured. In both cases, no need to retry. + iSmsCbRoutingComplete = ETrue; + break; + } } } } @@ -2989,7 +3013,7 @@ ) { TFLOGSTRING("TSY:CSatMoSmsCtrl::SmsResourceConfIndReceived: Response for Resource confoguration Indication, Receive Indication from SMS server"); - OstTrace0( TRACE_NORMAL, DUP1_CSATMOSMSCTRL_SMSRESOURCECONFINDRECEIVED, "CSatMoSmsCtrl::SmsResourceRespReceived: Response for Resource Configuration Ind, Receive indication from SMS server" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMOSMSCTRL_SMSRESOURCECONFINDRECEIVED_TD, "CSatMoSmsCtrl::SmsResourceRespReceived: Response for Resource Configuration Ind, Receive indication from SMS server" ); // To check The receive indication is for startup or reconfiguration if ( SMS_RES_CONF_STARTUP == aIsiMessage.Get8bit( ISI_HEADER_SIZE @@ -3015,8 +3039,8 @@ } else if ( UICC_CARD_TYPE_ICC == iCardType ) { - // SIM: Read MO-SMS control from byte 5 - UiccReadServiceTableReq( KUiccTrIdServiceTableByte5, 4 ); + // SIM: Read MO-SMS control from byte 10 + UiccReadServiceTableReq( KUiccTrIdServiceTableByte10, 9 ); } } } @@ -3033,7 +3057,7 @@ TUint8 aTransId ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NETCELLINFOGETREQ, "CSatMessHandler::NetCellInfoGetReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NETCELLINFOGETREQ_TD, "CSatMessHandler::NetCellInfoGetReq" ); TFLOGSTRING("TSY:CSatMessHandler::NetCellInfoGetReq"); TBuf8<1> noData; @@ -3055,7 +3079,7 @@ const TIsiReceiveC& aIsiMessage ) { -OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NETCELLINFOGETRESP, "CSatMessHandler::NetCellInfoGetResp" ); +OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NETCELLINFOGETRESP_TD, "CSatMessHandler::NetCellInfoGetResp" ); TFLOGSTRING("TSY: CSatMessHandler::NetCellInfoGetResp"); TUint8 successCode( aIsiMessage.Get8bit( @@ -3118,7 +3142,7 @@ { // Default result value already set TFLOGSTRING2("TSY: CSatMessHandler::NetCellInfoGetResp - Unexpected iRegStatus: %d", iLocInfo.iRegStatus ); -OstTrace1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_NETCELLINFOGETRESP, "CSatMessHandler::NetCellInfoGetResp Unexpected iRegStatus: %d", iLocInfo.iRegStatus ); +OstTrace1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_NETCELLINFOGETRESP_TD, "CSatMessHandler::NetCellInfoGetResp Unexpected iRegStatus: %d", iLocInfo.iRegStatus ); additionalInfo.Append( RSat::KNoSpecificMeProblem ); break; @@ -3157,7 +3181,7 @@ TUint8 aOperation // Gss operation ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GSSCSSERVICEREQ, "CSatMessHandler::GssCsServiceReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GSSCSSERVICEREQ_TD, "CSatMessHandler::GssCsServiceReq" ); TFLOGSTRING("TSY: CSatMessHandler::GssCsServiceReq "); TBuf8<2> data; @@ -3176,7 +3200,7 @@ const TIsiReceiveC& aIsiMessage // Received isi messge ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GSSCSSERVICERESP, "CSatMessHandler::GssCsServiceResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GSSCSSERVICERESP_TD, "CSatMessHandler::GssCsServiceResp" ); TFLOGSTRING("CSatMessHandler::GssCsServiceResp "); if ( iTsySatMessaging->GetNotifyLocalInfo()->LocalInfoStatus() ) @@ -3219,7 +3243,7 @@ sbOffset + GSS_ATK_TIMING_ADVANCE_OFFSET_TASTATUS ); TFLOGSTRING2("TSY: CSatMessHandler::GssCsServiceResp iTaStatus=%d", iTaStatus); - OstTraceExt1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_GSSCSSERVICERESP, "CSatMessHandler::GssCsServiceResp iTaStatus: %hhu", iTaStatus ); + OstTraceExt1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_GSSCSSERVICERESP_TD, "CSatMessHandler::GssCsServiceResp iTaStatus: %hhu", iTaStatus ); // Store timing advance iTimingAdvance = aIsiMessage.Get8bit( @@ -3227,7 +3251,7 @@ TFLOGSTRING2("TSY: CSatMessHandler::GssCsServiceResp \ iTimingAdvance=%d", iTimingAdvance); - OstTraceExt1( TRACE_NORMAL, DUP2_CSATMESSHANDLER_GSSCSSERVICERESP, "CSatMessHandler::GssCsServiceResp iTimingAdvance: %hhu", iTimingAdvance ); + OstTraceExt1( TRACE_NORMAL, DUP2_CSATMESSHANDLER_GSSCSSERVICERESP_TD, "CSatMessHandler::GssCsServiceResp iTimingAdvance: %hhu", iTimingAdvance ); if ( GSS_TIMING_ADVANCE_NOT_AVAILABLE == iTimingAdvance ) { @@ -3277,7 +3301,7 @@ const TIsiReceiveC& aIsiMessage // Received isi messge ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GSSCSSERVICEFAILRESP, "CSatMessHandler::GssCsServiceFailResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GSSCSSERVICEFAILRESP_TD, "CSatMessHandler::GssCsServiceFailResp" ); TFLOGSTRING("CSatMessHandler::GssCsServiceFailResp "); if ( iTsySatMessaging->GetNotifyLocalInfo()->LocalInfoStatus() ) @@ -3323,7 +3347,7 @@ TUint8 aAdditionalInfo // additional info ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_LANGUAGENOTIFICATIONTERMINALRESP, "CSatMessHandler::LanguageNotificationTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_LANGUAGENOTIFICATIONTERMINALRESP_TD, "CSatMessHandler::LanguageNotificationTerminalResp" ); TFLOGSTRING("TSY:CSatMessHandler::LanguageNotificationTerminalResp"); TTlv tlvSpecificData; @@ -3355,7 +3379,7 @@ const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NETTIMEIND, "CSatMessHandler::NetTimeInd" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NETTIMEIND_TD, "CSatMessHandler::NetTimeInd" ); TFLOGSTRING("TSY: CSatMessHandler::NetTimeInd"); // NET_TIME_INFO is mandatory sub block @@ -3377,7 +3401,7 @@ // set to 1 (including B6). iTimeZone = aIsiMessage.Get8bit( sbOffset + NET_TIME_INFO_OFFSET_TIMEZONE ); TFLOGSTRING2("TSY: CSatMessHandler::NetTimeInd, Time zone: 0x%x", iTimeZone ); - OstTraceExt1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_NETTIMEIND, "CSatMessHandler::NetTimeInd Time zone: %hhu", iTimeZone ); + OstTraceExt1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_NETTIMEIND_TD, "CSatMessHandler::NetTimeInd Time zone: %hhu", iTimeZone ); } } @@ -3398,7 +3422,7 @@ TUint16 aBufferSize // Buffer size ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_OPENCHANNELTERMINALRESP, "CSatMessHandler::OpenChannelTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_OPENCHANNELTERMINALRESP_TD, "CSatMessHandler::OpenChannelTerminalResp" ); TFLOGSTRING("CSatMessHandler::OpenChannelTerminalResp"); // Create and append response data @@ -3438,7 +3462,7 @@ else { TFLOGSTRING("TSY: CSatMessHandler::OpenChannelTerminalResp, General result did not match."); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_OPENCHANNELTERMINALRESP, "CSatMessHandler::OpenChannelTerminalResp, General result did not match." ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_OPENCHANNELTERMINALRESP_TD, "CSatMessHandler::OpenChannelTerminalResp, General result did not match." ); } // For any result: @@ -3481,7 +3505,7 @@ const TDes8& aAdditionalInfo ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GETCHANNELSTATUSTERMINALRESP, "CSatMessHandler::GetChannelStatusTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GETCHANNELSTATUSTERMINALRESP_TD, "CSatMessHandler::GetChannelStatusTerminalResp" ); TFLOGSTRING("CSatMessHandler::GetChannelStatusTerminalResp"); TTlv tlvSpecificData; // Append general result tag @@ -3513,7 +3537,7 @@ else { TFLOGSTRING("CSatMessHandler::GetChannelStatusTerminalResp - mandatory channel status missing"); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_GETCHANNELSTATUSTERMINALRESP, "CSatMessHandler::GetChannelStatusTerminalResp - mandatory channel status missing" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_GETCHANNELSTATUSTERMINALRESP_TD, "CSatMessHandler::GetChannelStatusTerminalResp - mandatory channel status missing" ); } return UiccCatReqTerminalResponse( @@ -3536,7 +3560,7 @@ const TDes8& aAdditionalInfo ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CLOSECHANNELTERMINALRESP, "CSatMessHandler::CloseChannelTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CLOSECHANNELTERMINALRESP_TD, "CSatMessHandler::CloseChannelTerminalResp" ); TFLOGSTRING("CSatMessHandler::CloseChannelTerminalResp"); TTlv tlvSpecificData; // Append general result tag @@ -3578,7 +3602,7 @@ TUint8 aChannelDataLength ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDDATATERMINALRESP, "CSatMessHandler::SendDataTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDDATATERMINALRESP_TD, "CSatMessHandler::SendDataTerminalResp" ); TFLOGSTRING("CSatMessHandler::SendDataTerminalResp"); TTlv tlvSpecificData; // Append general result tag @@ -3605,7 +3629,7 @@ else { TFLOGSTRING("TSY: CSatMessHandler::SendDataTerminalResp, General result did not match."); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_SENDDATATERMINALRESP, "CSatMessHandler::SendDataTerminalResp, General result did not match." ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_SENDDATATERMINALRESP_TD, "CSatMessHandler::SendDataTerminalResp, General result did not match." ); } return UiccCatReqTerminalResponse( @@ -3629,7 +3653,7 @@ TUint8 aChannelDataLength ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_RECEIVEDATATERMINALRESP, "CSatMessHandler::ReceiveDataTerminalResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_RECEIVEDATATERMINALRESP_TD, "CSatMessHandler::ReceiveDataTerminalResp" ); TFLOGSTRING("CSatMessHandler::ReceiveDataTerminalResp"); TTlv tlvSpecificData; // Append general result tag @@ -3660,7 +3684,7 @@ else { TFLOGSTRING("TSY: CSatMessHandler::ReceiveDataTerminalResp, General result did not match."); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_RECEIVEDATATERMINALRESP, "CSatMessHandler::ReceiveDataTerminalResp, General result did not match." ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_RECEIVEDATATERMINALRESP_TD, "CSatMessHandler::ReceiveDataTerminalResp, General result did not match." ); } return UiccCatReqTerminalResponse( @@ -3683,7 +3707,7 @@ TUint8 aReceiverObject ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDSMSRESOURCERESP, "CSatMessHandler::SendSmsResourceResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDSMSRESOURCERESP_TD, "CSatMessHandler::SendSmsResourceResp" ); TFLOGSTRING("TSY:CSatMessHandler::SendSmsResourceResp"); TIsiSend isimsg( iPnSend->SendBufferDes() ); @@ -3714,7 +3738,7 @@ const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SSSTATUSIND, "CSatMessHandler::SsStatusInd" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SSSTATUSIND_TD, "CSatMessHandler::SsStatusInd" ); TFLOGSTRING("TSY: CSatMessHandler::SsStatusInd"); TUint8 ssStatus = aIsiMessage.Get8bit( ISI_HEADER_SIZE @@ -3746,7 +3770,7 @@ const TUint8 aGeneralResult ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_ADDITIONALINFONEEDED, "CSatMessHandler::AdditionalInfoNeeded" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_ADDITIONALINFONEEDED_TD, "CSatMessHandler::AdditionalInfoNeeded" ); // NOTE: This method shall not be used with SendSS proactive command as its // additional info handling differs from other commands. @@ -3789,7 +3813,7 @@ const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_RECEIVEMESSAGEL, "CSatMessHandler::ReceiveMessageL" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_RECEIVEMESSAGEL_TD, "CSatMessHandler::ReceiveMessageL" ); TFLOGSTRING("TSY: CSatMessHandler::ReceiveMessageL"); // Get ISI message resource and id @@ -3808,11 +3832,11 @@ SsServerMessageReceived( aIsiMessage ); break; } - case PN_PHONE_INFO: + /*case PN_PHONE_INFO: { - PhoneInfoMessageReceived( aIsiMessage ); + PhoneInfoMessageReceivedL( aIsiMessage ); break; - } + }*/ case PN_MODEM_NETWORK: { NetServerMessageReceived( aIsiMessage ); @@ -3830,7 +3854,7 @@ } case PN_UICC: { - handled = UiccServerMessageReceived( aIsiMessage ); + handled = UiccServerMessageReceivedL( aIsiMessage ); break; } default: @@ -3858,7 +3882,7 @@ TInt /*aErrorCode*/ ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_HANDLEERROR, "CSatMessHandler::HandleError" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_HANDLEERROR_TD, "CSatMessHandler::HandleError" ); // No implementation } @@ -3873,7 +3897,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NETRATIND, "CSatMessHandler::NetRatInd" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_NETRATIND_TD, "CSatMessHandler::NetRatInd" ); TFLOGSTRING("TSY:CSatMessHandler::NetRatInd"); // Check the presence of subblocks @@ -3921,7 +3945,7 @@ } } TFLOGSTRING2("TSY:CSatMessHandler::NetRatInd - Current Acc Tech: %d",iCurrentAccTech); - OstTraceExt1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_NETRATIND, "CSatMessHandler::NetRatInd - Current Acc Tech: %hhu", iCurrentAccTech ); + OstTraceExt1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_NETRATIND_TD, "CSatMessHandler::NetRatInd - Current Acc Tech: %hhu", iCurrentAccTech ); } } @@ -3933,7 +3957,7 @@ // const CSatMessHandler::TLocationInfo& CSatMessHandler::LocationInfo() { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_LOCATIONINFO, "CSatMessHandler::LocationInfo" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_LOCATIONINFO_TD, "CSatMessHandler::LocationInfo" ); // Extended Cell Id is provided only if both USIM and // 3G network are present. if ( KNetworkModeUtran != iCurrentAccTech @@ -3952,47 +3976,6 @@ } // ----------------------------------------------------------------------------- -// CSatMessHandler::SendPnAtkMessage -// Sends a PN_ATK message with the given data, sets also possible filler bytes -// ----------------------------------------------------------------------------- -// -TInt CSatMessHandler::SendPnAtkMessage - ( - const TUint8 aReceiverObject, - const TUint8 aTransactionId, - const TInt aMessageId, - const TDesC8& aData - ) - { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SENDPNATKMESSAGE, "CSatMessHandler::SendPnAtkMessage" ); - TFLOGSTRING("TSY:CSatMessHandler::SendPnAtkMessage"); - - TBuf8 data; - data.Append( aTransactionId ); - data.Append( aMessageId ); - - // Create send buffer (sets the msg length to NULL) - TIsiSend isimsg( iPnSend->SendBufferDes() ); - - // Set the receiver object and resource ID - isimsg.Set8bit( ISI_HEADER_OFFSET_RECEIVEROBJECT, aReceiverObject ); - isimsg.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_ATK ); - // Set Transaction ID and Msg ID at the end of the message buffer - isimsg.CopyData( ISI_HEADER_SIZE, data ); - // Copy the message data at the end of the message buffer - isimsg.CopyData( ( ISI_HEADER_SIZE + KLengthTwoBytes ), aData ); - - // Add padding(s) - while ( iPnSend->SendBufferDes().Length() % 4 ) - { - iPnSend->SendBufferDes().Append( 0x00 ); - } - - // Send message - return iPnSend->Send( isimsg.Complete() ); - } - -// ----------------------------------------------------------------------------- // CSatMessHandler::UiccApplCmdResp // (other items were commented in a header). // ----------------------------------------------------------------------------- @@ -4000,7 +3983,7 @@ void CSatMessHandler::UiccApplCmdResp( const TIsiReceiveC& aIsiMessage ) { TFLOGSTRING("TSY: CSatMessHandler::UiccApplCmdResp"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCAPPLCMDRESP, "CSatMessHandler::UiccApplCmdResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCAPPLCMDRESP_TD, "CSatMessHandler::UiccApplCmdResp" ); TInt error( KErrNone ); // Get transaction ID, status and service type @@ -4035,7 +4018,7 @@ else // Subblock is mandatory { TFLOGSTRING("TSY: CSatMessHandler::UiccApplCmdResp - Mandatory subblock UICC_SB_FILE_DATA not found"); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_UICCAPPLCMDRESP, "CSatMessHandler::UiccApplCmdResp - Mandatory subblock UICC_SB_FILE_DATA not found" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_UICCAPPLCMDRESP_TD, "CSatMessHandler::UiccApplCmdResp - Mandatory subblock UICC_SB_FILE_DATA not found" ); error = KErrNotFound; } @@ -4046,37 +4029,45 @@ { if ( KErrNone == error ) { - TUint8 usedBitMaskSmsPpDd( KSmsPpDdBitMaskUsim ); - if ( UICC_CARD_TYPE_ICC == iCardType ) - { - usedBitMaskSmsPpDd = KSmsPpDdBitMaskSim; - } - else - { - // MO SMS control status, only in case of USIM - SimMoSmsControlAvail( - fileData[0] & KMoSmsControlBitMaskUsim ); - } - // Get status of SMS PP DD and report to DataDownload - iTsySatMessaging->GetDataDownload()->SmsPpDlSupported( - ( fileData[0] & usedBitMaskSmsPpDd ) ? ETrue : EFalse ); + // MO SMS control status, only in case of USIM + SimMoSmsControlAvail( + fileData[0] & KMoSmsControlBitMaskUsim ); + + iTsySatMessaging->GetDataDownload()->SmsPpDlSupported( + fileData[0] & KSmsPpDdBitMaskUsim ); } break; } // MO SMS control ( this transaction ID is used for SIM only ) - case KUiccTrIdServiceTableByte5: + case KUiccTrIdServiceTableByte10: { if ( KErrNone == error ) { - SimMoSmsControlAvail( fileData[0] & KMoSmsControlBitMaskSim ); + // MO SMS control status, only in case of USIM + SimMoSmsControlAvail( + KMoSmsControlBitMaskSim == ( fileData[0] & KMoSmsControlBitMaskSim ) ); } break; } // USSD in Call Control ( this transaction ID is used for SIM only ) - case KUiccTrIdServiceTableByte6: + case KUiccTrIdServiceTableByte11: { iTsySatMessaging->SetStatusOfUssdSupport( - fileData[0] & KMoUssdCallControlBitMaskSim ); + KMoUssdCallControlBitMaskSim == ( fileData[0] & KMoUssdCallControlBitMaskSim ) ); + break; + } + // SMS PP Datadownload ( this transaction ID is used for SIM only ) + case KUiccTrIdServiceTableByte7: + { + if ( UICC_CARD_TYPE_UICC == iCardType ) + { + TBool ppDdSupported( EFalse ); + if( KSmsPpDdBitMaskSim == ( fileData[0] & KSmsPpDdBitMaskSim ) ) + { + ppDdSupported = ETrue; + } + iTsySatMessaging->GetDataDownload()->SmsPpDlSupported( ppDdSupported ); + } break; } // SAT icon @@ -4168,17 +4159,17 @@ // ----------------------------------------------------------------------------- -// CSatMessHandler::UiccCatInd +// CSatMessHandler::UiccCatIndL // Breaks UICC_CAT_IND ISI-message. // ----------------------------------------------------------------------------- // -void CSatMessHandler::UiccCatInd +void CSatMessHandler::UiccCatIndL ( const TIsiReceiveC& aIsiMessage // Received ISI message ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCCATIND, "CSatMessHandler::UiccCatInd" ); - TFLOGSTRING("TSY: CSatMessHandler::UiccCatInd"); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCCATINDL_TD, "CSatMessHandler::UiccCatIndL" ); + TFLOGSTRING("TSY: CSatMessHandler::UiccCatIndL"); // UICC status TUint8 serviceType( aIsiMessage.Get8bit( @@ -4221,8 +4212,8 @@ } else { - TFLOGSTRING("TSY: Received SAT message was not valid!"); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_UICCCATIND, "CSatMessHandler::UiccCatInd. Received SAT message was not valid!" ); + TFLOGSTRING("TSY: CSatMessHandler::UiccCatIndL: Received SAT message was not valid!"); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_UICCCATINDL_TD, "CSatMessHandler::UiccCatIndL. Received SAT message was not valid!" ); } } } @@ -4232,12 +4223,12 @@ // Construct a INFO_PP_READ_REQ ISI message // ----------------------------------------------------------------------------- // -TInt CSatMessHandler::InfoPpReadReq +/*TInt CSatMessHandler::InfoPpReadReq ( const TUint8 aReqType // request type ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_INFOPPREADREQ, "CSatMessHandler::InfoPpReadReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_INFOPPREADREQ_TD, "CSatMessHandler::InfoPpReadReq" ); TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadReq" ); // Construct INFO_PP_READ_REQ message (INFO_BATCH_TYPE + @@ -4287,20 +4278,20 @@ tempTraId, INFO_PP_READ_REQ, infoPpReadReq ); - } - -// ----------------------------------------------------------------------------- -// CSatMessHandler::InfoPpReadResp + }*/ + +// ----------------------------------------------------------------------------- +// CSatMessHandler::InfoPpReadRespL // Breaks a INFO_PP_READ_RESP ISI-message. // ----------------------------------------------------------------------------- // -void CSatMessHandler::InfoPpReadResp +/*void CSatMessHandler::InfoPpReadRespL ( const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_INFOPPREADRESP, "CSatMessHandler::InfoPpReadResp" ); - TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadResp" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_INFOPPREADRESPL_TD, "CSatMessHandler::InfoPpReadRespL" ); + TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadRespL" ); TUint8 traId( aIsiMessage.Get8bit( ISI_HEADER_SIZE + INFO_PP_READ_RESP_OFFSET_TRANSID ) ); @@ -4308,9 +4299,9 @@ TUint8 status( aIsiMessage.Get8bit( ISI_HEADER_SIZE + INFO_PP_READ_RESP_OFFSET_STATUS ) ); - TFLOGSTRING2("TSY: CSatMessHandler::InfoPpReadResp - Status: %d", + TFLOGSTRING2("TSY: CSatMessHandler::InfoPpReadRespL - Status: %d", status ); - OstTraceExt1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_INFOPPREADRESP, "CSatMessHandler::InfoPpReadResp - Status: %hhu", status ); +OstTraceExt1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_INFOPPREADRESPL_TD, "CSatMessHandler::InfoPpReadRespL - Status: %hhu", status ); switch ( status ) @@ -4346,26 +4337,29 @@ //Get the value of the MO SMS control feature if ( INFO_PP_FALSE != pPFeatures [1] ) { - TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadResp, MO SMS control supported by ME product profile" ); - OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_INFOPPREADRESP, "CSatMessHandler::InfoPpReadResp, MO SMS control supported by ME product profile" ); + TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadRespL, MO SMS control supported by ME product profile" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_INFOPPREADRESPL_TD, "CSatMessHandler::InfoPpReadRespL, MO SMS control supported by ME product profile" ); iMoSmsSupportedInPp = ETrue; + TInt ret( KErrNone ); // Continue MO SMS control check by checking // feature availability from USIM if ( UICC_CARD_TYPE_UICC == iCardType ) { // USIM: Read MO-SMS control from byte 4 - UiccReadServiceTableReq( KUiccTrIdServiceTableByte4, 5 ); + ret = UiccReadServiceTableReq( KUiccTrIdServiceTableByte4, 3 ); + User::LeaveIfError( ret ); } else if ( UICC_CARD_TYPE_ICC == iCardType ) { - // SIM: Read MO-SMS control from byte 5 - UiccReadServiceTableReq( KUiccTrIdServiceTableByte5, 6 ); + // SIM: Read MO-SMS control from byte 10 + ret = UiccReadServiceTableReq( KUiccTrIdServiceTableByte10, 9 ); + User::LeaveIfError( ret ); } } else { - TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadResp, MO SMS control not supported by ME product profile" ); - OstTrace0( TRACE_NORMAL, DUP3_CSATMESSHANDLER_INFOPPREADRESP, "CSatMessHandler::InfoPpReadResp, MO SMS control not supported by ME product profile" ); + TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadRespL, MO SMS control not supported by ME product profile" ); + OstTrace0( TRACE_NORMAL, DUP3_CSATMESSHANDLER_INFOPPREADRESPL_TD, "CSatMessHandler::InfoPpReadRespL, MO SMS control not supported by ME product profile" ); iMoSmsSupportedInPp = EFalse; // Feature was not activated in product profile // Set MoSmsCtrl object´s member @@ -4381,14 +4375,14 @@ //Get the value of the ENS feature if ( INFO_PP_FALSE != pPFeatures [1] ) { - TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadResp, INFO_PP_ENHANCED_NETWORK_SELECTION supported by ME product profile" ); - OstTrace0( TRACE_NORMAL, DUP8_CSATMESSHANDLER_INFOPPREADRESP, "CSatMessHandler::InfoPpReadResp, INFO_PP_ENHANCED_NETWORK_SELECTION supported by ME product profile" ); + TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadRespL, INFO_PP_ENHANCED_NETWORK_SELECTION supported by ME product profile" ); + OstTrace0( TRACE_NORMAL, DUP8_CSATMESSHANDLER_INFOPPREADRESPL_TD, "CSatMessHandler::InfoPpReadRespL, INFO_PP_ENHANCED_NETWORK_SELECTION supported by ME product profile" ); iEnsSupportedInPp = ETrue; } else { - TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadResp, INFO_PP_ENHANCED_NETWORK_SELECTION not supported by ME product profile" ); - OstTrace0( TRACE_NORMAL, DUP9_CSATMESSHANDLER_INFOPPREADRESP, "CSatMessHandler::InfoPpReadResp, INFO_PP_ENHANCED_NETWORK_SELECTION not supported by ME product profile" ); + TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadRespL, INFO_PP_ENHANCED_NETWORK_SELECTION not supported by ME product profile" ); + OstTrace0( TRACE_NORMAL, DUP9_CSATMESSHANDLER_INFOPPREADRESPL_TD, "CSatMessHandler::InfoPpReadRespL, INFO_PP_ENHANCED_NETWORK_SELECTION not supported by ME product profile" ); iEnsSupportedInPp = EFalse; } } @@ -4400,14 +4394,14 @@ //Get the value of the SIM_POLL_INTERVAL control feature if ( INFO_PP_FALSE != pPFeatures [1] ) { - TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadResp, INFO_PP_SIM_OLD_POLL_INTERVAL supported by ME product profile" ); - OstTrace0( TRACE_NORMAL, DUP4_CSATMESSHANDLER_INFOPPREADRESP, "CSatMessHandler::InfoPpReadResp, INFO_PP_SIM_OLD_POLL_INTERVAL supported by ME product profile" ); + TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadRespL, INFO_PP_SIM_OLD_POLL_INTERVAL supported by ME product profile" ); + OstTrace0( TRACE_NORMAL, DUP4_CSATMESSHANDLER_INFOPPREADRESPL_TD, "CSatMessHandler::InfoPpReadRespL, INFO_PP_SIM_OLD_POLL_INTERVAL supported by ME product profile" ); iOldPollIntervalSupportedInPp = ETrue; } else { - TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadResp, INFO_PP_SIM_OLD_POLL_INTERVAL not supported by ME product profile" ); - OstTrace0( TRACE_NORMAL, DUP5_CSATMESSHANDLER_INFOPPREADRESP, "CSatMessHandler::InfoPpReadResp, INFO_PP_SIM_OLD_POLL_INTERVAL not supported by ME product profile" ); + TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadRespL, INFO_PP_SIM_OLD_POLL_INTERVAL not supported by ME product profile" ); + OstTrace0( TRACE_NORMAL, DUP5_CSATMESSHANDLER_INFOPPREADRESPL_TD, "CSatMessHandler::InfoPpReadRespL, INFO_PP_SIM_OLD_POLL_INTERVAL not supported by ME product profile" ); iOldPollIntervalSupportedInPp = EFalse; } } @@ -4419,8 +4413,8 @@ } case INFO_NO_NUMBER: { - TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadResp, Requested feature not defined in product profile" ); - OstTrace0( TRACE_NORMAL, DUP6_CSATMESSHANDLER_INFOPPREADRESP, "CSatMessHandler::InfoPpReadResp, Requested feature not defined in product profile" ); + TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadRespL, Requested feature not defined in product profile" ); +OstTrace0( TRACE_NORMAL, DUP6_CSATMESSHANDLER_INFOPPREADRESPL_TD, "CSatMessHandler::InfoPpReadRespL, Requested feature not defined in product profile" ); #ifdef INFO_PP_ATK_MO_SM_CONTROL // Request was for INFO_PP_ATK_MO_SM_CONTROL if ( traId == iInfoPpMoSmsTraId ) @@ -4428,16 +4422,19 @@ // If the MO SMS feature is not defined in product profile, // internal Boolean used as feature supported ( for refresh ) iMoSmsSupportedInPp = ETrue; + TInt ret( KErrNone ); // Continue as usual by checking feature avalability from USIM if ( UICC_CARD_TYPE_UICC == iCardType ) { // USIM: Read MO-SMS control from byte 4 - UiccReadServiceTableReq( KUiccTrIdServiceTableByte4, 5 ); + ret = UiccReadServiceTableReq( KUiccTrIdServiceTableByte4, 3 ); + User::LeaveIfError( ret ); } else if ( UICC_CARD_TYPE_ICC == iCardType ) { - // SIM: Read MO-SMS control from byte 5 - UiccReadServiceTableReq( KUiccTrIdServiceTableByte5, 6 ); + // SIM: Read MO-SMS control from byte 10 + ret = UiccReadServiceTableReq( KUiccTrIdServiceTableByte10, 9 ); + User::LeaveIfError( ret ); } } #endif // INFO_PP_ATK_MO_SM_CONTROL @@ -4447,8 +4444,8 @@ case INFO_FAIL: default: { - TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadResp, - default Requested feature not supported by ME product profile" ); - OstTrace0( TRACE_NORMAL, DUP7_CSATMESSHANDLER_INFOPPREADRESP, "CSatMessHandler::InfoPpReadResp, - default Requested feature not supported by ME product profile" ); + TFLOGSTRING("TSY: CSatMessHandler::InfoPpReadRespL, - default Requested feature not supported by ME product profile" ); +OstTrace0( TRACE_NORMAL, DUP7_CSATMESSHANDLER_INFOPPREADRESPL_TD, "CSatMessHandler::InfoPpReadRespL, - default Requested feature not supported by ME product profile" ); #ifdef INFO_PP_ATK_MO_SM_CONTROL // Request was for INFO_PP_ATK_MO_SM_CONTROL if ( traId == iInfoPpMoSmsTraId ) @@ -4466,7 +4463,7 @@ { iInfoPpMoSmsTraId = 0; } - } + }*/ // ----------------------------------------------------------------------------- @@ -4477,7 +4474,7 @@ TInt CSatMessHandler::CheckTlvObjects( CBerTlv& berTlv ) { TFLOGSTRING("TSY: CSatMessHandler::CheckTlvObjects" ); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CHECKTLVOBJECTS, "CSatMessHandler::CheckTlvObjects" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_CHECKTLVOBJECTS_TD, "CSatMessHandler::CheckTlvObjects" ); TInt ret( KErrNone ); TPtrC8 dataPtr = berTlv.Data(); @@ -4520,7 +4517,7 @@ if( 0x80 > dataPtr[index] || 0xFF < dataPtr[index] ) { TFLOGSTRING2("TSY: CSatMessHandler::CheckTlvObjects: corrupted simple tlv obj, len: %d even it should be 128-255", dataPtr[index] ); -OstTrace1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_CHECKTLVOBJECTS, "CSatMessHandler::CheckTlvObjects; corrupted simple tlv obj, len: %d even it should be 128-255", dataPtr[index] ); +OstTrace1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_CHECKTLVOBJECTS_TD, "CSatMessHandler::CheckTlvObjects; corrupted simple tlv obj, len: %d even it should be 128-255", dataPtr[index] ); ret = KErrCorrupt; break; } @@ -4534,7 +4531,7 @@ if( 0x80 <= dataPtr[index] ) { TFLOGSTRING2("TSY: CSatMessHandler::CheckTlvObjects: corrupted simple tlv obj, len: %d even it should be 0-127", dataPtr[index] ); -OstTrace1( TRACE_NORMAL, DUP2_CSATMESSHANDLER_CHECKTLVOBJECTS, "CSatMessHandler::CheckTlvObjects; corrupted simple tlv obj, len: %d even it should be 0-127", dataPtr[index] ); +OstTrace1( TRACE_NORMAL, DUP2_CSATMESSHANDLER_CHECKTLVOBJECTS_TD, "CSatMessHandler::CheckTlvObjects; corrupted simple tlv obj, len: %d even it should be 0-127", dataPtr[index] ); ret = KErrCorrupt; break; } @@ -4555,7 +4552,7 @@ if( berTlvLength != totalLength ) { TFLOGSTRING3("TSY: CSatMessHandler::CheckTlvObjects: proactive command len (%d) and calculated len (%d) doesn't match", berTlvLength, totalLength ); -OstTraceExt2( TRACE_NORMAL, DUP3_CSATMESSHANDLER_CHECKTLVOBJECTS, "CSatMessHandler::CheckTlvObjects; proactive command len (%d) and calculated len (%d) doesn't match", berTlvLength, totalLength ); +OstTraceExt2( TRACE_NORMAL, DUP3_CSATMESSHANDLER_CHECKTLVOBJECTS_TD, "CSatMessHandler::CheckTlvObjects; proactive command len (%d) and calculated len (%d) doesn't match", berTlvLength, totalLength ); ret = KErrCorrupt; } @@ -4571,41 +4568,41 @@ void CSatMessHandler::SimMoSmsControlAvail( TUint8 aStatus ) { TFLOGSTRING("TSY: CSatMessHandler::SimMoSmsControlAvail" ); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SIMMOSMSCONTROLAVAIL, "CSatMessHandler::SimMoSmsControlAvail" ); - - if( SIM_SERV_OK == aStatus ) + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SIMMOSMSCONTROLAVAIL_TD, "CSatMessHandler::SimMoSmsControlAvail" ); + + // Activate the MO-SMS Control in SMS server. This is done by + // sending a request SMS_RESOURCE_CONF_REQ to SMS server + TBuf8 data; + // Append Configuration operation + data.Append( SMS_RES_CONF_SET ); + // Number of Subblocks + data.Append( 1 ); + // Add Subblock + TIsiSubBlock ResourceConfReqSb( + data, + SMS_SB_RESOURCE_CONF, + EIsiSubBlockTypeId16Len16 ); + + if( aStatus ) { // Set MoSmsCtrl object´s member iIsMoSmsCtrlActivated to ETrue iTsySatMessaging->GetMoSmsCtrl()->Activate(); - // Activate the MO-SMS Control in SMS server. This is done by - // sending a request SMS_RESOURCE_CONF_REQ to SMS server - TBuf8 data; - // Append Configuration operation - data.Append( SMS_RES_CONF_SET ); - // Number of Subblocks - data.Append( 1 ); - // Add Subblock - //SMS_RESOURCE_IDS to zero SMS_RES_ID_MASK_MO_SM_INIT - TIsiSubBlock ResourceConfReqSb( - data, - SMS_SB_RESOURCE_CONF, - EIsiSubBlockTypeId16Len16 ); - TSatUtility::AppendWord( SMS_RES_ID_MO_SM_INIT, data ); - TSatUtility::AppendWord( SMS_RES_ID_MASK_MO_SM_INIT, data); - - ResourceConfReqSb.CompleteSubBlock(); - SmsResoureConfReq( - iTsySatMessaging->GetTransactionId(), - SMS_RESOURCE_CONF_REQ, - data ); - } - // should not send SMS_RESOURCE_CONF_REQ if there is no MO SMS control enabled in SIM card + } else - { - // Set MoSmsCtrl object´s member IsMoSmsCtrlDeActivated to EFalse - iTsySatMessaging->GetMoSmsCtrl()->Deactivate(); - } + { + // Set MoSmsCtrl object´s member IsMoSmsCtrlDeActivated to EFalse + iTsySatMessaging->GetMoSmsCtrl()->Deactivate(); + TSatUtility::AppendWord( 0x0000, data); + } + // SMS_RES_ID_MASK_MO_SM_INIT is the only "official" value for mask + TSatUtility::AppendWord( SMS_RES_ID_MASK_MO_SM_INIT, data); + + ResourceConfReqSb.CompleteSubBlock(); + SmsResoureConfReq( + iTsySatMessaging->GetTransactionId(), + SMS_RESOURCE_CONF_REQ, + data ); } // ----------------------------------------------------------------------------- @@ -4615,7 +4612,7 @@ // void CSatMessHandler::UiccTerminalProfileReq() { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCTERMINALPROFILEREQ, "CSatMessHandler::UiccTerminalProfileReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCTERMINALPROFILEREQ_TD, "CSatMessHandler::UiccTerminalProfileReq" ); TFLOGSTRING("TSY: CSatMessHandler::UiccTerminalProfileReq"); // Pointer to terminal profile buffer @@ -4685,7 +4682,7 @@ TUint16 aFileOffset ) { TFLOGSTRING2("TSY: CSatMessHandler::UiccReadServiceTableReq, transaction ID: %d", aTrId ); - OstTraceExt1( TRACE_NORMAL, CSATMESSHANDLER_UICCREADSERVICETABLE, "CSatMessHandler::UiccReadServiceTableReq;aTrId=%hhu", aTrId ); + OstTraceExt1( TRACE_NORMAL, CSATMESSHANDLER_UICCREADSERVICETABLE_TD, "CSatMessHandler::UiccReadServiceTableReq;aTrId=%hhu", aTrId ); TIsiSend isiMsg( iPnSend->SendBufferDes() ); isiMsg.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_UICC ); @@ -4984,7 +4981,7 @@ TInt CSatMessHandler::UiccCatReq( TUint8 aCommand ) { TFLOGSTRING("TSY: CSatMessHandler::UiccCatReq"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCCATREQ, "CSatMessHandler::UiccCatReq" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCCATREQ_TD, "CSatMessHandler::UiccCatReq" ); TIsiSend isiMsg( iPnSend->SendBufferDes() ); isiMsg.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_UICC ); @@ -5019,7 +5016,7 @@ const TDesC8& aAid ) // Application ID (USIM) { TFLOGSTRING("TSY: CSatMessHandler::UiccCatReqRefresh"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCCATREQREFRESH, "CSatMessHandler::UiccCatReqRefresh" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCCATREQREFRESH_TD, "CSatMessHandler::UiccCatReqRefresh" ); TUint8 numOfSubblocks( 1 ); // One mandatory subblock UICC_SB_REFRESH TUint8 uiccSbOffset( @@ -5085,12 +5082,14 @@ { // File path is corrupted TFLOGSTRING("TSY: CSatMessHandler::SimAtkReq, File path is corrupted"); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_UICCCATREQREFRESH, "CSatMessHandler::UiccCatReqRefresh,File path is corrupted" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_UICCCATREQREFRESH_TD, "CSatMessHandler::UiccCatReqRefresh,File path is corrupted" ); break; } - // Length of file path + // Length of whole file path (file path + file id) TUint8 length( (TUint8) ( aFileList.Length() - position ) ); + // length of file path (without file id) + TUint8 pathLength( (TUint8) ( length - KUiccFileIdLength ) ); // File path TBuf8 filePath( aFileList.Mid( position, length ) ); @@ -5111,11 +5110,11 @@ // Filler uiccSbApplPathBuf.Append( KUiccPadding ); // File path length in bytes - uiccSbApplPathBuf.Append( length ); + uiccSbApplPathBuf.Append( pathLength ); // Filler uiccSbApplPathBuf.Append( KUiccPadding ); // File path - uiccSbApplPathBuf.Append( filePath ); + uiccSbApplPathBuf.Append( filePath.Mid( 0, pathLength ) ); // Append subblock to ISI message isiMsg.CopyData( uiccSbOffset, uiccSbApplPath.CompleteSubBlock() ); // Update subblock offset @@ -5149,7 +5148,7 @@ const TUint8 aTransId ) { TFLOGSTRING("TSY: CSatMessHandler::UiccCatReqTerminalResponse"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCCATREQTERMINALRESPONSE, "CSatMessHandler::UiccCatReqTerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCCATREQTERMINALRESPONSE_TD, "CSatMessHandler::UiccCatReqTerminalResponse" ); TIsiSend isiMsg( iPnSend->SendBufferDes() ); isiMsg.Set8bit( ISI_HEADER_OFFSET_RESOURCEID, PN_UICC ); @@ -5212,7 +5211,7 @@ // Save terminal resp transaction id iTerminalRespTraId = aTransId; TFLOGSTRING2("TSY: CSatMessHandler::UiccCatReqTerminalResponse iTerminalRespTraId=%d", iTerminalRespTraId); - OstTrace1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_UICCCATREQTERMINALRESPONSE, "CSatMessHandler::UiccCatReqTerminalResponse;iTerminalRespTraId=%d", iTerminalRespTraId ); + OstTrace1( TRACE_NORMAL, DUP1_CSATMESSHANDLER_UICCCATREQTERMINALRESPONSE_TD, "CSatMessHandler::UiccCatReqTerminalResponse;iTerminalRespTraId=%d", iTerminalRespTraId ); // Append subblock to ISI message isiMsg.CopyData( @@ -5229,7 +5228,7 @@ // TBool CSatMessHandler::UiccCatRespEnvelope( const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCCATENVELOPERESP, "CSatMessHandler::UiccCatRespEnvelope" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCCATENVELOPERESP_TD, "CSatMessHandler::UiccCatRespEnvelope" ); TFLOGSTRING("TSY:CSatMessHandler::UiccCatRespEnvelope"); TBool handled( EFalse ); @@ -5257,6 +5256,12 @@ { // SIM responded OK. Remove stored envelope. iTsySatMessaging->GetSatTimer()->RemoveEnvelope( trId ); + + if ( iTerminalRespTraId == trId ) + { + iTsySatMessaging->SessionEnd( aIsiMessage ); + iTerminalRespTraId = KNoTransactionOngoing; + } } else { @@ -5265,7 +5270,7 @@ ActivateEnvelopeResend( trId, sw1 ) ) { TFLOGSTRING( "TSY:CSatMessHandler::UiccCatRespEnvelope, resending of envelope" ); - OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_UICCCATENVELOPERESP, "CSatMessHandler::UiccCatRespEnvelope,resending of envelope" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_UICCCATENVELOPERESP_TD, "CSatMessHandler::UiccCatRespEnvelope,resending of envelope" ); // Envelope will be resent, mark as handled handled = ETrue; } @@ -5274,7 +5279,7 @@ else // Subblock is mandatory { TFLOGSTRING("TSY: CSatMessHandler::UiccCatRespEnvelope - Mandatory subblock UICC_SB_APDU not found"); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_UICCCATENVELOPERESP, "CSatMessHandler::UiccCatRespEnvelope- Mandatory subblock UICC_SB_APDU not found" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_UICCCATENVELOPERESP_TD, "CSatMessHandler::UiccCatRespEnvelope- Mandatory subblock UICC_SB_APDU not found" ); } return handled; @@ -5289,7 +5294,7 @@ TBool CSatMessHandler::UiccCatRespTerminalResponse( const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_UICCCATRESPTERMINALRESPONSE, "CSatMessHandler::UiccCatRespTerminalResponse" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATMESSHANDLER_UICCCATRESPTERMINALRESPONSE_TD, "CSatMessHandler::UiccCatRespTerminalResponse" ); TFLOGSTRING("TSY:CSatMessHandler::UiccCatRespTerminalResponse"); TBool handled( EFalse ); @@ -5316,7 +5321,7 @@ && KAtkSwDataNtfSw2NormalEnding == sw2 ) { TFLOGSTRING("CSatMessHandler::UiccCatRespTerminalResponse, - SIM SESSION END, 90 00 -"); - OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_UICCCATRESPTERMINALRESPONSE, "CSatMessHandler::UiccCatRespTerminalResponse" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMESSHANDLER_UICCCATRESPTERMINALRESPONSE_TD, "CSatMessHandler::UiccCatRespTerminalResponse" ); iTsySatMessaging->SessionEnd( aIsiMessage ); @@ -5324,6 +5329,7 @@ // processed by the SIM with status '90 00'. iTsySatMessaging->GetSatTimer()-> SetProactiveCommandOnGoingStatus( EFalse ); + iTerminalRespTraId = KNoTransactionOngoing; } handled = ETrue; @@ -5339,7 +5345,7 @@ else // Subblock is not found { TFLOGSTRING("TSY: CSatMessHandler::UiccCatRespTerminalResponse - Subblock UICC_SB_APDU not found"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCCATRESPTERMINALRESPONSE, "CSatMessHandler::UiccCatRespTerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_UICCCATRESPTERMINALRESPONSE_TD, "CSatMessHandler::UiccCatRespTerminalResponse" ); } return handled; @@ -5354,7 +5360,7 @@ const TDesC8& CSatMessHandler::GetApplicationFileId() { TFLOGSTRING("TSY: CSatMessHandler::GetApplicationId"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GETAPPLICATIONID, "CSatMessHandler::GetApplicationId" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GETAPPLICATIONID_TD, "CSatMessHandler::GetApplicationId" ); return iApplFileId; } @@ -5366,7 +5372,7 @@ // void CSatMessHandler::SetSatReadyStatus( TBool aSatReadyStatus ) { - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SETSATREADYSTATUS, "CSatMessHandler::SetSatReadyStatus" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_SETSATREADYSTATUS_TD, "CSatMessHandler::SetSatReadyStatus" ); TFLOGSTRING("TSY: CSatMessHandler::SetSatReadyStatus"); iSatReady = aSatReadyStatus; } @@ -5380,7 +5386,7 @@ TBool CSatMessHandler::GetSatReadyStatus() { TFLOGSTRING("TSY: CSatMessHandler::GetSatReadyStatus"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GETSATREADYSTATUS, "CSatMessHandler::GetSatReadyStatus" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GETSATREADYSTATUS_TD, "CSatMessHandler::GetSatReadyStatus" ); return iSatReady; } @@ -5393,7 +5399,7 @@ TBool CSatMessHandler::GetTerminalProfileStatus() { TFLOGSTRING("TSY: CSatMessHandler::GetTerminalProfileStatus"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GETTERMINALPROFILESTATUS, "CSatMessHandler::GetTerminalProfileStatus" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GETTERMINALPROFILESTATUS_TD, "CSatMessHandler::GetTerminalProfileStatus" ); return iTerminalProfileSent; } @@ -5406,7 +5412,7 @@ const TDesC8& CSatMessHandler::GetClut() { TFLOGSTRING("TSY: CSatMessHandler::SetImageInstanceRequestStatus"); - OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GETCLUT, "CSatMessHandler::GetClut" ); + OstTrace0( TRACE_NORMAL, CSATMESSHANDLER_GETCLUT_TD, "CSatMessHandler::GetClut" ); return iClutData; } diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/src/satmosmsctrl.cpp --- a/adaptationlayer/tsy/simatktsy_dll/src/satmosmsctrl.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/src/satmosmsctrl.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -28,7 +28,6 @@ #include // isi message #include // UICC server #include // sms server -#include #include "OstTraceDefinitions.h" #ifdef OST_TRACE_COMPILER_IN_USE #include "satmosmsctrlTraces.h" @@ -46,6 +45,12 @@ const TUint8 KSmControlNotAllowed = 1; const TUint8 KSmControlAllowedWithModif = 2; const TUint8 KSmsSubmitAddrDataIndex = 3; +const TUint8 KMessageParamsIndex = 0; +const TUint8 KCommandTypeMask = 0x03; +const TUint8 KSmsCommandAddrIndex = 5; +const TUint8 KSmsSubmitAddrIndex = 2; +const TUint8 KTpDaTonNpiIndex = 1; +const TUint8 KTpDaTonNpiSize = 1; // ==================== MEMBER FUNCTIONS ==================================== @@ -69,7 +74,7 @@ iMoSmsCtrlReqTransactionId( KZero ), iSenderObject( KZero ) { - OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_CSATMOSMSCTRL, "CSatMoSmsCtrl::CSatMoSmsCtrl" ); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_CSATMOSMSCTRL_TD, "CSatMoSmsCtrl::CSatMoSmsCtrl" ); } @@ -80,8 +85,8 @@ // void CSatMoSmsCtrl::ConstructL() { - OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_CONSTRUCTL, "CSatMoSmsCtrl::ConstructL" ); -#ifdef INFO_PP_ATK_MO_SM_CONTROL + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_CONSTRUCTL_TD, "CSatMoSmsCtrl::ConstructL" ); +/*#ifdef INFO_PP_ATK_MO_SM_CONTROL // Check MO SMS control is supported by ME's Product Profile iSatMessHandler->InfoPpReadReq( INFO_PP_ATK_MO_SM_CONTROL ); #else @@ -89,7 +94,7 @@ // This is done by sending a request SimReadTableReq to Sim server, with // service type KSimStMoSmsSimControlAvail iSatMessHandler->SimReadTableReq( SIM_ST_MO_SMS_SIM_CONTROL_AVAIL ); -#endif // INFO_PP_ATK_MO_SM_CONTROL +#endif // INFO_PP_ATK_MO_SM_CONTROL*/ } @@ -104,7 +109,7 @@ CTsySatMessaging* aSatMessaging ) { - OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_NEWL, "CSatMoSmsCtrl::NewL" ); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_NEWL_TD, "CSatMoSmsCtrl::NewL" ); TFLOGSTRING("TSY: CSatMoSmsCtrl::NewL"); CSatMoSmsCtrl* self = @@ -125,7 +130,7 @@ // CSatMoSmsCtrl::~CSatMoSmsCtrl() { - OstTrace0( TRACE_NORMAL, DUP1_CSATMOSMSCTRL_CSATMOSMSCTRL, "CSatMoSmsCtrl::~CSatMoSmsCtrl" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMOSMSCTRL_CSATMOSMSCTRL_TD, "CSatMoSmsCtrl::~CSatMoSmsCtrl" ); TFLOGSTRING("TSY: CSatMoSmsCtrl::~CSatMoSmsCtrl"); } @@ -137,7 +142,7 @@ // TBool CSatMoSmsCtrl::IsActivated() { - OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_ISACTIVATED, "CSatMoSmsCtrl::IsActivated" ); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_ISACTIVATED_TD, "CSatMoSmsCtrl::IsActivated" ); TFLOGSTRING("TSY: CSatMoSmsCtrl::IsActivated"); return iIsMoSmsCtrlActivated; } @@ -149,7 +154,7 @@ // void CSatMoSmsCtrl::Activate() { - OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_ACTIVATE, "CSatMoSmsCtrl::Activate" ); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_ACTIVATE_TD, "CSatMoSmsCtrl::Activate" ); TFLOGSTRING("TSY: CSatMoSmsCtrl::Activate"); iIsMoSmsCtrlActivated = ETrue; } @@ -161,7 +166,7 @@ // void CSatMoSmsCtrl::Deactivate() { - OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_DEACTIVATE, "CSatMoSmsCtrl::Deactivate" ); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_DEACTIVATE_TD, "CSatMoSmsCtrl::Deactivate" ); TFLOGSTRING("TSY: CSatMoSmsCtrl::Deactivate"); iIsMoSmsCtrlActivated = EFalse; } @@ -176,7 +181,7 @@ const TIsiReceiveC& aIsiMessage //Received data notification ) { - OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_UICCCATRESPENVELOPERECEIVED, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived" ); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_UICCCATRESPENVELOPERECEIVED_TD, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived" ); TFLOGSTRING("TSY:CSatMoSmsCtrl::UiccCatRespEnvelopeReceived"); TBuf8 addr1; TBuf8 addr2; @@ -221,7 +226,7 @@ if ( KError != atkResult ) // If ATK result is OK { TFLOGSTRING("TSY:CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, Ok"); - OstTrace0( TRACE_NORMAL, DUP1_CSATMOSMSCTRL_ATKSWDATANTFRECEIVED, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, Ok" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMOSMSCTRL_ATKSWDATANTFRECEIVED_TD, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, Ok" ); RSat::TAlphaId alphaId; alphaId.iAlphaId.Zero(); TBool isAlphaIdEmpty( EFalse ); @@ -229,7 +234,7 @@ if ( KMaxLengthOfAtkSwDataNtf < apduLength ) // If data length greater than 255 { TFLOGSTRING("TSY:CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, the length of Sim resp data is > 255" ); - OstTrace0( TRACE_NORMAL, DUP2_CSATMOSMSCTRL_ATKSWDATANTFRECEIVED, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, the length of Sim resp data is > 255" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATMOSMSCTRL_ATKSWDATANTFRECEIVED_TD, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, the length of Sim resp data is > 255" ); // Data is not consistent, so not allowed condition if( KSmControlNotAllowed == apduData[0] ) { @@ -253,7 +258,7 @@ else if ( apduLength ) // If data length in non zero and less than 255 { TFLOGSTRING("TSY:CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, atkData.Length()!=0 "); - OstTrace0( TRACE_NORMAL, DUP3_CSATMOSMSCTRL_ATKSWDATANTFRECEIVED, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, atkData.Length()!=0 " ); + OstTrace0( TRACE_NORMAL, DUP3_CSATMOSMSCTRL_ATKSWDATANTFRECEIVED_TD, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, atkData.Length()!=0 " ); // Note: The alpha id can be provided by the SIM even if the addresses // have not been modified. @@ -275,12 +280,12 @@ } FormSmsResourceReqSb( resourceStatus, dataResp, addr1, addr2 ); TFLOGSTRING2("TSY:CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, apduData[0]: %d",apduData[0] ); - OstTrace1( TRACE_NORMAL, DUP4_CSATMOSMSCTRL_ATKSWDATANTFRECEIVED, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, apduData[0]: %d", apduData[0] ); + OstTrace1( TRACE_NORMAL, DUP4_CSATMOSMSCTRL_ATKSWDATANTFRECEIVED_TD, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, apduData[0]: %d", apduData[0] ); } else { TFLOGSTRING("TSY:CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, Sim response data not consistent" ); - OstTrace0( TRACE_NORMAL, DUP5_CSATMOSMSCTRL_ATKSWDATANTFRECEIVED, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, Sim response data not consistent" ); + OstTrace0( TRACE_NORMAL, DUP5_CSATMOSMSCTRL_ATKSWDATANTFRECEIVED_TD, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, Sim response data not consistent" ); if( KSmControlNotAllowed == apduData[0] ) { resourceStatus = SMS_RESOURCE_DENIED; @@ -305,7 +310,7 @@ else // block for data length zero { TFLOGSTRING("TSY:CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, atkData.Length()=0 "); - OstTrace0( TRACE_NORMAL, DUP6_CSATMOSMSCTRL_ATKSWDATANTFRECEIVED, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, atkData.Length()=0" ); + OstTrace0( TRACE_NORMAL, DUP6_CSATMOSMSCTRL_ATKSWDATANTFRECEIVED_TD, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, atkData.Length()=0" ); TUint8 resourceStatus( SMS_RESOURCE_ALLOWED ); FormSmsResourceReqSb( resourceStatus, dataResp, addr1, addr2 ); }// end of block with data length zero @@ -349,7 +354,7 @@ else // else for UICC status not ok { TFLOGSTRING("TSY:CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, KAtkError = atkResult "); - OstTrace0( TRACE_NORMAL, DUP7_CSATMOSMSCTRL_ATKSWDATANTFRECEIVED, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, KAtkError = atkResult" ); + OstTrace0( TRACE_NORMAL, DUP7_CSATMOSMSCTRL_ATKSWDATANTFRECEIVED_TD, "CSatMoSmsCtrl::UiccCatRespEnvelopeReceived, KAtkError = atkResult" ); TUint8 resourceStatus = SMS_RESOURCE_DENIED; FormSmsResourceReqSb( resourceStatus, dataResp, addr1, addr2 ); } @@ -377,7 +382,7 @@ ) { TFLOGSTRING("TSY:CSatMoSmsCtrl::SmsResourceIndReceivedL"); - OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_SMSRESOURCEINDRECEIVEDL, "CSatMoSmsCtrl::SmsResourceIndReceivedL" ); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_SMSRESOURCEINDRECEIVEDL_TD, "CSatMoSmsCtrl::SmsResourceIndReceivedL" ); TUint sbOffset; @@ -453,189 +458,36 @@ iUserDataSubblock.Zero(); } - //Check if location data is present. Otherwise response to SmsResourceInd - //is always ALLOWED. - if ( !iSatMessHandler->ServiceAvailable() ) - { - TBuf8 dataResp; - TIsiSend resourceReq( dataResp ); - - dataResp.AppendFill( KPadding, 1); // filer byte - dataResp.Append( 5 ); // no of Subblocks - - // Add first SB Resource Subblock - TIsiSubBlock resource( dataResp, SMS_SB_RESOURCE , - EIsiSubBlockTypeId16Len16 ); // Message ID and Subblock length - - dataResp.Append( iResourceId >> 8 ); // SMS Resource IDs MSB - - dataResp.Append( iResourceId ); // SMS resource IDs LSB - - dataResp.AppendFill( KPadding,2 ); // Filler Bytes - resource.CompleteSubBlock(); - - // Add 2nd resource sequence ID subblock - - TIsiSubBlock resourceSeqId( dataResp, SMS_SB_RESOURCE_SEQ_ID , - EIsiSubBlockTypeId16Len16 ); - dataResp.Append(iSequenceId); // Sequence ID - dataResp.AppendFill( KPadding, 3 ); - resourceSeqId.CompleteSubBlock(); - - - // Add Third subblock SMS_SB_RESOURCE_STATUS - - TIsiSubBlock resourceStatus( dataResp, SMS_SB_RESOURCE_STATUS , - EIsiSubBlockTypeId16Len16 ); - dataResp.Append( SMS_RESOURCE_ALLOWED ); // Resource status - dataResp.AppendFill( KPadding, 3 ); - resourceStatus.CompleteSubBlock(); + //Check if location data is present. Otherwise response to SmsResourceInd + //is always ALLOWED. + if ( !iSatMessHandler->ServiceAvailable() ) + { + TFLOGSTRING("TSY:CSatMoSmsCtrl::SmsResourceIndReceivedL: Not Allowed Condition, Send response to SMS server"); + OstTrace0( TRACE_NORMAL, DUP1_CSATMOSMSCTRL_SMSRESOURCEINDRECEIVEDL_TD, "CSatMoSmsCtrl::SmsResourceIndReceivedL: Not Allowed conditon, Send response to SMS server" ); - // Add 4th subblock SMS_SB_ADDRESS (SMSC) - TIsiSubBlock addressSb( dataResp, SMS_SB_ADDRESS , - EIsiSubBlockTypeId16Len16 ); - dataResp.Append( SMS_SMSC_ADDRESS ); // Addrees Type - dataResp.Append( iAddressSubblock.Length() ); - dataResp.Append( iAddressSubblock ); - - // Filler bytes calculation for SMSC address subblock - TUint8 fillbytes = 0; - while(( iAddressSubblock.Length()+ 6 + fillbytes )%4) - { - fillbytes++; - } - - dataResp.AppendFill( KPadding,fillbytes ); - addressSb.CompleteSubBlock(); - - // Add 5th Subblock SMS_SB_TPDU (Destination address) - - TIsiSubBlock userDataSb( dataResp, SMS_SB_TPDU , - EIsiSubBlockTypeId16Len16 ); - dataResp.Append( iUserDataSubblock.Length() ); // Addrees Length - dataResp.Append( KPadding ); - dataResp.Append( iUserDataSubblock ); - - // Filler bytes calculation for user data subblock - fillbytes = 0; - while(( iUserDataSubblock.Length()+ 6 + fillbytes )%4 ) - { - fillbytes++; - } - - dataResp.AppendFill( KPadding,fillbytes ); - userDataSb.CompleteSubBlock(); - - TFLOGSTRING("TSY:CSatMoSmsCtrl::SmsResourceIndReceived: Not Allowed Condition, Send response to SMS server"); - OstTrace0( TRACE_NORMAL, DUP1_CSATMOSMSCTRL_SMSRESOURCEINDRECEIVED, "CSatMoSmsCtrl::SmsResourceIndReceived: Not Allowed conditon, Send response to SMS server" ); - - // Send Req to Sms server with allowed status - iSatMessHandler->SendSmsResourceReq( - iMoSmsCtrlReqTransactionId, - dataResp, - iSenderObject ); - } - else - { + SendSmsResourceReq( + SMS_RESOURCE_ALLOWED, + SMS_CAUSE_TYPE_COMMON, + SMS_OK ); + } + else + { if( iIsMoSmsCtrlActivated ) // Check is MO SMS is activated or not { - TPtrC8 addressData2; - - if ( iUserDataSubblock.Length() ) - { - // check for message type - // Whether its a command type message or Submit type - if(KSmsCommandType == ( iUserDataSubblock[0]& 0x03 )) - { - iMessageType = KSmsCommandType; - TPtrC8 phoneNumber = &iUserDataSubblock[5]; - // Addition of two for Type of number semi octet - addressData2.Set( - phoneNumber.Mid( 1, (iUserDataSubblock[5]/2)+1 ) ); - } - else if( KSmsSubmitType == ( iUserDataSubblock[0] & 0x03 ) ) - { - iMessageType = KSmsSubmitType; - TPtrC8 phoneNumber = &iUserDataSubblock[2]; - // Addition of two for Type of number semi octet - addressData2.Set( - phoneNumber.Mid( 1, (iUserDataSubblock[2]/2)+1 ) ); - } - } - // Dialled Number String, the length has to be removed (first byte) +TFLOGSTRING("TSY:CSatMoSmsCtrl::SmsResourceIndReceivedL, Send envelope"); +OstTrace0( TRACE_NORMAL, DUP3_CSATMOSMSCTRL_SMSRESOURCEINDRECEIVEDL_TD, "CSatMoSmsCtrl::SmsResourceIndReceivedL, Send envelope" ); iMoSmsCtrlEnvelopeTransactionId = iSatMessaging->GetTransactionId(); - -TFLOGSTRING("TSY:CSatMoSmsCtrl::SmsResourceIndReceived, Send envelope"); -OstTrace0( TRACE_NORMAL, DUP3_CSATMOSMSCTRL_SMSRESOURCEINDRECEIVED, "CSatMoSmsCtrl::SmsResourceIndReceived, Send envelope" ); - - // The envelope is sent if MO SMS is activated - // iAddressSubblock is not sent as it's received - // from SMS server because of iAddressSubblock's first - // byte is length of the address data and MO SMS Control envelope - // is NOT allowed to contain that in address data. So length - // field is skipped - SendMoSmsCtrlEnvelope( - iMoSmsCtrlEnvelopeTransactionId, - iAddressSubblock.Mid( 1, iAddressSubblock.Length() - 1 ), - addressData2 - ); + FormMoSmsCtrlEnvelope(); } else // If MO SMS is not activated { - TBuf8 dataResp; - TIsiSend resourceReq( dataResp ); - - dataResp.AppendFill( KPadding, 1 ); // filer byte - dataResp.Append( 4 ); // no of Subblocks - - // Add first SB Resource Subblock - TIsiSubBlock resource( dataResp, SMS_SB_RESOURCE , - EIsiSubBlockTypeId16Len16 ); // Message ID and Subblock length - - dataResp.Append( iResourceId >> 8 ); // SMS Resource IDs MSB - - dataResp.Append( iResourceId ); // SMS resource IDs LSB - - dataResp.AppendFill( KPadding, 2 ); // Filler Bytes - resource.CompleteSubBlock(); - - // Add 2nd resource sequence ID subblock - - TIsiSubBlock resourceSeqId( dataResp, SMS_SB_RESOURCE_SEQ_ID , - EIsiSubBlockTypeId16Len16 ); - dataResp.Append( iSequenceId ); // Sequence ID - dataResp.AppendFill( KPadding, 3 ); - resourceSeqId.CompleteSubBlock(); - - // Add Third subblock - - TIsiSubBlock resourceStatus( dataResp, SMS_SB_RESOURCE_STATUS , - EIsiSubBlockTypeId16Len16 ); - dataResp.Append( SMS_RESOURCE_DENIED ); // Resource status - dataResp.AppendFill( KPadding, 3 ); - resourceStatus.CompleteSubBlock(); - - // No address and User data Subblocks because Here resource ID is not the activated - - // Add cause subblock - - TIsiSubBlock sbCause( dataResp,SMS_SB_CAUSE, - EIsiSubBlockTypeId16Len16 ); - - dataResp.Append( SMS_CAUSE_TYPE_COMMON ); - dataResp.Append( SMS_ERR_ROUTE_NOT_ALLOWED ); - dataResp.Append( KPadding, 2 ); - - // Send resp to Sms server with not allowed status - iSatMessHandler->SendSmsResourceReq( - iMoSmsCtrlReqTransactionId, - dataResp, - iSenderObject ); - + SendSmsResourceReq( + SMS_RESOURCE_DENIED, + SMS_CAUSE_TYPE_COMMON, + SMS_ERR_ROUTE_NOT_ALLOWED ); } } - } // ----------------------------------------------------------------------------- @@ -652,7 +504,7 @@ const TDesC8& aAddressData2 ) { - OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_SENDMOSMSCTRLENVELOPE, "CSatMoSmsCtrl::SendMoSmsCtrlEnvelope" ); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_SENDMOSMSCTRLENVELOPE_TD, "CSatMoSmsCtrl::SendMoSmsCtrlEnvelope" ); TFLOGSTRING("TSY:CSatMoSmsCtrl::SendMoSmsCtrlEnvelope"); // Get location info @@ -711,7 +563,7 @@ TBool& aEmptyAlphaId ) { - OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_PARSEATKSWDATANTF, "CSatMoSmsCtrl::ParseAtkSwDataNtf" ); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_PARSEATKSWDATANTF_TD, "CSatMoSmsCtrl::ParseAtkSwDataNtf" ); TFLOGSTRING("TSY:CSatMoSmsCtrl::ParseAtkSwDataNtf"); // Input data: @@ -738,7 +590,8 @@ TInt n( (KTwoByteLengthCoding == tag)?1:0 ); lengthBerTlv = aAtkData[1 + n]; indexInBerTlv = 2 + n; - + // MO SMS control result + TUint8 moSmsResult( aAtkData[0] ); // Extract TLVs and fill in output variables TBool address1_got( EFalse ); while( lengthBerTlv ) @@ -751,7 +604,8 @@ TInt lengthTlv( aAtkData[indexInBerTlv+nn+1] ); // Check what TLV is received if ( ( KTlvAddressTag == tag ) - && ( !address1_got ) ) + && ( !address1_got ) + && KSmControlAllowedWithModif == moSmsResult ) { // RP address first address1_got = ETrue; @@ -764,7 +618,8 @@ CleanAddressData( aAddr1 ); } } - else if ( KTlvAddressTag == tag ) + else if ( KTlvAddressTag == tag + && KSmControlAllowedWithModif == moSmsResult ) { // TP address // Copy data to output variable @@ -794,7 +649,7 @@ else { TFLOGSTRING("TSY: CSatMoSmsCtrl::ParseAtkSwDataNtf, Tlv tag was not address/alpha id tag."); - OstTrace0( TRACE_NORMAL, DUP1_CSATMOSMSCTRL_PARSEATKSWDATANTF, "CSatMoSmsCtrl::ParseAtkSwDataNtf, Tlv tag was not address/alpha id tag." ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMOSMSCTRL_PARSEATKSWDATANTF_TD, "CSatMoSmsCtrl::ParseAtkSwDataNtf, Tlv tag was not address/alpha id tag." ); } @@ -816,7 +671,7 @@ TDes8& aAddr ) { - OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_CLEANADDRESSDATA, "CSatMoSmsCtrl::CleanAddressData" ); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_CLEANADDRESSDATA_TD, "CSatMoSmsCtrl::CleanAddressData" ); TFLOGSTRING("TSY: CSatMoSmsCtrl::CleanAddressData"); // Starts from index 1, since index 0 is for TON/NPI for ( TInt i=1; i < aAddr.Length(); i++ ) @@ -850,7 +705,7 @@ TDes8& aTPAddr ) { - OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_VERIFYSIMRESPDATA, "CSatMoSmsCtrl::VerifySimRespData" ); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_VERIFYSIMRESPDATA_TD, "CSatMoSmsCtrl::VerifySimRespData" ); TBool ret( ETrue ); if ( ( 0==aRPAddr.Length() && 0==aTPAddr.Length() ) || ( KMaxLengthAddr1Addr2 <= ( aRPAddr.Length()+aTPAddr.Length() ) ) @@ -927,8 +782,8 @@ data[1]++; // Copy address subblocks from Indication message // Add Address Subblock - TIsiSubBlock address( - data, + TIsiSubBlock address( + data, SMS_SB_ADDRESS , EIsiSubBlockTypeId16Len16 ); data.Append( SMS_SMSC_ADDRESS ); // Address type @@ -940,8 +795,8 @@ // increment subblock data[1]++; // Add User Data Subblock - TIsiSubBlock userData( - data, + TIsiSubBlock userData( + data, SMS_SB_TPDU , EIsiSubBlockTypeId16Len16 ); data.Append( iUserDataSubblock.Length() ); // data Length @@ -958,8 +813,8 @@ // Add Address subblock data[1]++; // increase no of subblocks - TIsiSubBlock address( - data, + TIsiSubBlock address( + data, SMS_SB_ADDRESS , EIsiSubBlockTypeId16Len16 ); data.Append(SMS_SMSC_ADDRESS); // Address Type @@ -968,9 +823,9 @@ // First byte is the address length in 3GPP, GSM_0411 format // "data length in bytes, including TON & NPI". data.Append( address1.Length() + 1 ); - // Actual address data. + // Actual address data. data.Append( address1.Length()); - data.Append( address1 ); + data.Append( address1 ); address.CompleteSubBlock(); } // end of Service centre Address Subblock @@ -981,8 +836,8 @@ data[1]++; // For User Data Subblock - TIsiSubBlock userDataSb( - data, + TIsiSubBlock userDataSb( + data, SMS_SB_TPDU, EIsiSubBlockTypeId16Len16 ); @@ -1054,10 +909,10 @@ // old addresss needs to be deleted before new one can be inserted // to the tpdu - iUserDataSubblock.Delete( - KSmsSubmitAddrDataIndex, + iUserDataSubblock.Delete( + KSmsSubmitAddrDataIndex, oldAddrLen + 1 ); - iUserDataSubblock.Insert( + iUserDataSubblock.Insert( KSmsSubmitAddrDataIndex, address2 ); break; @@ -1077,8 +932,8 @@ { // Add SMS_SB_CAUSE subblock data[1]++; //Increment no of subblocks - TIsiSubBlock cause( - data, + TIsiSubBlock cause( + data, SMS_SB_CAUSE , EIsiSubBlockTypeId16Len16 ); data.Append( SMS_CAUSE_TYPE_COMMON ); // Cause type @@ -1097,7 +952,7 @@ const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_MESSAGERECEIVED, "CSatMoSmsCtrl::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_MESSAGERECEIVED_TD, "CSatMoSmsCtrl::MessageReceived" ); TFLOGSTRING("TSY: CSatMoSmsCtrl::MessageReceived"); // SMS server -> SimAtkTsy : MO-SMS request sent to SAT (KSmsResourceReq) // UICC server <- SimAtkTsy : Envelope sent to UICC server (KAtkEnvelopeNtf) @@ -1126,7 +981,7 @@ { // Take a log TFLOGSTRING("TSY:CSatMoSmsCtrl::SmsResourceRespReceived: Response for Resource Req, Receive response from SMS server"); - OstTrace0( TRACE_NORMAL, DUP1_CSATMOSMSCTRL_SMSRESOURCERESPRECEIVED, "CSatMoSmsCtrl::SmsResourceRespReceived: Response for Resource Req, Receive response from SMS server" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATMOSMSCTRL_SMSRESOURCERESPRECEIVED_TD, "CSatMoSmsCtrl::SmsResourceRespReceived: Response for Resource Req, Receive response from SMS server" ); break; } @@ -1172,4 +1027,177 @@ return KErrNone; } +// ----------------------------------------------------------------------------- +// CSatMoSmsCtrl::SendSmsResourceReq +// Constructs and sends SMS_RESOURCE_REQ +// ----------------------------------------------------------------------------- +// +void CSatMoSmsCtrl::SendSmsResourceReq( + TUint8 aResourceStatus, + TUint8 aCauseType, + TUint8 aCause ) + { + TFLOGSTRING("TSY: CSatMoSmsCtrl::SendSmsResourceReq"); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_SENDSMSRESOURCEREQ_TD, "CSatMoSmsCtrl::SendSmsResourceReq" ); + + TBuf8 dataResp; + TIsiSend resourceReq( dataResp ); + + dataResp.AppendFill( KPadding, 1 ); // filler byte + TUint8 sbCount( 0 ); + if ( SMS_RESOURCE_ALLOWED == aResourceStatus ) + { + sbCount = 5; // in ok case there are 5 subblocks + } + else + { + sbCount = 4; // otherwise 4 + } + dataResp.Append( sbCount ); // no of Subblocks + + // Add first SB Resource Subblock + TIsiSubBlock resource( + dataResp, + SMS_SB_RESOURCE , + EIsiSubBlockTypeId16Len16 ); // Message ID and Subblock length + + dataResp.Append( iResourceId >> 8 ); // SMS Resource IDs MSB + dataResp.Append( iResourceId ); // SMS resource IDs LSB + resource.CompleteSubBlock(); + + // Add 2nd resource sequence ID subblock + TIsiSubBlock resourceSeqId( + dataResp, + SMS_SB_RESOURCE_SEQ_ID , + EIsiSubBlockTypeId16Len16 ); + + dataResp.Append(iSequenceId); // Sequence ID + resourceSeqId.CompleteSubBlock(); + + // Add Third subblock SMS_SB_RESOURCE_STATUS + TIsiSubBlock resourceStatus( + dataResp, + SMS_SB_RESOURCE_STATUS , + EIsiSubBlockTypeId16Len16 ); + + dataResp.Append( aResourceStatus ); // Resource status + resourceStatus.CompleteSubBlock(); + + if ( SMS_RESOURCE_ALLOWED == aResourceStatus ) + { + // Add 4th subblock SMS_SB_ADDRESS (SMSC) + TIsiSubBlock addressSb( + dataResp, + SMS_SB_ADDRESS , + EIsiSubBlockTypeId16Len16 ); + + dataResp.Append( SMS_SMSC_ADDRESS ); // Addrees Type + dataResp.Append( iAddressSubblock.Length() ); + dataResp.Append( iAddressSubblock ); + addressSb.CompleteSubBlock(); + + // Add 5th Subblock SMS_SB_TPDU (Destination address) + TIsiSubBlock userDataSb( + dataResp, + SMS_SB_TPDU , + EIsiSubBlockTypeId16Len16 ); + + dataResp.Append( iUserDataSubblock.Length() ); // Addrees Length + dataResp.Append( KPadding ); + dataResp.Append( iUserDataSubblock ); + userDataSb.CompleteSubBlock(); + } + else + { + // Add cause subblock + TIsiSubBlock sbCause( + dataResp, + SMS_SB_CAUSE, + EIsiSubBlockTypeId16Len16 ); + + dataResp.Append( aCauseType ); + dataResp.Append( aCause ); + sbCause.CompleteSubBlock(); + } + + // Send resp to Sms server with not allowed status + iSatMessHandler->SendSmsResourceReq( + iMoSmsCtrlReqTransactionId, + dataResp, + iSenderObject ); + } +// ----------------------------------------------------------------------------- +// CSatMoSmsCtrl::FormMoSmsCtrlEnvelope +// Forms and sends MO SMS Control envelope +// ----------------------------------------------------------------------------- +// +void CSatMoSmsCtrl::FormMoSmsCtrlEnvelope() + { + TFLOGSTRING("TSY: CSatMoSmsCtrl::FormMoSmsCtrlEnvelope"); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_FORMMOSMSCTRLENVELOPE_TD, "CSatMoSmsCtrl::FormMoSmsCtrlEnvelope" ); + + TPtrC8 addressData2; + if ( iUserDataSubblock.Length() ) + { + iMessageType = FetchTpDa( iUserDataSubblock, addressData2 ); + } + // no else + + // Dialled Number String, the length has to be removed (first byte) + // The envelope is sent if MO SMS is activated + // iAddressSubblock is not sent as it's received + // from SMS server because of iAddressSubblock's first + // byte is length of the address data and MO SMS Control envelope + // is NOT allowed to contain that in address data. So length + // field is skipped + SendMoSmsCtrlEnvelope( + iMoSmsCtrlEnvelopeTransactionId, + iAddressSubblock.Mid( 1, iAddressSubblock.Length() - 1 ), + addressData2 ); + } + +// ----------------------------------------------------------------------------- +// CSatMoSmsCtrl::FetchTpDa +// Fetches TP-DA contents from TPDU +// ----------------------------------------------------------------------------- +// +TUint8 CSatMoSmsCtrl::FetchTpDa( const TDesC8& aTpdu, TPtrC8& aTpda ) + { + TFLOGSTRING("TSY: CSatMoSmsCtrl::FetchTpDa"); + OstTrace0( TRACE_NORMAL, CSATMOSMSCTRL_FETCHTPDA_TD, "CSatMoSmsCtrl::FetchTpDa" ); + + TUint8 ret( 0 ); + + // TP-DA has the following structure + // (see 3GPP TS 23.040 clause 9.1.2.5) + // [0] Address-Length + // [1] TonNpi + // [2..] Address-Value ADN encoding + // resulting descriptor contains TonNpi+Address-Value + // 'Address-Length' does not count filler byte if it is present, so it + // can be odd value. If it is we need to add 1 and then divide by 2 to + // calculate number of bytes. Although if it is even, then adding 1 will + // give us odd value which gives the same number of bytes after integer + // division by 2. + // So we always add 1 to Address-Length inside TP-DA + if ( KSmsCommandType == ( aTpdu[KMessageParamsIndex] & KCommandTypeMask ) ) + { + ret = KSmsCommandType; + TUint8 addressLength = aTpdu[KSmsCommandAddrIndex] + 1; + aTpda.Set( aTpdu.Mid( + KSmsCommandAddrIndex + KTpDaTonNpiIndex, + addressLength/2 + KTpDaTonNpiSize ) ); + } + else if ( KSmsSubmitType == ( aTpdu[KMessageParamsIndex] & KCommandTypeMask ) ) + { + ret = KSmsSubmitType; + TUint8 addressLength = aTpdu[KSmsSubmitAddrIndex] + 1; + aTpda.Set( aTpdu.Mid( + KSmsSubmitAddrIndex + KTpDaTonNpiIndex, + addressLength/2 + KTpDaTonNpiSize ) ); + } + // no else + + return ret; + } // End of File diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/src/satnotifications.cpp --- a/adaptationlayer/tsy/simatktsy_dll/src/satnotifications.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/src/satnotifications.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -29,7 +29,6 @@ #include // isi message #include // net server #include // gss server -#include // atk server #include // uicc server #include #include "OstTraceDefinitions.h" @@ -137,6 +136,9 @@ // Reconnection mode const TUint8 KReconnectionModeMask = 0x02; +const TInt KECircularRepeatIndicator = 0x01; +const TInt KESequentalRepeatIndicator = 0x03; + // LOCAL FUNCTION PROTOTYPES @@ -164,7 +166,7 @@ iTransId( KZero ), iReqHandle( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFICATIONSBASE_CSATNOTIFICATIONSBASE, "CSatNotificationsBase::CSatNotificationsBase" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFICATIONSBASE_CSATNOTIFICATIONSBASE_TD, "CSatNotificationsBase::CSatNotificationsBase" ); iCommandDetails.Zero(); // Following results are accepted by all commands @@ -181,7 +183,7 @@ // CSatNotificationsBase::~CSatNotificationsBase() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFICATIONSBASE_CSATNOTIFICATIONSBASE, "CSatNotificationsBase::~CSatNotificationsBase" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFICATIONSBASE_CSATNOTIFICATIONSBASE_TD, "CSatNotificationsBase::~CSatNotificationsBase" ); // None } @@ -196,7 +198,7 @@ const TTsyReqHandle aReqHandle // Request handle ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFICATIONSBASE_CANCELNOTIFICATION, "CSatNotificationsBase::CancelNotification" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFICATIONSBASE_CANCELNOTIFICATION_TD, "CSatNotificationsBase::CancelNotification" ); TFLOGSTRING("TSY: CSatNotificationsBase::CancelNotification"); // Check that the handle is valid @@ -226,7 +228,7 @@ TDes8* /* aRsp */ // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFICATIONSBASE_TERMINALRESPONSE, "CSatNotificationsBase::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFICATIONSBASE_TERMINALRESPONSE_TD, "CSatNotificationsBase::TerminalResponse" ); // Base class does not do anything return KErrNone; } @@ -239,7 +241,7 @@ // TDes8& CSatNotificationsBase::GetCmdDetails() { - OstTrace0( TRACE_NORMAL, CSATNOTIFICATIONSBASE_GETCMDDETAILS, "CSatNotificationsBase::GetCmdDetails" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFICATIONSBASE_GETCMDDETAILS_TD, "CSatNotificationsBase::GetCmdDetails" ); return iCommandDetails; } @@ -252,7 +254,7 @@ // TUint8 CSatNotificationsBase::GetTransactionId() { - OstTrace0( TRACE_NORMAL, CSATNOTIFICATIONSBASE_GETTRANSACTIONID, "CSatNotificationsBase::GetTransactionId" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFICATIONSBASE_GETTRANSACTIONID_TD, "CSatNotificationsBase::GetTransactionId" ); return iTransId; } @@ -264,7 +266,7 @@ // TTsyReqHandle CSatNotificationsBase::TsyReqHandle() { - OstTrace0( TRACE_NORMAL, CSATNOTIFICATIONSBASE_TSYREQHANDLE, "CSatNotificationsBase::TsyReqHandle" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFICATIONSBASE_TSYREQHANDLE_TD, "CSatNotificationsBase::TsyReqHandle" ); return iReqHandle; } @@ -279,7 +281,7 @@ const TInt aError // Possible error ) { - OstTraceExt2( TRACE_NORMAL, CSATNOTIFICATIONSBASE_COMPLETEREQUEST, "CSatNotificationsBase::CompleteRequest, Handle: %d, Error: %d", (TInt)iReqHandle, aError ); + OstTraceExt2( TRACE_NORMAL, CSATNOTIFICATIONSBASE_COMPLETEREQUEST_TD, "CSatNotificationsBase::CompleteRequest, Handle: %d, Error: %d", (TInt)iReqHandle, aError ); TFLOGSTRING3("CSatNotificationsBase::CompleteRequest. \n\t\t\t Handle:%d\n\t\t\t Error:%d", iReqHandle, aError); @@ -287,7 +289,7 @@ iReqHandle = NULL; iSatMessaging->ReqCompleted( tempReqHandle, aError ); TFLOGSTRING("CSatNotificationsBase::CompleteRequest. Request is now completed"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFICATIONSBASE_COMPLETEREQUEST, "CSatNotificationsBase::CompleteRequest. Request is now completed" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFICATIONSBASE_COMPLETEREQUEST_TD, "CSatNotificationsBase::CompleteRequest. Request is now completed" ); } // ----------------------------------------------------------------------------- @@ -477,7 +479,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iDisplayTextV2Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYDISPLAYTEXT_CSATNOTIFYDISPLAYTEXT, "CSatNotifyDisplayText::CSatNotifyDisplayText" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYDISPLAYTEXT_CSATNOTIFYDISPLAYTEXT_TD, "CSatNotifyDisplayText::CSatNotifyDisplayText" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -492,7 +494,7 @@ // CSatNotifyDisplayText::~CSatNotifyDisplayText() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYDISPLAYTEXT_CSATNOTIFYDISPLAYTEXT, "CSatNotifyDisplayText::~CSatNotifyDisplayText" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYDISPLAYTEXT_CSATNOTIFYDISPLAYTEXT_TD, "CSatNotifyDisplayText::~CSatNotifyDisplayText" ); // None } @@ -505,7 +507,7 @@ // void CSatNotifyDisplayText::MessageReceived( const TIsiReceiveC& aIsiMessage ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYDISPLAYTEXT_MESSAGERECEIVED, "CSatNotifyDisplayText::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYDISPLAYTEXT_MESSAGERECEIVED_TD, "CSatNotifyDisplayText::MessageReceived" ); TFLOGSTRING("TSY: CSatNotifyDisplayText::MessageReceived"); // Completion return value TInt ret( KErrNone ); @@ -526,7 +528,7 @@ if ( !iReqHandle ) { TFLOGSTRING("TSY: CSatNotifyDisplayText::MessageReceived - Request Off"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYDISPLAYTEXT_MESSAGERECEIVED, "CSatNotifyDisplayText::MessageReceived - Request Off" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYDISPLAYTEXT_MESSAGERECEIVED_TD, "CSatNotifyDisplayText::MessageReceived - Request Off" ); // Request not on, returning response immediately iSatMessHandler->DisplayTextTerminalResp( @@ -642,7 +644,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYDISPLAYTEXT_NOTIFY, "CSatNotifyDisplayText::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYDISPLAYTEXT_NOTIFY_TD, "CSatNotifyDisplayText::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("CSatNotifyDisplayText::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); iReqHandle = aReqHandle; @@ -662,7 +664,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYDISPLAYTEXT_TERMINALRESPONSE, "CSatNotifyDisplayText::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYDISPLAYTEXT_TERMINALRESPONSE_TD, "CSatNotifyDisplayText::TerminalResponse" ); TFLOGSTRING("CSatNotifyDisplayText::TerminalResponse"); // Completion return value TInt ret( KErrNone ); @@ -721,7 +723,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iGetInkeyV2Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYGETINKEY_CSATNOTIFYGETINKEY, "CSatNotifyGetInkey::CSatNotifyGetInkey" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYGETINKEY_CSATNOTIFYGETINKEY_TD, "CSatNotifyGetInkey::CSatNotifyGetInkey" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -737,7 +739,7 @@ // CSatNotifyGetInkey::~CSatNotifyGetInkey() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYGETINKEY_CSATNOTIFYGETINKEY, "CSatNotifyGetInkey::~CSatNotifyGetInkey" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYGETINKEY_CSATNOTIFYGETINKEY_TD, "CSatNotifyGetInkey::~CSatNotifyGetInkey" ); // None } @@ -753,7 +755,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYGETINKEY_MESSAGERECEIVED, "CSatNotifyGetInkey::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYGETINKEY_MESSAGERECEIVED_TD, "CSatNotifyGetInkey::MessageReceived" ); TFLOGSTRING( "TSY: CSatNotifyGetInkey::MessageReceived" ); // Completion return value @@ -892,7 +894,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYGETINKEY_NOTIFY, "CSatNotifyGetInkey::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYGETINKEY_NOTIFY_TD, "CSatNotifyGetInkey::Notify Handle: %u", aReqHandle ); TFLOGSTRING2( "TSY: CSatNotifyGetInkey::Notify. Handle: %d", aReqHandle ); iReqHandle = aReqHandle; @@ -913,7 +915,7 @@ TDes8* aRsp // Response packet from ETel ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYGETINKEY_TERMINALRESPONSE, "CSatNotifyGetInkey::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYGETINKEY_TERMINALRESPONSE_TD, "CSatNotifyGetInkey::TerminalResponse" ); TFLOGSTRING("TSY: CSatNotifyGetInkey::TerminalResponse" ); TInt ret( KErrNone ); @@ -1008,7 +1010,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iGetInputV1Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYGETINPUT_CSATNOTIFYGETINPUT, "CSatNotifyGetInput::CSatNotifyGetInput" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYGETINPUT_CSATNOTIFYGETINPUT_TD, "CSatNotifyGetInput::CSatNotifyGetInput" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -1024,7 +1026,7 @@ // CSatNotifyGetInput::~CSatNotifyGetInput() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYGETINPUT_CSATNOTIFYGETINPUT, "CSatNotifyGetInput::~CSatNotifyGetInput" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYGETINPUT_CSATNOTIFYGETINPUT_TD, "CSatNotifyGetInput::~CSatNotifyGetInput" ); // None } @@ -1040,7 +1042,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYGETINPUT_MESSAGERECEIVED, "CSatNotifyGetInput::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYGETINPUT_MESSAGERECEIVED_TD, "CSatNotifyGetInput::MessageReceived" ); TFLOGSTRING("CSatNotifyGetInput::MessageReceived"); TInt ret( KErrNone ); // Get ber tlv @@ -1151,7 +1153,7 @@ ret = KErrCorrupt; } TFLOGSTRING2("TSY: GetInput, text: %S", &getInputV1.iText ); - OstTraceExt1( TRACE_NORMAL, DUP1_CSATNOTIFYGETINPUT_MESSAGERECEIVED, "CSatNotifyGetInput::MessageReceived GetInput, text: %S", getInputV1.iText ); + OstTraceExt1( TRACE_NORMAL, DUP1_CSATNOTIFYGETINPUT_MESSAGERECEIVED_TD, "CSatNotifyGetInput::MessageReceived GetInput, text: %S", getInputV1.iText ); // Response length expected CTlv responseLength; @@ -1222,7 +1224,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYGETINPUT_NOTIFY, "CSatNotifyGetInput::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYGETINPUT_NOTIFY_TD, "CSatNotifyGetInput::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("CSatNotifyGetInput::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); iReqHandle = aReqHandle; @@ -1242,7 +1244,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYGETINPUT_TERMINALRESPONSE, "CSatNotifyGetInput::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYGETINPUT_TERMINALRESPONSE_TD, "CSatNotifyGetInput::TerminalResponse" ); TFLOGSTRING("CSatNotifyGetInput::TerminalResponse"); TInt ret( KErrNone ); TUint8 additionalInfo( 0 ); @@ -1317,7 +1319,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iPlayToneV2Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYPLAYTONE_CSATNOTIFYPLAYTONE, "CSatNotifyPlayTone::CSatNotifyPlayTone" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYPLAYTONE_CSATNOTIFYPLAYTONE_TD, "CSatNotifyPlayTone::CSatNotifyPlayTone" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -1331,7 +1333,7 @@ // CSatNotifyPlayTone::~CSatNotifyPlayTone() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYPLAYTONE_CSATNOTIFYPLAYTONE, "CSatNotifyPlayTone::~CSatNotifyPlayTone" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYPLAYTONE_CSATNOTIFYPLAYTONE_TD, "CSatNotifyPlayTone::~CSatNotifyPlayTone" ); // None } @@ -1347,7 +1349,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYPLAYTONE_MESSAGERECEIVED, "CSatNotifyPlayTone::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYPLAYTONE_MESSAGERECEIVED_TD, "CSatNotifyPlayTone::MessageReceived" ); TFLOGSTRING("CSatNotifyPlayTone::MessageReceived"); //get ber tlv CBerTlv berTlv; @@ -1439,7 +1441,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYPLAYTONE_NOTIFY, "CSatNotifyPlayTone::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYPLAYTONE_NOTIFY_TD, "CSatNotifyPlayTone::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("CSatNotifyPlayTone::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); @@ -1460,7 +1462,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYPLAYTONE_TERMINALRESPONSE, "CSatNotifyPlayTone::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYPLAYTONE_TERMINALRESPONSE_TD, "CSatNotifyPlayTone::TerminalResponse" ); TFLOGSTRING("CSatNotifyPlayTone::TerminalResponse"); TInt ret( KErrNone ); TUint8 additionalInfo( 0 ); @@ -1513,7 +1515,7 @@ : CSatNotificationsBase( aSatMessHandler, aSatMessaging ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYPOLLINTERVAL_CSATNOTIFYPOLLINTERVAL, "CSatNotifyPollInterval::CSatNotifyPollInterval" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYPOLLINTERVAL_CSATNOTIFYPOLLINTERVAL_TD, "CSatNotifyPollInterval::CSatNotifyPollInterval" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KErrorRequiredValuesMissing; @@ -1526,7 +1528,7 @@ // CSatNotifyPollInterval::~CSatNotifyPollInterval() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYPOLLINTERVAL_CSATNOTIFYPOLLINTERVAL, "CSatNotifyPollInterval::~CSatNotifyPollInterval" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYPOLLINTERVAL_CSATNOTIFYPOLLINTERVAL_TD, "CSatNotifyPollInterval::~CSatNotifyPollInterval" ); // None } @@ -1542,7 +1544,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYPOLLINTERVAL_MESSAGERECEIVED, "CSatNotifyPollInterval::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYPOLLINTERVAL_MESSAGERECEIVED_TD, "CSatNotifyPollInterval::MessageReceived" ); TFLOGSTRING("CSatNotifyPollInterval::MessageReceived"); //get ber tlv CBerTlv berTlv; @@ -1603,7 +1605,7 @@ { returnValue = KErrNotFound; TFLOGSTRING("TSY: CSatNotifyPollInterval::MessageReceived, Time unit did not match."); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYPOLLINTERVAL_MESSAGERECEIVED, "CSatNotifyPollInterval::MessageReceived, Time unit did not match." ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYPOLLINTERVAL_MESSAGERECEIVED_TD, "CSatNotifyPollInterval::MessageReceived, Time unit did not match." ); // Command data not understood iSatMessHandler->PollIntervalTerminalResp( iTransId, iCommandDetails, RSat::KCmdDataNotUnderstood, RSat::KNoSpecificMeProblem, 0); @@ -1621,13 +1623,13 @@ if ( iSatMessHandler->OldPollInterval() ) { TFLOGSTRING("TSY: CSatNotifyPollInterval::MessageReceived MaxPolInterval"); - OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYPOLLINTERVAL_MESSAGERECEIVED, "CSatNotifyPollInterval::MessageReceived MaxPolInterval" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYPOLLINTERVAL_MESSAGERECEIVED_TD, "CSatNotifyPollInterval::MessageReceived MaxPolInterval" ); anIntervalInSeconds = KMaxPollInterval; } else { TFLOGSTRING("TSY: CSatNotifyPollInterval::MessageReceived, DefaultPollInterval"); - OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYPOLLINTERVAL_MESSAGERECEIVED, "CSatNotifyPollInterval::MessageReceived, DefaultPollInterval" ); + OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYPOLLINTERVAL_MESSAGERECEIVED_TD, "CSatNotifyPollInterval::MessageReceived, DefaultPollInterval" ); // Use SIM server's default value (0) anIntervalInSeconds = KDefaultPollInterval; } @@ -1666,7 +1668,7 @@ TDes8* /*aDataPtr*/ // Pointer to data ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYPOLLINTERVAL_NOTIFY, "CSatNotifyPollInterval::Notify" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYPOLLINTERVAL_NOTIFY_TD, "CSatNotifyPollInterval::Notify" ); // PollInterval is completely implemented by SimAtkTsy. Client // insn't notified about the command. } @@ -1689,7 +1691,7 @@ iSatIsiMsg( NULL ), iItemsNextIndicatorRemoved( EFalse ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPMENU_CSATNOTIFYSETUPMENU, "CSatNotifySetUpMenu::CSatNotifySetUpMenu" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPMENU_CSATNOTIFYSETUPMENU_TD, "CSatNotifySetUpMenu::CSatNotifySetUpMenu" ); TFLOGSTRING("CSatNotifySetUpMenu::CSatNotifySetUpMenu"); iToolKitName.Zero(); @@ -1706,7 +1708,7 @@ // CSatNotifySetUpMenu::~CSatNotifySetUpMenu() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPMENU_CSATNOTIFYSETUPMENU, "CSatNotifySetUpMenu::~CSatNotifySetUpMenu" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPMENU_CSATNOTIFYSETUPMENU_TD, "CSatNotifySetUpMenu::~CSatNotifySetUpMenu" ); TFLOGSTRING("CSatNotifySetUpMenu::~CSatNotifySetUpMenu"); if ( iSatIsiMsg ) { @@ -1726,7 +1728,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPMENU_MESSAGERECEIVED, "CSatNotifySetUpMenu::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPMENU_MESSAGERECEIVED_TD, "CSatNotifySetUpMenu::MessageReceived" ); TFLOGSTRING("TSY:CSatNotifySetUpMenu::MessageReceived"); TInt ret( KErrNone ); TInt returnValue( KErrNone ); @@ -1756,13 +1758,13 @@ if ( iSatIsiMsg ) { TFLOGSTRING("TSY:CSatNotifySetUpMenu::MessageReceived, pcmd saved"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPMENU_MESSAGERECEIVED, "CSatNotifySetUpMenu::MessageReceived, pcmd saved" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPMENU_MESSAGERECEIVED_TD, "CSatNotifySetUpMenu::MessageReceived, pcmd saved" ); } else { TFLOGSTRING("TSY:CSatNotifySetUpMenu::MessageReceived, \ out of memory unable to buffer received cmd"); - OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYSETUPMENU_MESSAGERECEIVED, "CSatNotifySetUpMenu::MessageReceived, out of memory unable to buffer received cmd" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYSETUPMENU_MESSAGERECEIVED_TD, "CSatNotifySetUpMenu::MessageReceived, out of memory unable to buffer received cmd" ); iSatMessHandler->SetUpMenuTerminalResp( iTransId, iCommandDetails, RSat::KMeUnableToProcessCmd, @@ -1804,7 +1806,7 @@ { TUint16 alphaIdLength = alphaIdentifier.GetLength(); TFLOGSTRING2("TSY: Alpha ID length:%d", alphaIdLength ); - OstTraceExt1( TRACE_NORMAL, DUP3_CSATNOTIFYSETUPMENU_MESSAGERECEIVED, "CSatNotifySetUpMenu::MessageReceived Alpha ID: %hu", alphaIdLength ); + OstTraceExt1( TRACE_NORMAL, DUP3_CSATNOTIFYSETUPMENU_MESSAGERECEIVED_TD, "CSatNotifySetUpMenu::MessageReceived Alpha ID: %hu", alphaIdLength ); if ( alphaIdLength > RSat::KAlphaIdMaxSize ) { // String too long @@ -1821,13 +1823,13 @@ iToolKitName.Copy( menu.iAlphaId.iAlphaId ); TFLOGSTRING2("TSY: SetUpMenu iToolKitName:%S", &iToolKitName ); - OstTraceExt1( TRACE_NORMAL, DUP4_CSATNOTIFYSETUPMENU_MESSAGERECEIVED, "CSatNotifySetUpMenu::MessageReceived SetUpMenu iToolKitName: %S", iToolKitName ); + OstTraceExt1( TRACE_NORMAL, DUP4_CSATNOTIFYSETUPMENU_MESSAGERECEIVED_TD, "CSatNotifySetUpMenu::MessageReceived SetUpMenu iToolKitName: %S", iToolKitName ); } else { TFLOGSTRING("TSY: CSatNotifySetUpMenu::MessageReceived,\ Wrong length of alpha id."); - OstTrace0( TRACE_NORMAL, DUP5_CSATNOTIFYSETUPMENU_MESSAGERECEIVED, "CSatNotifySetUpMenu::MessageReceived, Wrong length of alpha id." ); + OstTrace0( TRACE_NORMAL, DUP5_CSATNOTIFYSETUPMENU_MESSAGERECEIVED_TD, "CSatNotifySetUpMenu::MessageReceived, Wrong length of alpha id." ); } // Alpha Id status if ( menu.iAlphaId.iAlphaId.Length() ) @@ -1882,7 +1884,7 @@ { TFLOGSTRING("TSY: CSatNotifySetUpMenu::MessageReceived, \ Wrong return value of icon identifier list."); - OstTrace0( TRACE_NORMAL, DUP6_CSATNOTIFYSETUPMENU_MESSAGERECEIVED, "CSatNotifySetUpMenu::MessageReceived, Wrong return value of icon identifier list." ); + OstTrace0( TRACE_NORMAL, DUP6_CSATNOTIFYSETUPMENU_MESSAGERECEIVED_TD, "CSatNotifySetUpMenu::MessageReceived, Wrong return value of icon identifier list." ); } //Items Data @@ -1940,7 +1942,7 @@ // Suffle through all the menu items stringLength = 0; TFLOGSTRING2("TSY: item number:%d", i ); - OstTraceExt1( TRACE_NORMAL, DUP7_CSATNOTIFYSETUPMENU_MESSAGERECEIVED, "CSatNotifySetUpMenu::MessageReceived Item number: %hhd", i ); + OstTraceExt1( TRACE_NORMAL, DUP7_CSATNOTIFYSETUPMENU_MESSAGERECEIVED_TD, "CSatNotifySetUpMenu::MessageReceived Item number: %hhd", i ); // Fill the newitem newItem.iItemId = itemsData.GetShortInfo( ETLV_IdentifierOfItem ); stringLength = itemsData.GetLength(); @@ -1962,7 +1964,7 @@ } TFLOGSTRING2("TSY: SetUpMenu newItem.iItemString:%S", &newItem.iItemString ); - OstTraceExt1( TRACE_NORMAL, DUP8_CSATNOTIFYSETUPMENU_MESSAGERECEIVED, "CSatNotifySetUpMenu::MessageReceived, newItem.iItemString: %S", newItem.iItemString ); + OstTraceExt1( TRACE_NORMAL, DUP8_CSATNOTIFYSETUPMENU_MESSAGERECEIVED_TD, "CSatNotifySetUpMenu::MessageReceived, newItem.iItemString: %S", newItem.iItemString ); // Adding the new menuitem if( NULL != iconIdList.Size() && ( i < iconIdList.Length() ) ) { @@ -2050,7 +2052,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYSETUPMENU_NOTIFY, "CSatNotifySetUpMenu::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYSETUPMENU_NOTIFY_TD, "CSatNotifySetUpMenu::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("CSatNotifySetUpMenu::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); TInt ret( KErrNone ); @@ -2080,7 +2082,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPMENU_TERMINALRESPONSE, "CSatNotifySetUpMenu::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPMENU_TERMINALRESPONSE_TD, "CSatNotifySetUpMenu::TerminalResponse" ); TFLOGSTRING("CSatNotifySetUpMenu::TerminalResponse"); TInt ret( KErrNone ); TUint8 additionalInfo( 0 ); @@ -2112,7 +2114,7 @@ if( RSat::KSuccess == rspV1.iGeneralResult && iItemsNextIndicatorRemoved ) { TFLOGSTRING("CSatNotifySetUpMenu::TerminalResponseL, iItemsNextIndicatorRemoved"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPMENU_TERMINALRESPONSE, "CSatNotifySetUpMenu::TerminalResponseL, iItemsNextIndicatorRemoved" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPMENU_TERMINALRESPONSE_TD, "CSatNotifySetUpMenu::TerminalResponseL, iItemsNextIndicatorRemoved" ); rspV1.iGeneralResult = RSat::KPartialComprehension; } iItemsNextIndicatorRemoved = EFalse; @@ -2134,7 +2136,7 @@ // TDes16& CSatNotifySetUpMenu::SatApplicationName() { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPMENU_SATAPPLICATIONNAME, "CSatNotifySetUpMenu::SatApplicationName" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPMENU_SATAPPLICATIONNAME_TD, "CSatNotifySetUpMenu::SatApplicationName" ); if ( 0x0 == iToolKitName.Length() ) { // Default toolkit name @@ -2160,7 +2162,7 @@ iSelectItemV2Pckg( NULL ), iItemNextIndicatorRemoved( EFalse ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSELECTITEM_CSATNOTIFYSELECTITEM, "CSatNotifySelectItem::CSatNotifySelectItem" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSELECTITEM_CSATNOTIFYSELECTITEM_TD, "CSatNotifySelectItem::CSatNotifySelectItem" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -2176,7 +2178,7 @@ // CSatNotifySelectItem::~CSatNotifySelectItem() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSELECTITEM_CSATNOTIFYSELECTITEM, "CSatNotifySelectItem::~CSatNotifySelectItem" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSELECTITEM_CSATNOTIFYSELECTITEM_TD, "CSatNotifySelectItem::~CSatNotifySelectItem" ); // None } @@ -2192,7 +2194,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSELECTITEM_MESSAGERECEIVED, "CSatNotifySelectItem::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSELECTITEM_MESSAGERECEIVED_TD, "CSatNotifySelectItem::MessageReceived" ); TFLOGSTRING("CSatNotifySelectItem::MessageReceived"); TInt ret( KErrNone ); // Get ber tlv @@ -2292,7 +2294,7 @@ { TFLOGSTRING("TSY: CSatNotifySelectItem::MessageReceived, \ Presentation type was not set."); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSELECTITEM_MESSAGERECEIVED, "CSatNotifySelectItem::MessageReceived, Presentation type was not set" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSELECTITEM_MESSAGERECEIVED_TD, "CSatNotifySelectItem::MessageReceived, Presentation type was not set" ); selectItemV2.iPresentationType = RSat::ENotSpecified; } @@ -2359,7 +2361,7 @@ { TFLOGSTRING("TSY: CSatNotifySelectItem::MessageReceived, \ Return value not valid."); - OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYSELECTITEM_MESSAGERECEIVED, "CSatNotifySelectItem::MessageReceived, Return value not valid." ); + OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYSELECTITEM_MESSAGERECEIVED_TD, "CSatNotifySelectItem::MessageReceived, Return value not valid." ); } @@ -2513,7 +2515,7 @@ { TFLOGSTRING("TSY: CSatNotifySelectItem::MessageReceived,\ Item with icon not valid."); - OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYSELECTITEM_MESSAGERECEIVED, "CSatNotifySelectItem::MessageReceived, Item with icon not valid." ); + OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYSELECTITEM_MESSAGERECEIVED_TD, "CSatNotifySelectItem::MessageReceived, Item with icon not valid." ); } } else @@ -2570,7 +2572,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYSELECTITEM_NOTIFY, "CSatNotifySelectItem::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYSELECTITEM_NOTIFY_TD, "CSatNotifySelectItem::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("CSatNotifySelectItem::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); iReqHandle = aReqHandle; @@ -2590,7 +2592,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSELECTITEM_TERMINALRESPONSE, "CSatNotifySelectItem::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSELECTITEM_TERMINALRESPONSE_TD, "CSatNotifySelectItem::TerminalResponse" ); TFLOGSTRING("CSatNotifySelectItem::TerminalResponse"); TInt ret( KErrNone ); TUint8 additionalInfo( 0 ); @@ -2627,7 +2629,7 @@ if( RSat::KSuccess == rspV1.iGeneralResult && iItemNextIndicatorRemoved ) { TFLOGSTRING("CSatNotifySelectItem::TerminalResponseL, iItemNextIndicatorRemoved"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSELECTITEM_TERMINALRESPONSE, "CSatNotifySelectItem::TerminalResponse, iItemNextIndicatorRemoved" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSELECTITEM_TERMINALRESPONSE_TD, "CSatNotifySelectItem::TerminalResponse, iItemNextIndicatorRemoved" ); rspV1.iGeneralResult = RSat::KPartialComprehension; } @@ -2659,7 +2661,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iSendSmV1Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSM_CSATNOTIFYSENDSM, "CSatNotifySendSm::CSatNotifySendSm" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSM_CSATNOTIFYSENDSM_TD, "CSatNotifySendSm::CSatNotifySendSm" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -2675,7 +2677,7 @@ // CSatNotifySendSm::~CSatNotifySendSm() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDSM_CSATNOTIFYSENDSM, "CSatNotifySendSm::~CSatNotifySendSm" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDSM_CSATNOTIFYSENDSM_TD, "CSatNotifySendSm::~CSatNotifySendSm" ); // None } @@ -2691,7 +2693,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSM_MESSAGERECEIVED, "CSatNotifySendSm::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSM_MESSAGERECEIVED_TD, "CSatNotifySendSm::MessageReceived" ); TFLOGSTRING("CSatNotifySendSm::MessageReceived"); TInt ret( KErrNone ); // Get ber tlv @@ -2852,7 +2854,7 @@ TFLOGSTRING2("TSY:SendSm, SCA number: %S", &sendSmV1.iAddress.iTelNumber ); - OstTraceExt1( TRACE_NORMAL, DUP1_CSATNOTIFYSENDSM_MESSAGERECEIVED, "CSatNotifySendSm::MessageReceived SCA number: %S", sendSmV1.iAddress.iTelNumber ); + OstTraceExt1( TRACE_NORMAL, DUP1_CSATNOTIFYSENDSM_MESSAGERECEIVED_TD, "CSatNotifySendSm::MessageReceived SCA number: %S", sendSmV1.iAddress.iTelNumber ); } else { @@ -2894,7 +2896,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYSENDSM_NOTIFY, "CSatNotifySendSm::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYSENDSM_NOTIFY_TD, "CSatNotifySendSm::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("CSatNotifySendSm::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); iReqHandle = aReqHandle; @@ -2914,7 +2916,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSM_TERMINALRESPONSE, "CSatNotifySendSm::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSM_TERMINALRESPONSE_TD, "CSatNotifySendSm::TerminalResponse" ); TFLOGSTRING("CSatNotifySendSm::TerminalResponse"); TInt ret( KErrNone ); TUint8 additionalInfo( 0 ); @@ -2966,7 +2968,7 @@ TPtrC8 aTpdu // Tpdu where to read TP-UDL or TP-CDL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSM_GETTPUDLINDEX, "CSatNotifySendSm::GetTpUdlIndex" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSM_GETTPUDLINDEX_TD, "CSatNotifySendSm::GetTpUdlIndex" ); TFLOGSTRING("CSatNotifySendSm::GetTpUdlIndex"); // Position on TP-UDL/TP-CDL field in SMS TPDU @@ -3048,7 +3050,7 @@ TPtrC8 aTpdu // Tpdu ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSM_GETTPDCSINDEX, "CSatNotifySendSm::GetTpDcsIndex" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSM_GETTPDCSINDEX_TD, "CSatNotifySendSm::GetTpDcsIndex" ); TFLOGSTRING("CSatNotifySendSm::GetTpDcsIndex"); // Position of TP-DCS field in SMS TPDU @@ -3081,7 +3083,7 @@ TPtrC8 aTpdu // TPDU ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSM_CHECKTPDU, "CSatNotifySendSm::CheckTpdu" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSM_CHECKTPDU_TD, "CSatNotifySendSm::CheckTpdu" ); TFLOGSTRING("CSatNotifySendSm::CheckTpdu"); TInt ret( KErrNone ); TUint8 tpUdlPos( 0 ); // UDL position @@ -3092,7 +3094,7 @@ if ( KMinSmsTpduLength > lengthOfTPDU ) { TFLOGSTRING("CSatNotifySendSm::CheckTpdu, error: invalid TPDU length"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDSM_CHECKTPDU, "CSatNotifySendSm::CheckTpdu, error: invalid TPDU length" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDSM_CHECKTPDU_TD, "CSatNotifySendSm::CheckTpdu, error: invalid TPDU length" ); ret = KErrCorrupt; } else @@ -3108,7 +3110,7 @@ else { TFLOGSTRING("CSatNotifySendSm::CheckTpdu, error: invalid UDL index"); - OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYSENDSM_CHECKTPDU, "CSatNotifySendSm::CheckTpdu, error: invalid UDL index" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYSENDSM_CHECKTPDU_TD, "CSatNotifySendSm::CheckTpdu, error: invalid UDL index" ); ret = KErrCorrupt; } } @@ -3142,7 +3144,7 @@ { // Message is over 160 bytes or invalid user data length TFLOGSTRING("CSatNotifySendSm::CheckTpdu, error: invalid user data length"); - OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYSENDSM_CHECKTPDU, "CSatNotifySendSm::CheckTpdu, error: invalid user data length" ); + OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYSENDSM_CHECKTPDU_TD, "CSatNotifySendSm::CheckTpdu, error: invalid user data length" ); ret = KErrCorrupt; } } @@ -3153,7 +3155,7 @@ { // Message size is over the limit or invalid user data length TFLOGSTRING("CSatNotifySendSm::CheckTpdu, error: invalid user data length"); - OstTrace0( TRACE_NORMAL, DUP4_CSATNOTIFYSENDSM_CHECKTPDU, "CSatNotifySendSm::CheckTpdu, error: invalid user data length" ); + OstTrace0( TRACE_NORMAL, DUP4_CSATNOTIFYSENDSM_CHECKTPDU_TD, "CSatNotifySendSm::CheckTpdu, error: invalid user data length" ); ret = KErrCorrupt; } } @@ -3163,7 +3165,7 @@ if ( KSMSCommandMaxSize < tpUdl ) { TFLOGSTRING("CSatNotifySendSm::CheckTpdu, error: user data length over maximum"); - OstTrace0( TRACE_NORMAL, DUP5_CSATNOTIFYSENDSM_CHECKTPDU, "CSatNotifySendSm::CheckTpdu, error: user data length over maximum" ); + OstTrace0( TRACE_NORMAL, DUP5_CSATNOTIFYSENDSM_CHECKTPDU_TD, "CSatNotifySendSm::CheckTpdu, error: user data length over maximum" ); ret = KErrCorrupt; } } @@ -3183,7 +3185,7 @@ TTpdu& aSendSm // Where to store packed sms ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSM_PACKSMS, "CSatNotifySendSm::PackSms" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSM_PACKSMS_TD, "CSatNotifySendSm::PackSms" ); TFLOGSTRING("CSatNotifySendSm::PackSms"); TInt ret( KErrNone ); @@ -3366,7 +3368,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iSendDtmfV1Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDDTMF_CSATNOTIFYSENDDTMF, "CSatNotifySendDtmf::CSatNotifySendDtmf" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDDTMF_CSATNOTIFYSENDDTMF_TD, "CSatNotifySendDtmf::CSatNotifySendDtmf" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -3380,7 +3382,7 @@ // CSatNotifySendDtmf::~CSatNotifySendDtmf() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDDTMF_CSATNOTIFYSENDDTMF, "CSatNotifySendDtmf::~CSatNotifySendDtmf" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDDTMF_CSATNOTIFYSENDDTMF_TD, "CSatNotifySendDtmf::~CSatNotifySendDtmf" ); // None } @@ -3396,7 +3398,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDDTMF_MESSAGERECEIVED, "CSatNotifySendDtmf::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDDTMF_MESSAGERECEIVED_TD, "CSatNotifySendDtmf::MessageReceived" ); TFLOGSTRING("CSatNotifySendDtmf::MessageReceived"); // get ber tlv CBerTlv berTlv; @@ -3532,7 +3534,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYSENDDTMF_NOTIFY, "CSatNotifySendDtmf::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYSENDDTMF_NOTIFY_TD, "CSatNotifySendDtmf::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("CSatNotifySendDtmf::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); iReqHandle = aReqHandle; @@ -3552,7 +3554,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDDTMF_TERMINALRESPONSE, "CSatNotifySendDtmf::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDDTMF_TERMINALRESPONSE_TD, "CSatNotifySendDtmf::TerminalResponse" ); TFLOGSTRING("CSatNotifySendDtmf::TerminalResponse"); TInt ret( KErrNone ); TUint8 additionalInfo( 0 ); @@ -3606,7 +3608,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iSendSsV1Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSS_CSATNOTIFYSENDSS, "CSatNotifySendSs::CSatNotifySendSs" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSS_CSATNOTIFYSENDSS_TD, "CSatNotifySendSs::CSatNotifySendSs" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -3624,7 +3626,7 @@ // CSatNotifySendSs::~CSatNotifySendSs() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDSS_CSATNOTIFYSENDSS, "CSatNotifySendSs::~CSatNotifySendSs" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDSS_CSATNOTIFYSENDSS_TD, "CSatNotifySendSs::~CSatNotifySendSs" ); // None } @@ -3640,7 +3642,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSS_MESSAGERECEIVED, "CSatNotifySendSs::MessageReceived" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYSENDSS_MESSAGERECEIVED_TD, "CSatNotifySendSs::MessageReceived" ); TFLOGSTRING("CSatNotifySendSs::MessageReceived"); TInt ret( KErrNone ); // Get ber tlv @@ -3779,15 +3781,20 @@ if ( KErrNone == ret ) { TFLOGSTRING("TSY: Inform NokiaTSY SS request being SAT originated, resource control needed"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDSS_MESSAGERECEIVED, "Inform NokiaTSY SS request being SAT originated, resource control needed" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDSS_MESSAGERECEIVED_TD, "Inform NokiaTSY SS request being SAT originated, resource control needed" ); TBool resourceControlSuppress( EFalse ); CMmDataPackage dataPackage; dataPackage.PackData( &resourceControlSuppress ); - iSatMessaging->GetMessageRouter()->ExtFuncL( + TRAP( ret, ret = iSatMessaging->GetMessageRouter()->ExtFuncL( ESatNotifySendSsPCmd, - &dataPackage ); + &dataPackage ) ); + if ( KErrNone != ret ) + { +TFLOGSTRING2("TSY: CSatNotifySendSs::MessageReceived: ExtFuncL for ESatNotifySendSsPCmd failed: %d", ret ); +OstTrace1( TRACE_NORMAL, DUP3_CSATNOTIFYSENDSS_MESSAGERECEIVED_TD, "CSatNotifySendSs::MessageReceived: ExtFuncL for ESatNotifySendSsPCmd failed: %d", ret ); + } } #endif } @@ -3806,7 +3813,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYSENDSS_NOTIFY, "CSatNotifySendSs::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYSENDSS_NOTIFY_TD, "CSatNotifySendSs::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("CSatNotifySendSs::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); iReqHandle = aReqHandle; @@ -3826,7 +3833,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSS_TERMINALRESPONSE, "CSatNotifySendSs::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSS_TERMINALRESPONSE_TD, "CSatNotifySendSs::TerminalResponse" ); TFLOGSTRING("CSatNotifySendSs::TerminalResponse"); TInt ret( KErrNone ); @@ -3899,7 +3906,7 @@ RSat::TSsString& aSsString // where to store modified string ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSS_CHECKCALLFORWARDING, "CSatNotifySendSs::CheckCallForwarding" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSS_CHECKCALLFORWARDING_TD, "CSatNotifySendSs::CheckCallForwarding" ); TFLOGSTRING("CSatNotifySendSs::CheckCallForwarding"); _LIT8(KCFU,"*21*"); // Call forwarding unconditional (CFU) _LIT8(KCFB,"*67*"); // Call forwarding on Mobile Subscriber Busy(CFB) @@ -3943,7 +3950,7 @@ TPtrC8 aSsString ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY, "CSatNotifySendSs::CheckSsStringValidity" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDSS_CHECKSSSTRINGVALIDITY_TD, "CSatNotifySendSs::CheckSsStringValidity" ); TFLOGSTRING("CSatNotifySendSs::CheckSsStringValidity"); TInt ret( KErrNone ); if ( !aSsString.Length() ) @@ -3981,7 +3988,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iSendUssdV1Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDUSSD_CSATNOTIFYSENDUSSD, "CSatNotifySendUssd::CSatNotifySendUssd" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDUSSD_CSATNOTIFYSENDUSSD_TD, "CSatNotifySendUssd::CSatNotifySendUssd" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -3999,7 +4006,7 @@ // CSatNotifySendUssd::~CSatNotifySendUssd() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDUSSD_CSATNOTIFYSENDUSSD, "CSatNotifySendUssd::~CSatNotifySendUssd" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDUSSD_CSATNOTIFYSENDUSSD_TD, "CSatNotifySendUssd::~CSatNotifySendUssd" ); // None } @@ -4015,7 +4022,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDUSSD_MESSAGERECEIVED, "CSatNotifySendUssd::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDUSSD_MESSAGERECEIVED_TD, "CSatNotifySendUssd::MessageReceived" ); TFLOGSTRING("TSY:CSatNotifySendUssd::MessageReceived"); TInt ret( KErrNone ); TInt returnValue( KErrNone ); @@ -4120,7 +4127,7 @@ // The Ussd text string is too long. TFLOGSTRING("TSY:CSatNotifySendUssd::MessageReceived, \ USSD String too long"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDUSSD_MESSAGERECEIVED, "CSatNotifySendUssd::MessageReceived, USSD String too long" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDUSSD_MESSAGERECEIVED_TD, "CSatNotifySendUssd::MessageReceived, USSD String too long" ); ret = KErrCorrupt; TUint8 noCause( 0 ); TBuf<1> emptyTextString; @@ -4161,7 +4168,7 @@ { TFLOGSTRING("TSY:CSatNotifySendUssd::MessageReceived, \ USSD DCS has a reserved value"); - OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYSENDUSSD_MESSAGERECEIVED, "CSatNotifySendUssd::MessageReceived, USSD DCS has a reserved value" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYSENDUSSD_MESSAGERECEIVED_TD, "CSatNotifySendUssd::MessageReceived, USSD DCS has a reserved value" ); // the DCS has a reserved value ret = KErrCorrupt; TUint8 noCause( 0 ); @@ -4182,7 +4189,7 @@ { TFLOGSTRING("TSY:CSatNotifySendUssd::MessageReceived, \ Mandatory field missing"); - OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYSENDUSSD_MESSAGERECEIVED, "CSatNotifySendUssd::MessageReceived, Mandatory field missing" ); + OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYSENDUSSD_MESSAGERECEIVED_TD, "CSatNotifySendUssd::MessageReceived, Mandatory field missing" ); // Mandatory field missing ret = KErrCorrupt; TUint8 noCause( 0 ); @@ -4218,7 +4225,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYSENDUSSD_NOTIFY, "CSatNotifySendUssd::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYSENDUSSD_NOTIFY_TD, "CSatNotifySendUssd::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("TSY:CSatNotifySendUssd::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); iReqHandle = aReqHandle; @@ -4238,7 +4245,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDUSSD_TERMINALRESPONSE, "CSatNotifySendUssd::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDUSSD_TERMINALRESPONSE_TD, "CSatNotifySendUssd::TerminalResponse" ); TFLOGSTRING("TSY:CSatNotifySendUssd::TerminalResponse"); TInt ret( KErrNone ); RSat::TSendUssdRspV1Pckg* aRspPckg = @@ -4264,7 +4271,7 @@ // No info TFLOGSTRING("TSY:CSatNotifySendUssd::TerminalResponse, \ AdditionalInfoType set, but no additional info available"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDUSSD_TERMINALRESPONSE, "CSatNotifySendUssd::TerminalResponse, AdditionalInfoType set, but no additional info available" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDUSSD_TERMINALRESPONSE_TD, "CSatNotifySendUssd::TerminalResponse, AdditionalInfoType set, but no additional info available" ); ret = KErrCorrupt; } else if ( RSat::KTextString == rspV1.iInfoType ) @@ -4277,7 +4284,7 @@ // sent by the network. TFLOGSTRING("TSY:CSatNotifySendUssd::TerminalResponse, \ AdditionalInfoType set to TextString."); - OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYSENDUSSD_TERMINALRESPONSE, "CSatNotifySendUssd::TerminalResponse, AdditionalInfoType set to TextString." ); + OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYSENDUSSD_TERMINALRESPONSE_TD, "CSatNotifySendUssd::TerminalResponse, AdditionalInfoType set to TextString." ); } else { @@ -4316,7 +4323,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iSetUpCallV1Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPCALL_CSATNOTIFYSETUPCALL, "CSatNotifySetUpCall::CSatNotifySetUpCall" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPCALL_CSATNOTIFYSETUPCALL_TD, "CSatNotifySetUpCall::CSatNotifySetUpCall" ); TFLOGSTRING( "TSY:CSatNotifySetUpCall::CSatNotifySetUpCall" ); iCallConnectedEvent.Zero(); @@ -4339,7 +4346,7 @@ // CSatNotifySetUpCall::~CSatNotifySetUpCall() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPCALL_CSATNOTIFYSETUPCALL, "CSatNotifySetUpCall::~CSatNotifySetUpCall" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPCALL_CSATNOTIFYSETUPCALL_TD, "CSatNotifySetUpCall::~CSatNotifySetUpCall" ); // None } @@ -4355,7 +4362,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPCALL_MESSAGERECEIVED, "CSatNotifySetUpCall::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPCALL_MESSAGERECEIVED_TD, "CSatNotifySetUpCall::MessageReceived" ); TFLOGSTRING("CSatNotifySetUpCall::MessageReceived"); TInt ret( KErrNone ); TInt returnValue( KErrNone ); @@ -4559,7 +4566,7 @@ setUpCallV1.iAddress.iTelNumber.Copy( tempNumber ); TFLOGSTRING2("TSY: SetUpCall, TelNumber: %S", &setUpCallV1.iAddress.iTelNumber ); - OstTraceExt1( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPCALL_MESSAGERECEIVED, "CSatNotifySetUpCall::MessageReceived TelNumber: %S", setUpCallV1.iAddress.iTelNumber ); + OstTraceExt1( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPCALL_MESSAGERECEIVED_TD, "CSatNotifySetUpCall::MessageReceived TelNumber: %S", setUpCallV1.iAddress.iTelNumber ); } } else @@ -4593,7 +4600,7 @@ || subAddress.GetComprehensionRequired() ) { TFLOGSTRING("TSY: SetUpCall, SubAddress is not supported!" ); - OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYSETUPCALL_MESSAGERECEIVED, "SetUpCall, SubAddress is not supported!" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYSETUPCALL_MESSAGERECEIVED_TD, "SetUpCall, SubAddress is not supported!" ); iSatMessHandler->SetUpCallTerminalResp( iTransId, iCommandDetails, RSat::KCmdBeyondMeCapabilities, @@ -4629,7 +4636,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPCALL_NOTIFY, "CSatNotifySetUpCall::Notify" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPCALL_NOTIFY_TD, "CSatNotifySetUpCall::Notify" ); TFLOGSTRING("CSatNotifySetUpCall::Notify"); iReqHandle = aReqHandle; iSetUpCallV1Pckg = static_cast< RSat::TSetUpCallV1Pckg* >( aDataPtr ); @@ -4648,7 +4655,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPCALL_TERMINALRESPONSE, "CSatNotifySetUpCall::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPCALL_TERMINALRESPONSE_TD, "CSatNotifySetUpCall::TerminalResponse" ); TFLOGSTRING("CSatNotifySetUpCall::TerminalResponse"); TInt ret( KErrNone ); TUint8 additionalInfo( 0 ); @@ -4715,7 +4722,7 @@ const TDesC8& aEnvelope // envelope received from CSatEventDownload ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPCALL_STORECALLCONNECTEDEVENT, "CSatNotifySetUpCall::StoreCallConnectedEvent" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPCALL_STORECALLCONNECTEDEVENT_TD, "CSatNotifySetUpCall::StoreCallConnectedEvent" ); // store it to the buffer iCallConnectedEvent = aEnvelope; } @@ -4739,7 +4746,7 @@ iReqHandleRefreshRequired( NULL ), iInternalCache( KZero ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_CSATNOTIFYREFRESH, "CSatNotifyRefresh::CSatNotifyRefresh" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_CSATNOTIFYREFRESH_TD, "CSatNotifyRefresh::CSatNotifyRefresh" ); iFileList.Zero(); iAid.Zero(); @@ -4756,7 +4763,7 @@ // CSatNotifyRefresh::~CSatNotifyRefresh() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYREFRESH_CSATNOTIFYREFRESH, "CSatNotifyRefresh::~CSatNotifyRefresh" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYREFRESH_CSATNOTIFYREFRESH_TD, "CSatNotifyRefresh::~CSatNotifyRefresh" ); // None } @@ -4772,7 +4779,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_MESSAGERECEIVED, "CSatNotifyRefresh::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_MESSAGERECEIVED_TD, "CSatNotifyRefresh::MessageReceived" ); TFLOGSTRING("TSY: CSatNotifyRefresh::MessageReceived"); // Get ber tlv CBerTlv berTlv; @@ -4788,7 +4795,7 @@ { TFLOGSTRING3("TSY: CSatNotifyRefresh::MessageReceived, iReqHandle:%d,\ iReqHandleRefreshRequired:%d ", iReqHandle, iReqHandleRefreshRequired ); - OstTraceExt2( TRACE_NORMAL, DUP1_CSATNOTIFYREFRESH_MESSAGERECEIVED, "CSatNotifyRefresh::MessageReceived iReqHandle: %u, iReqHandleRefreshRequired: %u", iReqHandle, iReqHandleRefreshRequired ); + OstTraceExt2( TRACE_NORMAL, DUP1_CSATNOTIFYREFRESH_MESSAGERECEIVED_TD, "CSatNotifyRefresh::MessageReceived iReqHandle: %u, iReqHandleRefreshRequired: %u", iReqHandle, iReqHandleRefreshRequired ); // Some of the request were not on, returning response immediately iSatMessHandler->RefreshTerminalResp( @@ -4873,7 +4880,7 @@ { TFLOGSTRING("TSY: CSatNotifyRefresh::MessageReceived, \ Return value of file list TLV not valid."); - OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYREFRESH_MESSAGERECEIVED, "CSatNotifyRefresh::MessageReceived, Return value of file list TLV not valid." ); + OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYREFRESH_MESSAGERECEIVED_TD, "CSatNotifyRefresh::MessageReceived, Return value of file list TLV not valid." ); } if ( KErrNone == ret ) { @@ -4884,7 +4891,7 @@ { TFLOGSTRING("TSY: SAT, Refresh mode: Sim init and \ full file change notification"); - OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYREFRESH_MESSAGERECEIVED, "CSatNotifyRefresh::MessageReceived, Refresh mode: Sim init and full file change notification" ); + OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYREFRESH_MESSAGERECEIVED_TD, "CSatNotifyRefresh::MessageReceived, Refresh mode: Sim init and full file change notification" ); refreshV2.iType = RSat::ESimInitFullFileChangeNotification; iInternalCache = KCacheEFSST + KCacheEFCBMID; break; @@ -4896,8 +4903,8 @@ TFLOGSTRING2("TSY: Number of files: %d", refreshV2.iFileList.Length() ); - OstTrace0( TRACE_NORMAL, DUP4_CSATNOTIFYREFRESH_MESSAGERECEIVED, "CSatNotifyRefresh::MessageReceived, Refresh mode: File Change Notification" ); - OstTrace1( TRACE_NORMAL, DUP5_CSATNOTIFYREFRESH_MESSAGERECEIVED, "CSatNotifyRefresh::MessageReceived, Number of files: %d", refreshV2.iFileList.Length() ); + OstTrace0( TRACE_NORMAL, DUP4_CSATNOTIFYREFRESH_MESSAGERECEIVED_TD, "CSatNotifyRefresh::MessageReceived, Refresh mode: File Change Notification" ); + OstTrace1( TRACE_NORMAL, DUP5_CSATNOTIFYREFRESH_MESSAGERECEIVED_TD, "CSatNotifyRefresh::MessageReceived, Number of files: %d", refreshV2.iFileList.Length() ); refreshV2.iType = RSat::EFileChangeNotification; if ( KErrNotFound != @@ -4923,8 +4930,8 @@ TFLOGSTRING2("TSY: Number of files: %d", refreshV2.iFileList.Length() ); - OstTrace0( TRACE_NORMAL, DUP6_CSATNOTIFYREFRESH_MESSAGERECEIVED, "CSatNotifyRefresh::MessageReceived, Refresh mode: Sim init and file change notification" ); - OstTrace1( TRACE_NORMAL, DUP7_CSATNOTIFYREFRESH_MESSAGERECEIVED, "CSatNotifyRefresh::MessageReceived, Number of files: %d", refreshV2.iFileList.Length() ); + OstTrace0( TRACE_NORMAL, DUP6_CSATNOTIFYREFRESH_MESSAGERECEIVED_TD, "CSatNotifyRefresh::MessageReceived, Refresh mode: Sim init and file change notification" ); + OstTrace1( TRACE_NORMAL, DUP7_CSATNOTIFYREFRESH_MESSAGERECEIVED_TD, "CSatNotifyRefresh::MessageReceived, Number of files: %d", refreshV2.iFileList.Length() ); refreshV2.iType = RSat::ESimInitFileChangeNotification; break; @@ -4932,7 +4939,7 @@ case KSimInit: { TFLOGSTRING("TSY: SAT, Refresh mode: Sim init "); - OstTrace0( TRACE_NORMAL, DUP8_CSATNOTIFYREFRESH_MESSAGERECEIVED, "CSatNotifyRefresh::MessageReceived, Refresh mode: Sim init" ); + OstTrace0( TRACE_NORMAL, DUP8_CSATNOTIFYREFRESH_MESSAGERECEIVED_TD, "CSatNotifyRefresh::MessageReceived, Refresh mode: Sim init" ); refreshV2.iType = RSat::ESimInit; iInternalCache = KCacheEFSST + KCacheEFCBMID; break; @@ -4941,14 +4948,14 @@ { refreshV2.iType = RSat::ESimReset; TFLOGSTRING("TSY: SAT, Refresh mode: Reset"); - OstTrace0( TRACE_NORMAL, DUP9_CSATNOTIFYREFRESH_MESSAGERECEIVED, "CSatNotifyRefresh::MessageReceived, Refresh mode: Reset" ); + OstTrace0( TRACE_NORMAL, DUP9_CSATNOTIFYREFRESH_MESSAGERECEIVED_TD, "CSatNotifyRefresh::MessageReceived, Refresh mode: Reset" ); iInternalCache = KCacheEFSST + KCacheEFCBMID; break; } case KUSIMApplicationReset: { TFLOGSTRING("TSY: SAT, Refresh mode: USIM Application Reset"); - OstTrace0( TRACE_NORMAL, DUP10_CSATNOTIFYREFRESH_MESSAGERECEIVED, "CSatNotifyRefresh::MessageReceived, Refresh mode: USIM Application Reset" ); + OstTrace0( TRACE_NORMAL, DUP10_CSATNOTIFYREFRESH_MESSAGERECEIVED_TD, "CSatNotifyRefresh::MessageReceived, Refresh mode: USIM Application Reset" ); refreshV2.iType = RSat::EUsimApplicationReset; iInternalCache = KCacheEFSST + KCacheEFCBMID; break; @@ -4956,7 +4963,7 @@ case K3GSessionReset: { TFLOGSTRING("TSY: SAT, Refresh mode: 3G Session Reset"); - OstTrace0( TRACE_NORMAL, DUP11_CSATNOTIFYREFRESH_MESSAGERECEIVED, "CSatNotifyRefresh::MessageReceived, Refresh mode: 3G Session Reset" ); + OstTrace0( TRACE_NORMAL, DUP11_CSATNOTIFYREFRESH_MESSAGERECEIVED_TD, "CSatNotifyRefresh::MessageReceived, Refresh mode: 3G Session Reset" ); refreshV2.iType = RSat::E3GSessionReset; break; } @@ -5002,7 +5009,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_NOTIFY, "CSatNotifyRefresh::Notify" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_NOTIFY_TD, "CSatNotifyRefresh::Notify" ); TFLOGSTRING("TSY: CSatNotifyRefresh::Notify"); iReqHandle = aReqHandle; iRefreshV2Pckg = static_cast< RSat::TRefreshV2Pckg* >( aDataPtr ); @@ -5026,7 +5033,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_NOTIFYREFRESHREQUIRED, "CSatNotifyRefresh::NotifyRefreshRequired" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_NOTIFYREFRESHREQUIRED_TD, "CSatNotifyRefresh::NotifyRefreshRequired" ); TFLOGSTRING("TSY: CSatNotifyRefresh::NotifyRefreshRequired"); iReqHandleRefreshRequired = aReqHandle; iRefreshRequiredV2Pckg = static_cast< RSat::TRefreshV2Pckg* >( aDataPtr ); @@ -5048,7 +5055,7 @@ const TTsyReqHandle aReqHandle // Request handle ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_CANCELREFRESHREQUIREDNOTIFICATION, "CSatNotifyRefresh::CancelRefreshRequiredNotification" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_CANCELREFRESHREQUIREDNOTIFICATION_TD, "CSatNotifyRefresh::CancelRefreshRequiredNotification" ); TFLOGSTRING("TSY: CSatNotifyRefresh::CancelRefreshRequiredNotification"); // Check that the handle is valid if ( aReqHandle == iReqHandleRefreshRequired ) @@ -5076,7 +5083,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_TERMINALRESPONSE, "CSatNotifyRefresh::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_TERMINALRESPONSE_TD, "CSatNotifyRefresh::TerminalResponse" ); TFLOGSTRING("TSY: CSatNotifyRefresh::TerminalResponse"); RSat::TRefreshRspV1Pckg* aRspPckg = reinterpret_cast< RSat::TRefreshRspV1Pckg* >( aRsp ); @@ -5092,7 +5099,7 @@ if ( KSimReset == iCommandDetails[KCommandQualifier] ) { TFLOGSTRING("TSY: CSatNotifyRefresh::TerminalResponse, Reset performed, send an empty TR"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYREFRESH_TERMINALRESPONSE, "CSatNotifyRefresh::TerminalResponse, Reset performed, send an empty TR" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYREFRESH_TERMINALRESPONSE_TD, "CSatNotifyRefresh::TerminalResponse, Reset performed, send an empty TR" ); TBuf8<1> emptyDescriptor( KNullDesC8 ); iSatMessHandler->UiccCatReqTerminalResponse( emptyDescriptor, emptyDescriptor, iTransId ); @@ -5100,7 +5107,7 @@ else { TFLOGSTRING("TSY: CSatNotifyRefresh::TerminalResponse, S60 has done the Refresh" ); - OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYREFRESH_TERMINALRESPONSE, "CSatNotifyRefresh::TerminalResponse, S60 has done the Refresh" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYREFRESH_TERMINALRESPONSE_TD, "CSatNotifyRefresh::TerminalResponse, S60 has done the Refresh" ); // Send terminal response iSatMessHandler->RefreshTerminalResp( iTransId, // Transaction id @@ -5124,7 +5131,7 @@ TDesC8* aDataPtr ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_REFRESHALLOWED, "CSatNotifyRefresh::RefreshAllowed" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_REFRESHALLOWED_TD, "CSatNotifyRefresh::RefreshAllowed" ); TFLOGSTRING("TSY: CSatNotifyRefresh::RefreshAllowed "); RSat::TRefreshRspV1Pckg* aRspPckg = reinterpret_cast< RSat::TRefreshRspV1Pckg* >( aDataPtr ); @@ -5144,7 +5151,7 @@ // Refresh not allowed by the client TFLOGSTRING("TSY: CSatNotifyRefresh::RefreshAllowed, refresh was not \ allowed by the client"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYREFRESH_REFRESHALLOWED, "CSatNotifyRefresh::RefreshAllowed, refresh was not allowed by the client" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYREFRESH_REFRESHALLOWED_TD, "CSatNotifyRefresh::RefreshAllowed, refresh was not allowed by the client" ); TUint8 additionalInfo( 0x00 ); if ( RSat::KNoAdditionalInfo != rspV1.iInfoType ) { @@ -5170,7 +5177,7 @@ const TUint8 a3GppRefresh // 3GPP refresh level ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_MAP3GPPREFRESHTOUICCVALUES, "CSatNotifyRefresh::Map3GppRefreshToUiccValues" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_MAP3GPPREFRESHTOUICCVALUES_TD, "CSatNotifyRefresh::Map3GppRefreshToUiccValues" ); TFLOGSTRING("TSY: CSatNotifyRefresh::Map3GppRefreshToUiccValues "); TUint8 serviceType( a3GppRefresh ); @@ -5230,7 +5237,7 @@ const TInt aError ) { - OstTraceExt2( TRACE_NORMAL, CSATNOTIFYREFRESH_COMPLETEREQUEST, "CSatNotifyRefresh::CompleteRequest Handle: %d, Error: %d", (TInt)iReqHandle, aError ); + OstTraceExt2( TRACE_NORMAL, CSATNOTIFYREFRESH_COMPLETEREQUEST_TD, "CSatNotifyRefresh::CompleteRequest Handle: %d, Error: %d", (TInt)iReqHandle, aError ); TFLOGSTRING3("CSatNotifyRefresh::CompleteRequest. \n\t\t\t Handle:%d\n\t\t\t Error:%d", iReqHandle, aError); @@ -5238,7 +5245,7 @@ iReqHandle = NULL; iSatMessaging->ReqCompleted( tempReqHandle, aError ); TFLOGSTRING("CSatNotifyRefresh::CompleteRequest. Request is now completed"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYREFRESH_COMPLETEREQUEST, "CSatNotifyRefresh::CompleteRequest Request is now completed" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYREFRESH_COMPLETEREQUEST_TD, "CSatNotifyRefresh::CompleteRequest Request is now completed" ); } @@ -5250,7 +5257,7 @@ // TUint16 CSatNotifyRefresh::CachedFiles() const { - OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_CACHEDFILES, "CSatNotifyRefresh::CachedFiles" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYREFRESH_CACHEDFILES_TD, "CSatNotifyRefresh::CachedFiles" ); return iInternalCache; } @@ -5268,7 +5275,7 @@ : CSatNotificationsBase( aSatMessHandler, aSatMessaging ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSIMSESSIONEND_CSATNOTIFYSIMSESSIONEND, "CSatNotifySimSessionEnd::CSatNotifySimSessionEnd" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSIMSESSIONEND_CSATNOTIFYSIMSESSIONEND_TD, "CSatNotifySimSessionEnd::CSatNotifySimSessionEnd" ); } // ----------------------------------------------------------------------------- @@ -5278,7 +5285,7 @@ // CSatNotifySimSessionEnd::~CSatNotifySimSessionEnd() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSIMSESSIONEND_CSATNOTIFYSIMSESSIONEND, "CSatNotifySimSessionEnd::~CSatNotifySimSessionEnd" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSIMSESSIONEND_CSATNOTIFYSIMSESSIONEND_TD, "CSatNotifySimSessionEnd::~CSatNotifySimSessionEnd" ); // None } @@ -5295,7 +5302,7 @@ const TIsiReceiveC& /*aIsiMessage*/ // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSIMSESSIONEND_MESSAGERECEIVED, "CSatNotifySimSessionEnd::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSIMSESSIONEND_MESSAGERECEIVED_TD, "CSatNotifySimSessionEnd::MessageReceived" ); TFLOGSTRING("CSatNotifySimSessionEnd::MessageReceived"); if ( iReqHandle ) // If request on { @@ -5316,7 +5323,7 @@ TDes8* /* aDataPtr */ // Pointer to data ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSIMSESSIONEND_NOTIFY, "CSatNotifySimSessionEnd::Notify" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSIMSESSIONEND_NOTIFY_TD, "CSatNotifySimSessionEnd::Notify" ); TFLOGSTRING("CSatNotifySimSessionEnd::Notify"); iReqHandle = aReqHandle; } @@ -5337,7 +5344,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iSetUpIdleModeTextV1Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPIDLEMODETEXT_CSATNOTIFYSETUPIDLEMODETEXT, "CSatNotifySetUpIdleModeText::CSatNotifySetUpIdleModeText" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPIDLEMODETEXT_CSATNOTIFYSETUPIDLEMODETEXT_TD, "CSatNotifySetUpIdleModeText::CSatNotifySetUpIdleModeText" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -5351,7 +5358,7 @@ // CSatNotifySetUpIdleModeText::~CSatNotifySetUpIdleModeText() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPIDLEMODETEXT_CSATNOTIFYSETUPIDLEMODETEXT, "CSatNotifySetUpIdleModeText::~CSatNotifySetUpIdleModeText" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPIDLEMODETEXT_CSATNOTIFYSETUPIDLEMODETEXT_TD, "CSatNotifySetUpIdleModeText::~CSatNotifySetUpIdleModeText" ); // None } @@ -5367,7 +5374,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPIDLEMODETEXT_MESSAGERECEIVED, "CSatNotifySetUpIdleModeText::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPIDLEMODETEXT_MESSAGERECEIVED_TD, "CSatNotifySetUpIdleModeText::MessageReceived" ); TFLOGSTRING("CSatNotifySetUpIdleModeText::MessageReceived"); TInt ret( KErrNone ); TInt returnValue( KErrNone ); @@ -5422,7 +5429,7 @@ { TFLOGSTRING("CSatNotifySetUpIdleModeText::MessageReceived \ No TLV text string found"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPIDLEMODETEXT_MESSAGERECEIVED, "CSatNotifySetUpIdleModeText::MessageReceived No TLV text string found" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPIDLEMODETEXT_MESSAGERECEIVED_TD, "CSatNotifySetUpIdleModeText::MessageReceived No TLV text string found" ); iSatMessHandler->SetUpIdleModeTextTerminalResp( iTransId, iCommandDetails, @@ -5450,7 +5457,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPIDLEMODETEXT_NOTIFY, "CSatNotifySetUpIdleModeText::Notify" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPIDLEMODETEXT_NOTIFY_TD, "CSatNotifySetUpIdleModeText::Notify" ); TFLOGSTRING("CSatNotifySetUpIdleModeText::Notify"); iReqHandle = aReqHandle; iSetUpIdleModeTextV1Pckg = @@ -5470,7 +5477,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSE, "CSatNotifySetUpIdleModeText::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPIDLEMODETEXT_TERMINALRESPONSE_TD, "CSatNotifySetUpIdleModeText::TerminalResponse" ); TFLOGSTRING("CSatNotifySetUpIdleModeText::TerminalResponse"); TInt ret( KErrNone ); TUint8 additionalInfo( 0 ); @@ -5521,7 +5528,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iCallControlPckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYCALLCONTROLREQUEST_CSATNOTIFYCALLCONTROLREQUEST, "CSatNotifyCallControlRequest::CSatNotifyCallControlRequest" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYCALLCONTROLREQUEST_CSATNOTIFYCALLCONTROLREQUEST_TD, "CSatNotifyCallControlRequest::CSatNotifyCallControlRequest" ); } // ----------------------------------------------------------------------------- @@ -5531,7 +5538,7 @@ // CSatNotifyCallControlRequest::~CSatNotifyCallControlRequest() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYCALLCONTROLREQUEST_CSATNOTIFYCALLCONTROLREQUEST, "CSatNotifyCallControlRequest::~CSatNotifyCallControlRequest" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYCALLCONTROLREQUEST_CSATNOTIFYCALLCONTROLREQUEST_TD, "CSatNotifyCallControlRequest::~CSatNotifyCallControlRequest" ); // None } @@ -5547,7 +5554,7 @@ const TIsiReceiveC& /*aIsiMessage*/ // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYCALLCONTROLREQUEST_MESSAGERECEIVED, "CSatNotifyCallControlRequest::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYCALLCONTROLREQUEST_MESSAGERECEIVED_TD, "CSatNotifyCallControlRequest::MessageReceived" ); // In S60 phones, the call control request is received via an ISI // message coming from the ATK Guardian / Call server. That's why the body // of this method is empty, see the class CSatCC. The Etel Sat API is used @@ -5569,7 +5576,7 @@ RSat::TControlResult aResult ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATION, "CSatNotifyCallControlRequest::CompleteNotification" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATION_TD, "CSatNotifyCallControlRequest::CompleteNotification" ); TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotification"); //check that someone has requested this notifications if ( iReqHandle ) @@ -5612,7 +5619,7 @@ const RSat::TControlResult aResult ) { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATION, "CSatNotifyCallControlRequest::CompleteNotification" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATION_TD, "CSatNotifyCallControlRequest::CompleteNotification" ); TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotification"); // Check that someone has requested this notifications if ( iReqHandle ) @@ -5670,7 +5677,7 @@ TPtrC8 aEnvelopeResponse ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL" ); TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL"); #if ( NCP_COMMON_S60_VERSION_SUPPORT >= S60_VERSION_50 ) // Check that someone has requested this notifications @@ -5720,7 +5727,7 @@ { TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL\ Not a valid call control result"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL Not a valid call control result" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL Not a valid call control result" ); break; } } @@ -5739,7 +5746,7 @@ { TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL \ Modified to SS"); - OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL Modified to SS" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL Modified to SS" ); // This SS related RSat::TSsString tempSs; // Call utility function that maps received TON and NPI @@ -5764,14 +5771,14 @@ tempSs.iSsString.Append( tempString ); TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL \ SetSendSsDetails"); - OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL SetSendSsDetails" ); + OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL SetSendSsDetails" ); // Set SS string to struct callControl.SetSendSsDetails( tempSs ); - if ( ATK_CHANGED == aCcResult ) + if ( KChanged == aCcResult ) { // Notify NokiaTSY that next SS request is SAT originated, because this is changed action made by SAT server TFLOGSTRING("TSY: Inform NokiaTSY SS request being Call Control originated, no further call control actions needed"); - OstTrace0( TRACE_NORMAL, DUP4_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "Inform NokiaTSY SS request being Call Control originated, no further call control actions needed" ); + OstTrace0( TRACE_NORMAL, DUP4_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "Inform NokiaTSY SS request being Call Control originated, no further call control actions needed" ); TBool resourceControlSuppress( ETrue ); CMmDataPackage dataPackage; @@ -5793,7 +5800,7 @@ { TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL \ Modified to USSD"); - OstTrace0( TRACE_NORMAL, DUP5_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL Modified to USSD" ); + OstTrace0( TRACE_NORMAL, DUP5_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL Modified to USSD" ); // This is USSD related RSat::TUssdString tempUssd; // Get the data coding scheme from the ISI msg @@ -5808,7 +5815,7 @@ ussdTlv.GetData( ETLV_UssdString ) ); TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL \ SetSendUssdDetails"); - OstTrace0( TRACE_NORMAL, DUP6_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL SetSendUssdDetails" ); + OstTrace0( TRACE_NORMAL, DUP6_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL SetSendUssdDetails" ); callControl.SetSendUssdDetails( tempUssd ); } else @@ -5821,7 +5828,7 @@ { TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL \ Modified to Call"); - OstTrace0( TRACE_NORMAL, DUP7_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL Modified to Call" ); + OstTrace0( TRACE_NORMAL, DUP7_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL Modified to Call" ); // This must be call related response CTlv addressTlv; @@ -5832,7 +5839,7 @@ { TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL \ Address found"); - OstTrace0( TRACE_NORMAL, DUP8_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL Address found" ); + OstTrace0( TRACE_NORMAL, DUP8_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL Address found" ); // Call utility function that maps received TON and NPI to // RSat values @@ -5882,7 +5889,7 @@ { TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL \ bcc1 found"); - OstTrace0( TRACE_NORMAL, DUP9_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL bcc1 found" ); + OstTrace0( TRACE_NORMAL, DUP9_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL bcc1 found" ); // BC length is the first byte in BC data tempCallParams.iCcp1.Copy( bcc1.GetData( ETLV_CapabilityConfigurationParameters ) ); @@ -5895,7 +5902,7 @@ { TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL \ subaddress found"); - OstTrace0( TRACE_NORMAL, DUP10_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL subaddress found" ); + OstTrace0( TRACE_NORMAL, DUP10_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL subaddress found" ); tempCallParams.iSubAddress.Copy( subAddress.GetData( ETLV_SubAddress ) ); } @@ -5911,7 +5918,7 @@ { TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL \ bcc2 found"); - OstTrace0( TRACE_NORMAL, DUP11_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL bcc2 found" ); + OstTrace0( TRACE_NORMAL, DUP11_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL bcc2 found" ); CTlv bcRepeat; ret = response.TlvByTagValue( &bcRepeat, @@ -5920,13 +5927,13 @@ if ( KErrNone == ret ) { // If bcc2 present, BC repeat indicator is mandatory - if ( ATK_CIRCULAR_REPEAT_INDICATOR == + if ( KECircularRepeatIndicator == bcRepeat.GetShortInfo( ETLV_BcRepeatIndicatorValues ) ) { callControl.SetBCRepeatIndicator( RSat::EBCAlternateMode ); } - else if ( ATK_SEQUENTIAL_REPEAT_INDICATOR == + else if ( KESequentalRepeatIndicator == bcRepeat.GetShortInfo( ETLV_BcRepeatIndicatorValues ) ) { callControl.SetBCRepeatIndicator( @@ -5949,13 +5956,13 @@ // set call parameters TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL \ SetCallSetUpDetails"); - OstTrace0( TRACE_NORMAL, DUP12_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL SetCallSetUpDetails" ); + OstTrace0( TRACE_NORMAL, DUP12_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL SetCallSetUpDetails" ); callControl.SetCallSetUpDetails( tempCallParams ); - if ( ATK_CHANGED == aCcResult ) + if ( KChanged == aCcResult ) { // Notify NokiaTSY that next dial request is SAT originated, because this is changed action made by SAT server TFLOGSTRING("TSY: CSatNotifyCallControlRequest::CompleteNotificationL: Notify NTSY next dial request is SAT-originated"); - OstTrace0( TRACE_NORMAL, DUP16_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL: Notify NTSY next dial request is SAT-originated" ); + OstTrace0( TRACE_NORMAL, DUP16_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL: Notify NTSY next dial request is SAT-originated" ); TBool resourceControlSuppress( ETrue ); CMmDataPackage dataPackage; dataPackage.PackData( &resourceControlSuppress ); @@ -5979,7 +5986,7 @@ { TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL \ Alpha id found"); - OstTrace0( TRACE_NORMAL, DUP13_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL Alpha id found" ); + OstTrace0( TRACE_NORMAL, DUP13_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL Alpha id found" ); if ( alphaIdentifier.GetLength() ) { // 8-bit string to 16-bit string @@ -6004,18 +6011,18 @@ { TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL \ Alpha ID not present"); - OstTrace0( TRACE_NORMAL, DUP14_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL Alpha ID not present" ); + OstTrace0( TRACE_NORMAL, DUP14_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL Alpha ID not present" ); tempAlphaId.iStatus = RSat::EAlphaIdNotPresent; tempValidity = RSat::ENoAlphaId; } // Set alpha id values TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL \ SetAlphaId"); - OstTrace0( TRACE_NORMAL, DUP15_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL, "CSatNotifyCallControlRequest::CompleteNotificationL SetAlphaId" ); + OstTrace0( TRACE_NORMAL, DUP15_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATIONL_TD, "CSatNotifyCallControlRequest::CompleteNotificationL SetAlphaId" ); callControl.SetAlphaId( tempValidity, tempAlphaId ); TFLOGSTRING("CSatNotifyCallControlRequest::CompleteNotificationL \ SetCallParamOrigin"); - OstTrace0( TRACE_NORMAL, DUP18_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATION, "CSatNotifyCallControlRequest::CompleteNotification SetCallParamOrigin" ); + OstTrace0( TRACE_NORMAL, DUP18_CSATNOTIFYCALLCONTROLREQUEST_COMPLETENOTIFICATION_TD, "CSatNotifyCallControlRequest::CompleteNotification SetCallParamOrigin" ); CompleteRequest( KErrNone ); } @@ -6035,7 +6042,7 @@ TDes8* aDataPtr ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYCALLCONTROLREQUEST_NOTIFY, "CSatNotifyCallControlRequest::Notify" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYCALLCONTROLREQUEST_NOTIFY_TD, "CSatNotifyCallControlRequest::Notify" ); TFLOGSTRING("CSatNotifyCallControlRequest::Notify"); iReqHandle = aReqHandle; @@ -6058,7 +6065,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iLaunchBrowserV2Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYLAUNCHBROWSER_CSATNOTIFYLAUNCHBROWSER, "CSatNotifyLaunchBrowser::CSatNotifyLaunchBrowser" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYLAUNCHBROWSER_CSATNOTIFYLAUNCHBROWSER_TD, "CSatNotifyLaunchBrowser::CSatNotifyLaunchBrowser" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -6073,7 +6080,7 @@ // CSatNotifyLaunchBrowser::~CSatNotifyLaunchBrowser() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYLAUNCHBROWSER_CSATNOTIFYLAUNCHBROWSER, "CSatNotifyLaunchBrowser::~CSatNotifyLaunchBrowser" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYLAUNCHBROWSER_CSATNOTIFYLAUNCHBROWSER_TD, "CSatNotifyLaunchBrowser::~CSatNotifyLaunchBrowser" ); // None } @@ -6089,7 +6096,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYLAUNCHBROWSER_MESSAGERECEIVED, "CSatNotifyLaunchBrowser::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYLAUNCHBROWSER_MESSAGERECEIVED_TD, "CSatNotifyLaunchBrowser::MessageReceived" ); TFLOGSTRING("CSatNotifyLaunchBrowser::MessageReceived"); //get ber tlv CBerTlv berTlv; @@ -6442,7 +6449,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYLAUNCHBROWSER_NOTIFY, "CSatNotifyLaunchBrowser::Notify Handle :%u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYLAUNCHBROWSER_NOTIFY_TD, "CSatNotifyLaunchBrowser::Notify Handle :%u", aReqHandle ); TFLOGSTRING2("CSatNotifyLaunchBrowser::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); iReqHandle = aReqHandle; @@ -6462,7 +6469,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSE, "CSatNotifyLaunchBrowser::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSE_TD, "CSatNotifyLaunchBrowser::TerminalResponse" ); TFLOGSTRING("CSatNotifyLaunchBrowser::TerminalResponse"); TInt ret( KErrNone ); TUint8 additionalInfo( 0 ); @@ -6526,7 +6533,7 @@ iCmdQualifier( KZero ), iEvents( KZero ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPEVENTLIST_CSATNOTIFYSETUPEVENTLIST, "CSatNotifySetUpEventList::CSatNotifySetUpEventList" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPEVENTLIST_CSATNOTIFYSETUPEVENTLIST_TD, "CSatNotifySetUpEventList::CSatNotifySetUpEventList" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KErrorRequiredValuesMissing; @@ -6539,7 +6546,7 @@ // CSatNotifySetUpEventList::~CSatNotifySetUpEventList() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPEVENTLIST_CSATNOTIFYSETUPEVENTLIST, "CSatNotifySetUpEventList::~CSatNotifySetUpEventList" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPEVENTLIST_CSATNOTIFYSETUPEVENTLIST_TD, "CSatNotifySetUpEventList::~CSatNotifySetUpEventList" ); // None } @@ -6555,7 +6562,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPEVENTLIST_MESSAGERECEIVED, "CSatNotifySetUpEventList::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPEVENTLIST_MESSAGERECEIVED_TD, "CSatNotifySetUpEventList::MessageReceived" ); TFLOGSTRING("CSatNotifySetUpEventList::MessageReceived"); TInt ret( KErrNone ); TUint8 generalResult( RSat::KSuccess ); @@ -6681,7 +6688,7 @@ TFLOGSTRING("TSY: \ CSatNotifySetUpEventList::MessageReceived, \ Event not recognized or not supported."); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPEVENTLIST_MESSAGERECEIVED, "CSatNotifySetUpEventList::MessageReceived, Event not recognized or not supported." ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSETUPEVENTLIST_MESSAGERECEIVED_TD, "CSatNotifySetUpEventList::MessageReceived, Event not recognized or not supported." ); } } } @@ -6719,7 +6726,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYSETUPEVENTLIST_NOTIFY, "CSatNotifySetUpEventList::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYSETUPEVENTLIST_NOTIFY_TD, "CSatNotifySetUpEventList::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("CSatNotifySetUpEventList::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); iReqHandle = aReqHandle; @@ -6739,7 +6746,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSE, "CSatNotifySetUpEventList::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSETUPEVENTLIST_TERMINALRESPONSE_TD, "CSatNotifySetUpEventList::TerminalResponse" ); TFLOGSTRING("CSatNotifySetUpEventList::TerminalResponse"); TInt ret( KErrNone ); TUint8 additionalInfo( 0 ); @@ -6794,7 +6801,7 @@ : CSatNotificationsBase( aSatMessHandler, aSatMessaging ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYPOLLINGOFF_CSATNOTIFYPOLLINGOFF, "CSatNotifyPollingOff::CSatNotifyPollingOff" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYPOLLINGOFF_CSATNOTIFYPOLLINGOFF_TD, "CSatNotifyPollingOff::CSatNotifyPollingOff" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KErrorRequiredValuesMissing; @@ -6807,7 +6814,7 @@ // CSatNotifyPollingOff::~CSatNotifyPollingOff() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYPOLLINGOFF_CSATNOTIFYPOLLINGOFF, "CSatNotifyPollingOff::~CSatNotifyPollingOff" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYPOLLINGOFF_CSATNOTIFYPOLLINGOFF_TD, "CSatNotifyPollingOff::~CSatNotifyPollingOff" ); // None } @@ -6823,7 +6830,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYPOLLINGOFF_MESSAGERECEIVED, "CSatNotifyPollingOff::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYPOLLINGOFF_MESSAGERECEIVED_TD, "CSatNotifyPollingOff::MessageReceived" ); TFLOGSTRING("CSatNotifyPollingOff::MessageReceived"); //get ber tlv CBerTlv berTlv; @@ -6866,7 +6873,7 @@ TDes8* /*aDataPtr*/ // Pointer to data ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYPOLLINGOFF_NOTIFY, "CSatNotifyPollingOff::Notify" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYPOLLINGOFF_NOTIFY_TD, "CSatNotifyPollingOff::Notify" ); // PollingOff is completely implemented by SimAtkTsy. Client // insn't notified about the command. } @@ -6889,7 +6896,7 @@ iLocalInfoIsOngoing( EFalse ), iLocalInfoAccTechOngoing( EFalse ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYLOCALINFO_CSATNOTIFYLOCALINFO, "CSatNotifyLocalInfo::CSatNotifyLocalInfo" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYLOCALINFO_CSATNOTIFYLOCALINFO_TD, "CSatNotifyLocalInfo::CSatNotifyLocalInfo" ); TFLOGSTRING("CSatNotifyLocalInfo::CSatNotifyLocalInfo"); // Initialize response structure iLocalInfoRspV3 = RSat::TLocalInfoRspV3(); @@ -6907,7 +6914,7 @@ // CSatNotifyLocalInfo::~CSatNotifyLocalInfo() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYLOCALINFO_CSATNOTIFYLOCALINFO, "CSatNotifyLocalInfo::~CSatNotifyLocalInfo" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYLOCALINFO_CSATNOTIFYLOCALINFO_TD, "CSatNotifyLocalInfo::~CSatNotifyLocalInfo" ); // None } @@ -6923,7 +6930,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::MessageReceived" ); TFLOGSTRING("CSatNotifyLocalInfo::MessageReceived"); // Clear additional info iLocalInfoRspV3.iAdditionalInfo.Zero(); @@ -6942,7 +6949,7 @@ case RSat::KProvideLocalInfo: { TFLOGSTRING("CSatNotifyLocalInfo:: request: LOCAL INFO"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::Messagereceived Request: LOCAL INFO" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::Messagereceived Request: LOCAL INFO" ); iLocalInfoIsOngoing = ETrue; // Send a net cell info request to the net server. @@ -6955,7 +6962,7 @@ case RSat::KProvideLocalInfoImei: { TFLOGSTRING("CSatNotifyLocalInfo:: request: IMEI"); - OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::Messagereceived Request: IMEI" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::Messagereceived Request: IMEI" ); // Check if IMEI is received if ( iSatMessHandler->ImeiAvailable() ) { @@ -6975,7 +6982,7 @@ case RSat::KProvideLocalInfoIMEISV: { TFLOGSTRING("TSY: CSatNotifyLocalInfo::MessageReceived Request: IMEISV"); - OstTrace0( TRACE_NORMAL, DUP14_CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::MessageReceived Request: IMEISV" ); + OstTrace0( TRACE_NORMAL, DUP14_CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::MessageReceived Request: IMEISV" ); // Check if IMEISV is received if ( iSatMessHandler->ImeiSvAvailable() ) { @@ -7004,7 +7011,7 @@ iSatMessHandler->CurrentAccessTechnology() ) { TFLOGSTRING("CSatNotifyLocalInfo:: request: UTRAN NMR"); - OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::Messagereceived UTRAN NMR" ); + OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::Messagereceived UTRAN NMR" ); switch( utranMeasurement.GetShortInfo( ETLV_UtranMeasurementQualifier ) ) @@ -7013,7 +7020,7 @@ { iLocalInfoIsOngoing = ETrue; TFLOGSTRING("CSatNotifyLocalInfo::INTRA_FREQ_NMR"); - OstTrace0( TRACE_NORMAL, DUP4_CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::Messagereceived INTRA_FREQ_NMR" ); + OstTrace0( TRACE_NORMAL, DUP4_CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::Messagereceived INTRA_FREQ_NMR" ); iSatMessHandler->NetNeighbourCellsReq( iSatMessaging->GetTransactionId(), NET_SIM_INTRA_FREQ_NMR ); @@ -7023,7 +7030,7 @@ { iLocalInfoIsOngoing = ETrue; TFLOGSTRING("CSatNotifyLocalInfo::INTER_FREQ_NMR"); - OstTrace0( TRACE_NORMAL, DUP5_CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::MessageReceived INTER_FREQ_NMR" ); + OstTrace0( TRACE_NORMAL, DUP5_CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::MessageReceived INTER_FREQ_NMR" ); iSatMessHandler->NetNeighbourCellsReq( iSatMessaging->GetTransactionId(), NET_SIM_INTER_FREQ_NMR ); @@ -7033,7 +7040,7 @@ { iLocalInfoIsOngoing = ETrue; TFLOGSTRING("CSatNotifyLocalInfo::INTER_RAT_NMR"); - OstTrace0( TRACE_NORMAL, DUP6_CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::MessageReceived INTER_RAT_NMR" ); + OstTrace0( TRACE_NORMAL, DUP6_CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::MessageReceived INTER_RAT_NMR" ); iSatMessHandler->NetNeighbourCellsReq( iSatMessaging->GetTransactionId(), NET_SIM_INTER_RAT_NMR ); @@ -7060,7 +7067,7 @@ else { TFLOGSTRING("CSatNotifyLocalInfo:: request: NMR"); - OstTrace0( TRACE_NORMAL, DUP7_CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::MessageReceived Request: NMR" ); + OstTrace0( TRACE_NORMAL, DUP7_CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::MessageReceived Request: NMR" ); iLocalInfoIsOngoing = ETrue; // Request NET_SIM_NMR iSatMessHandler->NetNeighbourCellsReq( @@ -7073,7 +7080,7 @@ case RSat::KProvideLocalInfoDateTimeTimeZone: { TFLOGSTRING("CSatNotifyLocalInfo:: request: DATE/TIME/TIMEZONE"); - OstTrace0( TRACE_NORMAL, DUP8_CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::MessageReceived Request: DATE/TIME/TIMEZONE" ); + OstTrace0( TRACE_NORMAL, DUP8_CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::MessageReceived Request: DATE/TIME/TIMEZONE" ); TTime time; TLocale locale; TDateTime dateTime; @@ -7132,11 +7139,11 @@ case RSat::KProvideLocalInfoLanguage: { TFLOGSTRING("CSatNotifyLocalInfo:: request: Language"); - OstTrace0( TRACE_NORMAL, DUP9_CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::MessageReceived Request: Language" ); + OstTrace0( TRACE_NORMAL, DUP9_CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::MessageReceived Request: Language" ); if( !iReqHandle ) { TFLOGSTRING("CSatNotifyLocalInfo:: No reqHandle"); - OstTrace0( TRACE_NORMAL, DUP10_CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::MessageReceived No reqHandle" ); + OstTrace0( TRACE_NORMAL, DUP10_CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::MessageReceived No reqHandle" ); iLocalInfoRspV3.iGeneralResult = RSat::KMeUnableToProcessCmd; iLocalInfoRspV3.iAdditionalInfo.Append( RSat::KNoSpecificMeProblem ); @@ -7145,7 +7152,7 @@ else { TFLOGSTRING("CSatNotifyLocalInfo:: reqHandle"); - OstTrace0( TRACE_NORMAL, DUP11_CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::MessageReceived reqHandle" ); + OstTrace0( TRACE_NORMAL, DUP11_CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::MessageReceived reqHandle" ); // Fill the send sm structure RSat::TLocalInfoV3& localInfoV3 = ( *iLocalInfoV3Pckg )(); // Get command details tlv @@ -7164,7 +7171,7 @@ case RSat::KProvideLocalInfoTimingAdv: { TFLOGSTRING("CSatNotifyLocalInfo:: request: TimingAdvance"); - OstTrace0( TRACE_NORMAL, DUP12_CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::MessageReceived Request: TimingAdvance" ); + OstTrace0( TRACE_NORMAL, DUP12_CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::MessageReceived Request: TimingAdvance" ); iLocalInfoIsOngoing = ETrue; //request GSS_CS_SERVICE_REQ iSatMessHandler->GssCsServiceReq( @@ -7175,7 +7182,7 @@ case RSat::KProvideLocalInfoAccTech: { TFLOGSTRING("CSatNotifyLocalInfo:: request: Access Technology"); - OstTrace0( TRACE_NORMAL, DUP13_CSATNOTIFYLOCALINFO_MESSAGERECEIVED, "CSatNotifyLocalInfo::MessageReceived Request: Access Technology" ); + OstTrace0( TRACE_NORMAL, DUP13_CSATNOTIFYLOCALINFO_MESSAGERECEIVED_TD, "CSatNotifyLocalInfo::MessageReceived Request: Access Technology" ); iLocalInfoIsOngoing = ETrue; iLocalInfoAccTechOngoing = ETrue; @@ -7222,7 +7229,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYLOCALINFO_NOTIFY, "CSatNotifyLocalInfo::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYLOCALINFO_NOTIFY_TD, "CSatNotifyLocalInfo::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("CSatNotifyLocalInfo::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); iReqHandle = aReqHandle; @@ -7242,7 +7249,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYLOCALINFO_TERMINALRESPONSE, "CSatNotifyLocalInfo::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYLOCALINFO_TERMINALRESPONSE_TD, "CSatNotifyLocalInfo::TerminalResponse" ); TFLOGSTRING("CSatNotifyLocalInfo::TerminalResponse"); TInt ret( KErrNone ); if ( aRsp ) @@ -7286,7 +7293,7 @@ TBool aClearStatus ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYLOCALINFO_LOCALINFOSTATUS, "CSatNotifyLocalInfo::LocalInfoStatus" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYLOCALINFO_LOCALINFOSTATUS_TD, "CSatNotifyLocalInfo::LocalInfoStatus" ); TFLOGSTRING("CSatNotifyLocalInfo::LocalInfoStatus"); if ( aClearStatus ) @@ -7309,7 +7316,7 @@ TBool aClearStatus ) { -OstTrace0( TRACE_NORMAL, CSATNOTIFYLOCALINFO_LOCALINFOACCTECHSTATUS, "CSatNotifyLocalInfo::LocalInfoAccTechStatus" ); +OstTrace0( TRACE_NORMAL, CSATNOTIFYLOCALINFO_LOCALINFOACCTECHSTATUS_TD, "CSatNotifyLocalInfo::LocalInfoAccTechStatus" ); TFLOGSTRING("CSatNotifyLocalInfo::LocalInfoAccTechStatus"); if ( aClearStatus ) @@ -7335,7 +7342,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iCmdQualifier( KZero ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYTIMERMGMT_CSATNOTIFYTIMERMGMT, "CSatNotifyTimerMgmt::CSatNotifyTimerMgmt" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYTIMERMGMT_CSATNOTIFYTIMERMGMT_TD, "CSatNotifyTimerMgmt::CSatNotifyTimerMgmt" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KContradictionWithTimerState @@ -7349,7 +7356,7 @@ // CSatNotifyTimerMgmt::~CSatNotifyTimerMgmt() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYTIMERMGMT_CSATNOTIFYTIMERMGMT, "CSatNotifyTimerMgmt::~CSatNotifyTimerMgmt" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYTIMERMGMT_CSATNOTIFYTIMERMGMT_TD, "CSatNotifyTimerMgmt::~CSatNotifyTimerMgmt" ); // None } @@ -7365,7 +7372,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYTIMERMGMT_MESSAGERECEIVED, "CSatNotifyTimerMgmt::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYTIMERMGMT_MESSAGERECEIVED_TD, "CSatNotifyTimerMgmt::MessageReceived" ); TFLOGSTRING("CSatNotifyTimerMgmt::MessageReceived"); TInt ret( KErrNone ); TInt returnValue( KErrNone ); @@ -7499,7 +7506,7 @@ TDes8* /*aDataPtr*/ // Pointer to data ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYTIMERMGMT_NOTIFY, "CSatNotifyTimerMgmt::Notify" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYTIMERMGMT_NOTIFY_TD, "CSatNotifyTimerMgmt::Notify" ); // TimerManagement is completely implemented by SimAtkTsy. Client // insn't notified about the command. } @@ -7516,7 +7523,7 @@ TPtrC8 time ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYTIMERMGMT_CONVERTTOSECONDS, "CSatNotifyTimerMgmt::ConvertToSeconds" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYTIMERMGMT_CONVERTTOSECONDS_TD, "CSatNotifyTimerMgmt::ConvertToSeconds" ); TFLOGSTRING("CSatNotifyTimerMgmt::ConvertToSeconds"); TUint32 timeValue( 0 ); // value of a timer, expressed using @@ -7550,7 +7557,7 @@ : CSatNotificationsBase( aSatMessHandler, aSatMessaging ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYMORETIME_CSATNOTIFYMORETIME, "CSatNotifyMoreTime::CSatNotifyMoreTime" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYMORETIME_CSATNOTIFYMORETIME_TD, "CSatNotifyMoreTime::CSatNotifyMoreTime" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KErrorRequiredValuesMissing; @@ -7563,7 +7570,7 @@ // CSatNotifyMoreTime::~CSatNotifyMoreTime() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYMORETIME_CSATNOTIFYMORETIME, "CSatNotifyMoreTime::~CSatNotifyMoreTime" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYMORETIME_CSATNOTIFYMORETIME_TD, "CSatNotifyMoreTime::~CSatNotifyMoreTime" ); // None } @@ -7579,7 +7586,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYMORETIME_MESSAGERECEIVED, "CSatNotifyMoreTime::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYMORETIME_MESSAGERECEIVED_TD, "CSatNotifyMoreTime::MessageReceived" ); TFLOGSTRING("CSatNotifyMoreTime::MessageReceived"); //get ber tlv CBerTlv berTlv; @@ -7607,7 +7614,7 @@ TDes8* /*aDataPtr*/ // Pointer to data ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYMORETIME_NOTIFY, "CSatNotifyMoreTime::Notify" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYMORETIME_NOTIFY_TD, "CSatNotifyMoreTime::Notify" ); // MoreTime is completely implemented by SimAtkTsy. Client // insn't notified about the command. } @@ -7628,7 +7635,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iLanguageNotificationV2Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYLANGUAGENOTIFICATION_CSATNOTIFYLANGUAGENOTIFICATION, "CSatNotifyLanguageNotification::CSatNotifyLanguageNotification" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYLANGUAGENOTIFICATION_CSATNOTIFYLANGUAGENOTIFICATION_TD, "CSatNotifyLanguageNotification::CSatNotifyLanguageNotification" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KErrorRequiredValuesMissing; @@ -7641,7 +7648,7 @@ // CSatNotifyLanguageNotification::~CSatNotifyLanguageNotification() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYLANGUAGENOTIFICATION_CSATNOTIFYLANGUAGENOTIFICATION, "CSatNotifyLanguageNotification::~CSatNotifyLanguageNotification" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYLANGUAGENOTIFICATION_CSATNOTIFYLANGUAGENOTIFICATION_TD, "CSatNotifyLanguageNotification::~CSatNotifyLanguageNotification" ); // None } @@ -7657,7 +7664,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYLANGUAGENOTIFICATION_MESSAGERECEIVED, "CSatNotifyLanguageNotification::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYLANGUAGENOTIFICATION_MESSAGERECEIVED_TD, "CSatNotifyLanguageNotification::MessageReceived" ); TFLOGSTRING("TSY: CSatNotifyLanguageNotification::MessageReceived"); TInt ret( KErrNone ); TInt returnValue( KErrNone ); @@ -7707,7 +7714,7 @@ TFLOGSTRING("TSY: \ CSatNotifyLanguageNotification::MessageReceived, \ Command qualifier did not match."); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYLANGUAGENOTIFICATION_MESSAGERECEIVED, "CSatNotifyLanguageNotification::MessageReceived, Command qualifier did not match." ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYLANGUAGENOTIFICATION_MESSAGERECEIVED_TD, "CSatNotifyLanguageNotification::MessageReceived, Command qualifier did not match." ); } CTlv language; returnValue = berTlv.TlvByTagValue( &language, @@ -7734,7 +7741,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYLANGUAGENOTIFICATION_NOTIFY, "CSatNotifyLanguageNotification::Notify" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYLANGUAGENOTIFICATION_NOTIFY_TD, "CSatNotifyLanguageNotification::Notify" ); TFLOGSTRING("CSatNotifyLanguageNotification::Notify"); iReqHandle = aReqHandle; iLanguageNotificationV2Pckg = @@ -7755,7 +7762,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYLANGUAGENOTIFICATION_TERMINALRESPONSE, "CSatNotifyLanguageNotification::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYLANGUAGENOTIFICATION_TERMINALRESPONSE_TD, "CSatNotifyLanguageNotification::TerminalResponse" ); TFLOGSTRING("CSatNotifyLanguageNotification::TerminalResponse"); TUint8 additionalInfo( 0 ); RSat::TLanguageNotificationRspV2Pckg* aRspPckg = @@ -7789,7 +7796,7 @@ iOpenGprsChannelV4Pckg( NULL ), iOpenLocalLinksChannelV2Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_CSATNOTIFYOPENCHANNEL, "CSatNotifyOpenChannel::CSatNotifyOpenChannel" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_CSATNOTIFYOPENCHANNEL_TD, "CSatNotifyOpenChannel::CSatNotifyOpenChannel" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -7807,7 +7814,7 @@ // CSatNotifyOpenChannel::~CSatNotifyOpenChannel() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYOPENCHANNEL_CSATNOTIFYOPENCHANNEL, "CSatNotifyOpenChannel::~CSatNotifyOpenChannel" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYOPENCHANNEL_CSATNOTIFYOPENCHANNEL_TD, "CSatNotifyOpenChannel::~CSatNotifyOpenChannel" ); // None } @@ -7823,7 +7830,7 @@ const TIsiReceiveC& aIsiMessage // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED, "CSatNotifyOpenChannel::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED_TD, "CSatNotifyOpenChannel::MessageReceived" ); TFLOGSTRING("TSY: CSatNotifyOpenChannel::MessageReceived"); TInt ret( KErrNone ); // Get ber tlv @@ -7837,7 +7844,7 @@ if ( !iReqHandle ) { TFLOGSTRING("TSY: CSatNotifyOpenChannel::MessageReceived - Request Off"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED, "CSatNotifyOpenChannel::MessageReceived - Request Off" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED_TD, "CSatNotifyOpenChannel::MessageReceived - Request Off" ); // Request not on, returning response immediately TBuf8<1> noBearer( 0 ); TBuf8<1> noAdditionalInfo( 0 ); @@ -7957,7 +7964,7 @@ case RSat::EGPRSBearer: { TFLOGSTRING("TSY: CSatNotifyOpenChannel::MessageReceived - GPRS Bearer"); - OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED, "CSatNotifyOpenChannel::MessageReceived - GPRS Bearer" ); + OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED_TD, "CSatNotifyOpenChannel::MessageReceived - GPRS Bearer" ); // Fill in TOpenGprsChannelV4 RSat::TOpenGprsChannelV4& openGprsChannelV4 = ( *iOpenGprsChannelV4Pckg )(); @@ -7975,7 +7982,7 @@ { TFLOGSTRING("TSY: CSatNotifyOpenChannel::MessageReceived -\ Local Adress - not present"); - OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED, "CSatNotifyOpenChannel::MessageReceived - Local Adress - not present" ); + OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED_TD, "CSatNotifyOpenChannel::MessageReceived - Local Adress - not present" ); openGprsChannelV4.iLocalAddress.iType = RSat::EAddressNotPresent; } @@ -7991,7 +7998,7 @@ case RSat::EDefaultBearer: { TFLOGSTRING("TSY: CSatNotifyOpenChannel::MessageReceived - Default Bearer"); - OstTrace0( TRACE_NORMAL, DUP4_CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED, "CSatNotifyOpenChannel::MessageReceived - Default Bearer" ); + OstTrace0( TRACE_NORMAL, DUP4_CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED_TD, "CSatNotifyOpenChannel::MessageReceived - Default Bearer" ); // Fill in TOpenChannelBaseV2 openChannelV2.iPCmdType = RSat::EAnyBearer; break; @@ -8003,7 +8010,7 @@ case RSat::EUSBBearer: { TFLOGSTRING("TSY: CSatNotifyOpenChannel::MessageReceived - Bearer not supported"); - OstTrace0( TRACE_NORMAL, DUP5_CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED, "CSatNotifyOpenChannel::MessageReceived - Bearer not supported" ); + OstTrace0( TRACE_NORMAL, DUP5_CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED_TD, "CSatNotifyOpenChannel::MessageReceived - Bearer not supported" ); // Bearer not supported TBuf8<1> noAdditionalInfo( 0 ); iSatMessHandler->OpenChannelTerminalResp( @@ -8021,7 +8028,7 @@ { // Bearer not supported (RFU) TFLOGSTRING("TSY: CSatNotifyOpenChannel::MessageReceived - Bearer not supported"); - OstTrace0( TRACE_NORMAL, DUP6_CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED, "CSatNotifyOpenChannel::MessageReceived - Bearer not supported" ); + OstTrace0( TRACE_NORMAL, DUP6_CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED_TD, "CSatNotifyOpenChannel::MessageReceived - Bearer not supported" ); // Required values missing TBuf8<1> noBearer( 0 ); TBuf8<1> noAdditionalInfo( 0 ); @@ -8042,7 +8049,7 @@ else { TFLOGSTRING("TSY: CSatNotifyOpenChannel::MessageReceived - Required values missing"); - OstTrace0( TRACE_NORMAL, DUP7_CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED, "CSatNotifyOpenChannel::MessageReceived - Required values missing" ); + OstTrace0( TRACE_NORMAL, DUP7_CSATNOTIFYOPENCHANNEL_MESSAGERECEIVED_TD, "CSatNotifyOpenChannel::MessageReceived - Required values missing" ); // Required values missing TBuf8<1> noBearer( 0 ); TBuf8<1> noAdditionalInfo( 0 ); @@ -8075,7 +8082,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_NOTIFY, "CSatNotifyOpenChannel::Notify" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_NOTIFY_TD, "CSatNotifyOpenChannel::Notify" ); TFLOGSTRING("CSatNotifyOpenChannel::Notify"); iReqHandle = aReqHandle; iOpenBaseChannelV2Pckg = @@ -8101,7 +8108,7 @@ TDes8* aRsp // Response ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_TERMINALRESPONSE, "CSatNotifyOpenChannel::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_TERMINALRESPONSE_TD, "CSatNotifyOpenChannel::TerminalResponse" ); TFLOGSTRING("CSatNotifyOpenChannel::TerminalResponse"); TInt ret( KErrNone ); TBuf8 additionalInfo; @@ -8156,7 +8163,7 @@ RSat::TBearer& aBearer ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_GETBEARERTYPEANDPARAMS, "CSatNotifyOpenChannel::GetBearerTypeAndParams" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_GETBEARERTYPEANDPARAMS_TD, "CSatNotifyOpenChannel::GetBearerTypeAndParams" ); TFLOGSTRING("TSY: CSatNotifyOpenChannel::GetBearerTypeAndParams"); TUint8 bearerType( aBearerDescriptionTlv.GetShortInfo( ETLV_BearerType ) ); @@ -8225,7 +8232,7 @@ RSat::TOtherAddress& aDestinationAddress ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_SIMMEINTERFACEANDDATADESTINATIONADDRESS, "CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_SIMMEINTERFACEANDDATADESTINATIONADDRESS_TD, "CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress" ); TFLOGSTRING("TSY: CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress"); // SIM/ME Interface transport level ( Optional ) @@ -8236,7 +8243,7 @@ { TFLOGSTRING("CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress -\ SIM/ME Interface"); - OstTrace0( TRACE_NORMAL, DUP5_CSATNOTIFYOPENCHANNEL_SIMMEINTERFACEANDDATADESTINATIONADDRESS, "CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress - SIM/ME Interface" ); + OstTrace0( TRACE_NORMAL, DUP5_CSATNOTIFYOPENCHANNEL_SIMMEINTERFACEANDDATADESTINATIONADDRESS_TD, "CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress - SIM/ME Interface" ); aSimMeInterface.iPrtNumber = simMeInterfaceTlv.GetLongInfo( ETLV_PortNumber ); @@ -8260,7 +8267,7 @@ { TFLOGSTRING("TSY: CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress -\ SIM/ME Interface - Not present"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYOPENCHANNEL_SIMMEINTERFACEANDDATADESTINATIONADDRESS, "CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress -SIM/ME Interface - Not present" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYOPENCHANNEL_SIMMEINTERFACEANDDATADESTINATIONADDRESS_TD, "CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress -SIM/ME Interface - Not present" ); aSimMeInterface.iTransportProto = RSat::EProtocolNotPresent; } @@ -8316,7 +8323,7 @@ { TFLOGSTRING("TSY: CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress,\ Transport protocol did not match."); - OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYOPENCHANNEL_SIMMEINTERFACEANDDATADESTINATIONADDRESS, "CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress, Transport protocol did not match." ); + OstTrace0( TRACE_NORMAL, DUP2_CSATNOTIFYOPENCHANNEL_SIMMEINTERFACEANDDATADESTINATIONADDRESS_TD, "CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress, Transport protocol did not match." ); } // Other Address - Set Destination Address @@ -8324,7 +8331,7 @@ { TFLOGSTRING("TSY: CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress -\ Destination Address"); - OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYOPENCHANNEL_SIMMEINTERFACEANDDATADESTINATIONADDRESS, "CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress - Destination Address" ); + OstTrace0( TRACE_NORMAL, DUP3_CSATNOTIFYOPENCHANNEL_SIMMEINTERFACEANDDATADESTINATIONADDRESS_TD, "CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress - Destination Address" ); TUint8 typeOfAddress( dataDestAddressTlv->GetShortInfo( ETLV_TypeOfAddress ) ); switch( typeOfAddress ) @@ -8356,7 +8363,7 @@ { TFLOGSTRING("TSY: CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress -\ Destination Address - Not present"); - OstTrace0( TRACE_NORMAL, DUP4_CSATNOTIFYOPENCHANNEL_SIMMEINTERFACEANDDATADESTINATIONADDRESS, "CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress - Destination Address - Not present" ); + OstTrace0( TRACE_NORMAL, DUP4_CSATNOTIFYOPENCHANNEL_SIMMEINTERFACEANDDATADESTINATIONADDRESS_TD, "CSatNotifyOpenChannel::SimMeInterfaceAndDataDestinationAddress - Destination Address - Not present" ); aDestinationAddress.iType = RSat::EAddressNotPresent; } // End of Other Address - Set Destination Address @@ -8374,7 +8381,7 @@ RSat::TOtherAddress& aLocalAddress ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_LOCALADDRESS, "CSatNotifyOpenChannel::LocalAddress" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_LOCALADDRESS_TD, "CSatNotifyOpenChannel::LocalAddress" ); TFLOGSTRING("TSY: CSatNotifyOpenChannel::LocalAddress"); // Other Address - Set Local Address ( Optional ) @@ -8407,7 +8414,7 @@ else { TFLOGSTRING("TSY: CSatNotifyOpenChannel::LocalAddress - not present"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYOPENCHANNEL_LOCALADDRESS, "CSatNotifyOpenChannel::LocalAddress - not present" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYOPENCHANNEL_LOCALADDRESS_TD, "CSatNotifyOpenChannel::LocalAddress - not present" ); aLocalAddress.iType = RSat::EAddressNotPresent; } // End of If Other local address present } @@ -8424,7 +8431,7 @@ RSat::TOpenGprsChannelV4& aOpenGprsChannelV4 ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_GPRSBEARERSPECIFIC, "CSatNotifyOpenChannel::GprsBearerSpecific" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYOPENCHANNEL_GPRSBEARERSPECIFIC_TD, "CSatNotifyOpenChannel::GprsBearerSpecific" ); TFLOGSTRING("TSY: CSatNotifyOpenChannel::GprsBearerSpecific"); // Network Access Point Name ( Optional ) @@ -8435,7 +8442,7 @@ { TFLOGSTRING("TSY: CSatNotifyOpenChannel::GprsBearerSpecific -\ Access Point name"); - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYOPENCHANNEL_GPRSBEARERSPECIFIC, "CSatNotifyOpenChannel::GprsBearerSpecific - Access Point name" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYOPENCHANNEL_GPRSBEARERSPECIFIC_TD, "CSatNotifyOpenChannel::GprsBearerSpecific - Access Point name" ); aOpenGprsChannelV4.iAccessName = nanTlv.GetData( ETLV_NetworkAccessName ); } @@ -8462,7 +8469,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iGetChannelStatusRspV2Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYGETCHANNELSTATUS_CSATNOTIFYGETCHANNELSTATUS, "CSatNotifyGetChannelStatus::CSatNotifyGetChannelStatus" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYGETCHANNELSTATUS_CSATNOTIFYGETCHANNELSTATUS_TD, "CSatNotifyGetChannelStatus::CSatNotifyGetChannelStatus" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KPSessionTerminatedByUser @@ -8476,7 +8483,7 @@ // CSatNotifyGetChannelStatus::~CSatNotifyGetChannelStatus() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYGETCHANNELSTATUS_CSATNOTIFYGETCHANNELSTATUS, "CSatNotifyGetChannelStatus::~CSatNotifyGetChannelStatus" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYGETCHANNELSTATUS_CSATNOTIFYGETCHANNELSTATUS_TD, "CSatNotifyGetChannelStatus::~CSatNotifyGetChannelStatus" ); // None } @@ -8492,7 +8499,7 @@ const TIsiReceiveC& aIsiMessage // Received isi-message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYGETCHANNELSTATUS_MESSAGERECEIVED, "CSatNotifyGetChannelStatus::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYGETCHANNELSTATUS_MESSAGERECEIVED_TD, "CSatNotifyGetChannelStatus::MessageReceived" ); TFLOGSTRING("CSatNotifyGetChannelStatus::MessageReceived"); // Get ber tlv CBerTlv berTlv; @@ -8538,7 +8545,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYGETCHANNELSTATUS_NOTIFY, "CSatNotifyGetChannelStatus::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYGETCHANNELSTATUS_NOTIFY_TD, "CSatNotifyGetChannelStatus::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("CSatNotifyGetChannelStatus::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); iReqHandle = aReqHandle; @@ -8560,7 +8567,7 @@ TDes8* aRsp // Response package ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSE, "CSatNotifyGetChannelStatus::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYGETCHANNELSTATUS_TERMINALRESPONSE_TD, "CSatNotifyGetChannelStatus::TerminalResponse" ); TFLOGSTRING("CSatNotifyGetChannelStatus::TerminalResponse"); TInt ret( KErrNone ); TBuf8 additionalInfo; @@ -8611,7 +8618,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iCloseChannelRspV2Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYCLOSECHANNEL_CSATNOTIFYCLOSECHANNEL, "CSatNotifyCloseChannel::CSatNotifyCloseChannel" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYCLOSECHANNEL_CSATNOTIFYCLOSECHANNEL_TD, "CSatNotifyCloseChannel::CSatNotifyCloseChannel" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -8626,7 +8633,7 @@ // CSatNotifyCloseChannel::~CSatNotifyCloseChannel() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYCLOSECHANNEL_CSATNOTIFYCLOSECHANNEL, "CSatNotifyCloseChannel::~CSatNotifyCloseChannel" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYCLOSECHANNEL_CSATNOTIFYCLOSECHANNEL_TD, "CSatNotifyCloseChannel::~CSatNotifyCloseChannel" ); // None } @@ -8642,7 +8649,7 @@ const TIsiReceiveC& aIsiMessage // Received isi-message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYCLOSECHANNEL_MESSAGERECEIVED, "CSatNotifyCloseChannel::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYCLOSECHANNEL_MESSAGERECEIVED_TD, "CSatNotifyCloseChannel::MessageReceived" ); TFLOGSTRING("CSatNotifyCloseChannel::MessageReceived"); // Get ber tlv CBerTlv berTlv; @@ -8729,7 +8736,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYCLOSECHANNEL_NOTIFY, "CSatNotifyCloseChannel::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYCLOSECHANNEL_NOTIFY_TD, "CSatNotifyCloseChannel::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("CSatNotifyCloseChannel::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); iReqHandle = aReqHandle; @@ -8750,7 +8757,7 @@ TDes8* aRsp // Response package ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSE, "CSatNotifyCloseChannel::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYCLOSECHANNEL_TERMINALRESPONSE_TD, "CSatNotifyCloseChannel::TerminalResponse" ); TFLOGSTRING("CSatNotifyCloseChannel::TerminalResponse"); TInt ret( KErrNone ); TBuf8 additionalInfo; @@ -8800,7 +8807,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iSendDataRspV2Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDDATA_CSATNOTIFYSENDDATA, "CSatNotifySendData::CSatNotifySendData" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDDATA_CSATNOTIFYSENDDATA_TD, "CSatNotifySendData::CSatNotifySendData" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -8815,7 +8822,7 @@ // CSatNotifySendData::~CSatNotifySendData() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDDATA_CSATNOTIFYSENDDATA, "CSatNotifySendData::~CSatNotifySendData" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYSENDDATA_CSATNOTIFYSENDDATA_TD, "CSatNotifySendData::~CSatNotifySendData" ); // None } @@ -8831,7 +8838,7 @@ const TIsiReceiveC& aIsiMessage // Received isi-message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDDATA_MESSAGERECEIVED, "CSatNotifySendData::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDDATA_MESSAGERECEIVED_TD, "CSatNotifySendData::MessageReceived" ); TFLOGSTRING("CSatNotifySendData::MessageReceived"); // return value for completion of the request TInt ret( KErrNone ); @@ -8954,7 +8961,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYSENDDATA_NOTIFY, "CSatNotifySendData::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYSENDDATA_NOTIFY_TD, "CSatNotifySendData::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("CSatNotifySendData::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); iReqHandle = aReqHandle; @@ -8975,7 +8982,7 @@ TDes8* aRsp // Response package ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDDATA_TERMINALRESPONSE, "CSatNotifySendData::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYSENDDATA_TERMINALRESPONSE_TD, "CSatNotifySendData::TerminalResponse" ); TFLOGSTRING("CSatNotifySendData::TerminalResponse"); TInt ret( KErrNone ); TBuf8 additionalInfo; @@ -9026,7 +9033,7 @@ CSatNotificationsBase( aSatMessHandler, aSatMessaging ), iReceiveDataRspV2Pckg( NULL ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYRECEIVEDATA_CSATNOTIFYRECEIVEDATA, "CSatNotifyReceiveData::CSatNotifyReceiveData" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYRECEIVEDATA_CSATNOTIFYRECEIVEDATA_TD, "CSatNotifyReceiveData::CSatNotifyReceiveData" ); // Following results are also allowed for this command: // (in addition to result declared in base class constructor) iAllowedResults += RSat::KSuccessRequestedIconNotDisplayed @@ -9041,7 +9048,7 @@ // CSatNotifyReceiveData::~CSatNotifyReceiveData() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYRECEIVEDATA_CSATNOTIFYRECEIVEDATA, "CSatNotifyReceiveData::~CSatNotifyReceiveData" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYRECEIVEDATA_CSATNOTIFYRECEIVEDATA_TD, "CSatNotifyReceiveData::~CSatNotifyReceiveData" ); // None } @@ -9057,7 +9064,7 @@ const TIsiReceiveC& aIsiMessage // Received isi-message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYRECEIVEDATA_MESSAGERECEIVED, "CSatNotifyReceiveData::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYRECEIVEDATA_MESSAGERECEIVED_TD, "CSatNotifyReceiveData::MessageReceived" ); TFLOGSTRING("CSatNotifyReceiveData::MessageReceived"); // return value for completion of the request TInt ret( KErrNone ); @@ -9163,7 +9170,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace1( TRACE_NORMAL, CSATNOTIFYRECEIVEDATA_NOTIFY, "CSatNotifyReceiveData::Notify Handle: %u", aReqHandle ); + OstTrace1( TRACE_NORMAL, CSATNOTIFYRECEIVEDATA_NOTIFY_TD, "CSatNotifyReceiveData::Notify Handle: %u", aReqHandle ); TFLOGSTRING2("CSatNotifyReceiveData::Notify. \n\t\t\t Handle:%d\n\t\t\t", aReqHandle ); iReqHandle = aReqHandle; @@ -9184,7 +9191,7 @@ TDes8* aRsp // Response package ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYRECEIVEDATA_TERMINALRESPONSE, "CSatNotifyReceiveData::TerminalResponse" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYRECEIVEDATA_TERMINALRESPONSE_TD, "CSatNotifyReceiveData::TerminalResponse" ); TFLOGSTRING("CSatNotifyReceiveData::TerminalResponse"); TInt ret( KErrNone ); TBuf8 additionalInfo; @@ -9235,7 +9242,7 @@ CTsySatMessaging* aSatMessaging //Pointer to satmessaging class ) : CSatNotificationsBase( aSatMessHandler, aSatMessaging ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYMOSMCONTROLREQUEST_CSATNOTIFYMOSMCONTROLREQUEST, "CSatNotifyMoSmControlRequest::CSatNotifyMoSmControlRequest" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYMOSMCONTROLREQUEST_CSATNOTIFYMOSMCONTROLREQUEST_TD, "CSatNotifyMoSmControlRequest::CSatNotifyMoSmControlRequest" ); } // ----------------------------------------------------------------------------- @@ -9245,7 +9252,7 @@ // CSatNotifyMoSmControlRequest::~CSatNotifyMoSmControlRequest() { - OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYMOSMCONTROLREQUEST_CSATNOTIFYMOSMCONTROLREQUEST, "CSatNotifyMoSmControlRequest::~CSatNotifyMoSmControlRequest" ); + OstTrace0( TRACE_NORMAL, DUP1_CSATNOTIFYMOSMCONTROLREQUEST_CSATNOTIFYMOSMCONTROLREQUEST_TD, "CSatNotifyMoSmControlRequest::~CSatNotifyMoSmControlRequest" ); // None } @@ -9261,7 +9268,7 @@ const TIsiReceiveC& /*aIsiMessage*/ // ISI message ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYMOSMCONTROLREQUEST_MESSAGERECEIVED, "CSatNotifyMoSmControlRequest::MessageReceived" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYMOSMCONTROLREQUEST_MESSAGERECEIVED_TD, "CSatNotifyMoSmControlRequest::MessageReceived" ); // In S60 phones, the MoSm control request is received via an ISI // message coming from the SMS server. That's why the body // of this method is empty, see the class CSatMoSmCtrl. The Etel Sat API is used @@ -9282,7 +9289,7 @@ RSat::TControlResult aResult // Call Control result ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFICATION, "CSatNotifyMoSmControlRequest::CompleteNotification" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYMOSMCONTROLREQUEST_COMPLETENOTIFICATION_TD, "CSatNotifyMoSmControlRequest::CompleteNotification" ); TFLOGSTRING("CSatNotifyMoSmControlRequest::CompleteNotification"); //check that a client has requested this notifications if ( iReqHandle ) @@ -9320,7 +9327,7 @@ TDes8* aDataPtr // Pointer to data ) { - OstTrace0( TRACE_NORMAL, CSATNOTIFYMOSMCONTROLREQUEST_NOTIFY, "CSatNotifyMoSmControlRequest::Notify" ); + OstTrace0( TRACE_NORMAL, CSATNOTIFYMOSMCONTROLREQUEST_NOTIFY_TD, "CSatNotifyMoSmControlRequest::Notify" ); TFLOGSTRING("CSatNotifyMoSmControlRequest::Notify"); iReqHandle = aReqHandle; iMoSmControlV1Pckg = static_cast< RSat::TMoSmControlV1Pckg* >( aDataPtr ); diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/src/sattimer.cpp --- a/adaptationlayer/tsy/simatktsy_dll/src/sattimer.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/src/sattimer.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -61,7 +61,7 @@ iEnvelopeTable( NULL ) { - OstTrace0( TRACE_DETAILED, CSATTIMER_CSATTIMER, "CSatTimer::CSatTimer" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_CSATTIMER_TD, "CSatTimer::CSatTimer" ); } @@ -72,7 +72,7 @@ // void CSatTimer::ConstructL() { - OstTrace0( TRACE_DETAILED, CSATTIMER_CONSTRUCTL, "CSatTimer::ConstructL" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_CONSTRUCTL_TD, "CSatTimer::ConstructL" ); TFLOGSTRING("TSY: CSatTimer::ConstructL"); iTimerTable = new ( ELeave ) RArray( 8 ); @@ -94,7 +94,7 @@ CTsySatMessaging* aSatMessaging ) { - OstTrace0( TRACE_DETAILED, CSATTIMER_NEWL, "CSatTimer::NewL" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_NEWL_TD, "CSatTimer::NewL" ); TFLOGSTRING("TSY: CSatTimer::NewL"); CSatTimer* self = new( ELeave ) CSatTimer( aSatMessHandler, aSatMessaging ); @@ -114,7 +114,7 @@ // CSatTimer::~CSatTimer() { - OstTrace0( TRACE_DETAILED, DUP1_CSATTIMER_CSATTIMER, "CSatTimer::~CSatTimer" ); + OstTrace0( TRACE_INTERNALS, DUP1_CSATTIMER_CSATTIMER_TD, "CSatTimer::~CSatTimer" ); TFLOGSTRING("TSY: CSatTimer::~CSatTimer"); if ( iTimer ) @@ -145,12 +145,12 @@ // void CSatTimer::Start() { - OstTrace0( TRACE_DETAILED, CSATTIMER_START, "CSatTimer::Start" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_START_TD, "CSatTimer::Start" ); //Check if timer is active just in case if ( !iTimer->IsActive() ) { TFLOGSTRING("TSY: CSatTimer::Start: Timer started"); - OstTrace0( TRACE_DETAILED, DUP1_CSATTIMER_START, "CSatTimer::Start: Timer started" ); + OstTrace0( TRACE_INTERNALS, DUP1_CSATTIMER_START_TD, "CSatTimer::Start: Timer started" ); //Timer will tick every half second TCallBack callback( Tick, this ); iTimer->Start( KTick, KTick, callback ); @@ -169,7 +169,7 @@ TUint32 aTimerValue ) { - OstTrace0( TRACE_DETAILED, CSATTIMER_STARTTIMER, "CSatTimer::StartTimer" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_STARTTIMER_TD, "CSatTimer::StartTimer" ); TFLOGSTRING("TSY: CSatTimer::StartTimer"); TInt ret( KErrNone ); // Check if the entry is already in the table and delete if found. @@ -206,7 +206,7 @@ TInt aTimerId ) { - OstTrace0( TRACE_DETAILED, CSATTIMER_RESTARTTIMER, "CSatTimer::RestartTimer" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_RESTARTTIMER_TD, "CSatTimer::RestartTimer" ); TFLOGSTRING("TSY: CSatTimer::RestartTimer"); TInt ret( KErrNone ); @@ -234,7 +234,7 @@ { TFLOGSTRING2("TSY: CSatTimer::ReStart - Requested ID (%d) not found!", aTimerId); - OstTrace1( TRACE_DETAILED, DUP1_CSATTIMER_RESTARTTIMER, "CSatTimer::RestartTimer - Requested ID (%d) not found!", aTimerId ); + OstTrace1( TRACE_INTERNALS, DUP1_CSATTIMER_RESTARTTIMER_TD, "CSatTimer::RestartTimer - Requested ID (%d) not found!", aTimerId ); ret = KErrNotFound; } @@ -251,7 +251,7 @@ // void CSatTimer::Stop() { - OstTrace0( TRACE_DETAILED, CSATTIMER_STOP, "CSatTimer::Stop" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_STOP_TD, "CSatTimer::Stop" ); // If both timer and envelope arrays are empty, stop the timer. // Also if timer table is empty, clear the second counter. if ( iTimer->IsActive () ) @@ -260,13 +260,13 @@ && !iTimerTable->Count() ) { TFLOGSTRING("TSY: CSatTimer::Stop: Timer stopped"); - OstTrace0( TRACE_DETAILED, DUP1_CSATTIMER_STOP, "CSatTimer::Stop: Timer stopped" ); + OstTrace0( TRACE_INTERNALS, DUP1_CSATTIMER_STOP_TD, "CSatTimer::Stop: Timer stopped" ); iTimer->Cancel(); } if ( !iTimerTable->Count() ) { TFLOGSTRING("TSY: CSatTimer::Stop: Second counters cleared"); - OstTrace0( TRACE_DETAILED, DUP2_CSATTIMER_STOP, "CSatTimer::Stop: Second counters cleared" ); + OstTrace0( TRACE_INTERNALS, DUP2_CSATTIMER_STOP_TD, "CSatTimer::Stop: Second counters cleared" ); iSecondsPassed = 0; iHalfSecondTick = EFalse; } @@ -302,7 +302,7 @@ TFLOGSTRING2("TSY: CSatTimer::Tick, seconds %d", satTimer->iSecondsPassed ); - OstTrace1( TRACE_DETAILED, CSATTIMER_TICK, "CSatTimer::Tick, seconds %u", satTimer->iSecondsPassed ); + OstTrace1( TRACE_INTERNALS, CSATTIMER_TICK_TD, "CSatTimer::Tick, seconds %u", satTimer->iSecondsPassed ); for( TInt i = tableSize - 1; KZero <= i; i-- ) { @@ -349,7 +349,7 @@ { TFLOGSTRING2("TSY: CSatTimer::Tick: \ Resending type %x envelope", current.iType ); - OstTraceExt1( TRACE_DETAILED, DUP1_CSATTIMER_TICK, "CSatTimer::Tick Resending type %hhu envelope", current.iType ); + OstTraceExt1( TRACE_INTERNALS, DUP1_CSATTIMER_TICK_TD, "CSatTimer::Tick Resending type %hhu envelope", current.iType ); // Deactivate envelope just in case. Get new transaction // if for envelope and resend it. Finally remove the @@ -383,7 +383,7 @@ TInt aTimerId ) { - OstTrace0( TRACE_DETAILED, CSATTIMER_CHECKTIMERTABLE, "CSatTimer::CheckTimerTable" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_CHECKTIMERTABLE_TD, "CSatTimer::CheckTimerTable" ); TFLOGSTRING("TSY: CSatTimer::CheckTimerTable"); TBool ret( EFalse ); @@ -411,7 +411,7 @@ TInt aTimerId // Timer identifier ) { - OstTrace0( TRACE_DETAILED, CSATTIMER_DELETETIMERBYID, "CSatTimer::DeleteTimerById" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_DELETETIMERBYID_TD, "CSatTimer::DeleteTimerById" ); TFLOGSTRING("TSY: CSatTimer::DeleteTimerById"); TInt ret( KErrNotFound ); @@ -449,7 +449,7 @@ TInt aTimerId // Timer identifier ) { - OstTrace0( TRACE_DETAILED, CSATTIMER_GETCURRENTVALUEOFTIMERBYID, "CSatTimer::GetCurrentValueOfTimerById" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_GETCURRENTVALUEOFTIMERBYID_TD, "CSatTimer::GetCurrentValueOfTimerById" ); TFLOGSTRING("TSY: CSatTimer::GetCurrentValueOfTimerById"); TInt ret( KErrNotFound ); @@ -492,7 +492,7 @@ const TDesC8& aEnvelope ) { - OstTrace0( TRACE_DETAILED, CSATTIMER_STOREENVELOPE, "CSatTimer::StoreEnvelope" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_STOREENVELOPE_TD, "CSatTimer::StoreEnvelope" ); TFLOGSTRING("TSY: CSatTimer::StoreEnvelope"); TInt ret( KErrNone ); @@ -525,14 +525,14 @@ TFLOGSTRING2("CSatTimer::StoreEnvelope \ Stored envelopes: % d", iEnvelopeTable->Count() ); - OstTrace1( TRACE_DETAILED, DUP1_CSATTIMER_STOREENVELOPE, "CSatTimer::StoreEnvelope Stored envelopes: %d", iEnvelopeTable->Count() ); + OstTrace1( TRACE_INTERNALS, DUP1_CSATTIMER_STOREENVELOPE_TD, "CSatTimer::StoreEnvelope Stored envelopes: %d", iEnvelopeTable->Count() ); } else { TFLOGSTRING2("CSatTimer::StoreEnvelope \ Storing failed, not an envelope! %x", aEnvelope[KZero] ); - OstTraceExt1( TRACE_DETAILED, DUP2_CSATTIMER_STOREENVELOPE, "CSatTimer::StoreEnvelope Storing failed, not an envelope! %s", aEnvelope[KZero] ); + OstTraceExt1( TRACE_INTERNALS, DUP2_CSATTIMER_STOREENVELOPE_TD, "CSatTimer::StoreEnvelope Storing failed, not an envelope! %s", aEnvelope[KZero] ); ret = KErrArgument; } @@ -541,7 +541,7 @@ { TFLOGSTRING2(" CSatTimer::StoreEnvelope \ Envelope with requested ID %d already exist!", aTId ); - OstTraceExt1( TRACE_DETAILED, DUP3_CSATTIMER_STOREENVELOPE, "CSatTimer::StoreEnvelope Envelope with requested ID %hhd already exists!", aTId ); + OstTraceExt1( TRACE_INTERNALS, DUP3_CSATTIMER_STOREENVELOPE_TD, "CSatTimer::StoreEnvelope Envelope with requested ID %hhd already exists!", aTId ); ret = KErrAlreadyExists; } @@ -561,7 +561,7 @@ const TUint8 aCause ) { - OstTrace0( TRACE_DETAILED, CSATTIMER_ACTIVATEENVELOPERESEND, "CSatTimer::ActivateEnvelopeResend" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_ACTIVATEENVELOPERESEND_TD, "CSatTimer::ActivateEnvelopeResend" ); TFLOGSTRING("TSY: CSatTimer::ActivateEnvelopeResend"); TInt ret( LocateEnvelope( aTId ) ); @@ -626,7 +626,7 @@ { TFLOGSTRING("TSY: CSatTimer::ActivateEnvelopeResend \ Resending activated"); - OstTrace0( TRACE_DETAILED, DUP1_CSATTIMER_ACTIVATEENVELOPERESEND, "CSatTimer::ActivateEnvelopeResend Resending activated" ); + OstTrace0( TRACE_INTERNALS, DUP1_CSATTIMER_ACTIVATEENVELOPERESEND_TD, "CSatTimer::ActivateEnvelopeResend Resending activated" ); // (Re)start the timer if needed Start(); } @@ -634,7 +634,7 @@ { TFLOGSTRING2("TSY: CSatTimer::ActivateEnvelopeResend \ Resending NOT activated. Cause: %x", aCause ); - OstTraceExt1( TRACE_DETAILED, DUP2_CSATTIMER_ACTIVATEENVELOPERESEND, "CSatTimer::ActivateEnvelopeResend Resending NOT activated. Cause: %hhu", aCause ); + OstTraceExt1( TRACE_INTERNALS, DUP2_CSATTIMER_ACTIVATEENVELOPERESEND_TD, "CSatTimer::ActivateEnvelopeResend Resending NOT activated. Cause: %hhu", aCause ); RemoveEnvelope( aTId ); } } @@ -656,7 +656,7 @@ TBool aRemoveTimer ) { - OstTrace0( TRACE_DETAILED, CSATTIMER_REMOVEENVELOPE, "CSatTimer::RemoveEnvelope" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_REMOVEENVELOPE_TD, "CSatTimer::RemoveEnvelope" ); TFLOGSTRING("TSY: CSatTimer::RemoveEnvelope"); TInt ret( LocateEnvelope( aTId ) ); @@ -697,7 +697,7 @@ const TUint8 aTId ) { - OstTrace0( TRACE_DETAILED, CSATTIMER_LOCATEENVELOPE, "CSatTimer::LocateEnvelope" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_LOCATEENVELOPE_TD, "CSatTimer::LocateEnvelope" ); TFLOGSTRING("TSY: CSatTimer::LocateEnvelope"); TInt ret( KErrNotFound ); @@ -709,7 +709,7 @@ { TFLOGSTRING2("TSY: CSatTimer::LocateEnvelope \ Requested envelope was found at index %d", i ); - OstTrace1( TRACE_DETAILED, DUP1_CSATTIMER_LOCATEENVELOPE, "CSatTimer::LocateEnvelope Requested envelope was found at index %d", i ); + OstTrace1( TRACE_INTERNALS, DUP1_CSATTIMER_LOCATEENVELOPE_TD, "CSatTimer::LocateEnvelope Requested envelope was found at index %d", i ); ret = i; } } @@ -729,7 +729,7 @@ TBool aStatus ) { - OstTrace0( TRACE_DETAILED, CSATTIMER_SETPROACTIVECOMMANDONGOINGSTATUS, "CSatTimer::SetProactiveCommandOnGoingStatus" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_SETPROACTIVECOMMANDONGOINGSTATUS_TD, "CSatTimer::SetProactiveCommandOnGoingStatus" ); iProactiveCommandOnGoing = aStatus; TInt tableSize( iTimerTable->Count() ); @@ -760,7 +760,7 @@ // void CSatTimer::ClearTimerTable() { - OstTrace0( TRACE_DETAILED, CSATTIMER_CLEARTIMERTABLE, "CSatTimer::ClearTimerTable" ); + OstTrace0( TRACE_INTERNALS, CSATTIMER_CLEARTIMERTABLE_TD, "CSatTimer::ClearTimerTable" ); if ( KZero != iTimerTable->Count() ) { diff -r 6295dc2169f3 -r 8486d82aef45 adaptationlayer/tsy/simatktsy_dll/src/satutil.cpp --- a/adaptationlayer/tsy/simatktsy_dll/src/satutil.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/adaptationlayer/tsy/simatktsy_dll/src/satutil.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -91,7 +91,7 @@ // TTransIdMessage::TTransIdMessage() : iTransNum(KTransactionIdMinNumber) { - OstTrace0( TRACE_NORMAL, TTRANSIDMESSAGE_TTRANSIDMESSAGE, "TTransIdMessage::TTransIdMessage" ); + OstTrace0( TRACE_NORMAL, TTRANSIDMESSAGE_TTRANSIDMESSAGE_TD, "TTransIdMessage::TTransIdMessage" ); } // ----------------------------------------------------------------------------- @@ -101,7 +101,7 @@ // 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 @@ -127,7 +127,7 @@ 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 ); @@ -210,7 +210,7 @@ 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 ); @@ -288,7 +288,7 @@ 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. @@ -343,7 +343,7 @@ 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; @@ -405,7 +405,7 @@ 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. @@ -431,9 +431,9 @@ if ( aOutput.Length() == outputMaxLength ) { - OstTrace0( TRACE_NORMAL, DUP1_TSATUTILITY_BCDTOASCII, "TSatUtility::BCDToAscii, probably dropped characters" ); - OstTraceExt2( TRACE_NORMAL, DUP2_TSATUTILITY_BCDTOASCII, "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() ); + OstTrace0( TRACE_NORMAL, DUP1_TSATUTILITY_BCDTOASCII_TD, "TSatUtility::BCDToAscii, probably dropped characters" ); + OstTraceExt2( TRACE_NORMAL, DUP2_TSATUTILITY_BCDTOASCII_TD, "Input buffer length: %d, possible characters: %d", len, len * 2 ); + 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"); @@ -457,7 +457,7 @@ ) { - OstTrace0( TRACE_NORMAL, TSATUTILITY_REMOVEEXPANSIONDIGIT, "TSatUtility::RemoveExpansionDigit" ); + OstTrace0( TRACE_NORMAL, TSATUTILITY_REMOVEEXPANSIONDIGIT_TD, "TSatUtility::RemoveExpansionDigit" ); TFLOGSTRING("TSY: TSatUtility::RemoveExpansionDigit"); TInt pos( 0 ); @@ -482,7 +482,7 @@ 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; @@ -513,7 +513,7 @@ 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; } @@ -556,7 +556,7 @@ 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()) @@ -578,7 +578,7 @@ 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" ); } } @@ -594,7 +594,7 @@ 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 @@ -618,7 +618,7 @@ 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 ); @@ -710,7 +710,7 @@ { 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; @@ -729,7 +729,7 @@ { 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." ); } } @@ -746,7 +746,7 @@ 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 @@ -1036,7 +1036,7 @@ 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; @@ -1094,7 +1094,7 @@ 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; @@ -1129,7 +1129,7 @@ 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 ) @@ -1230,7 +1230,7 @@ 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() ) @@ -1284,7 +1284,7 @@ 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" ); } } @@ -1300,7 +1300,7 @@ 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 @@ -1380,7 +1380,7 @@ 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" ); } @@ -1395,7 +1395,7 @@ 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; } @@ -1432,7 +1432,7 @@ 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" ); } } @@ -1449,7 +1449,7 @@ 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 @@ -1549,7 +1549,7 @@ 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 ); @@ -1568,7 +1568,7 @@ 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 ) ); @@ -1588,7 +1588,7 @@ 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 ) @@ -1599,7 +1599,7 @@ 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 ); @@ -1613,7 +1613,7 @@ 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 ); diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/group/bld.inf --- a/connectivitylayer/group/bld.inf Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/group/bld.inf Tue Oct 19 13:16:20 2010 +0300 @@ -24,6 +24,7 @@ #include "../usbphonetlink/group/bld.inf" #include "../isce/group/bld.inf" #include "../isimessage/group/bld.inf" +#include "../ist/group/bld.inf" PRJ_EXPORTS ../rom/connectivitylayer.iby NON_FOUNDATION_CORE_ADAPT_LAYER_IBY_EXPORT_PATH(connectivitylayer.iby) diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/group/bld.inf --- a/connectivitylayer/isce/group/bld.inf Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/group/bld.inf Tue Oct 19 13:16:20 2010 +0300 @@ -15,12 +15,8 @@ * */ - -//#define INTERNAL_FLAG_ISI_ROUTER_IN_USE // see nameservice,communicationmanager too #include -#define NCP_COMMON_RD_ISCE_IN_USE -#ifdef NCP_COMMON_RD_ISCE_IN_USE // Internal R&D flag PRJ_PLATFORMS BASEDEFAULT @@ -34,7 +30,7 @@ ../ismpmultiplexer_dll/inc/mmuxtrxif.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(mmuxtrxif.h) ../ismpmultiplexer_dll/inc/trxdefs.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(trxdefs.h) -// P2P API +// Point-to-Point (P2P) API ../p2papi_dll/inc/p2pif.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(p2pif.h) ../p2prouter_dll/inc/mp2pif.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(mp2pif.h) ../p2prouter_dll/inc/p2pdefs.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(p2pdefs.h) @@ -44,35 +40,50 @@ // ISC & ISI -#ifdef INTERNAL_FLAG_ISI_ROUTER_IN_USE -../isirouter_dll/inc/misiif.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(misiif.h) -#endif +../isirouter_dll/inc/routerisi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(routerisi.h) +../isirouter_dll/inc/misiif.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(misiif.h) + +// ISC & ISI ../isaaccessextension_dll/inc/isakernelapi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(isakernelapi.h) ../isaaccessextension_dll/inc/iscnokiadefinitions.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(iscnokiadefinitions.h) ../iscapi_dll/inc/iscdefinitions.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(iscdefinitions.h) -#if (NCP_COMMON_SOS_VERSION_SUPPORT >= SOS_VERSION_95) ../iscapi_dll/inc/iscapi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(iscapi.h) -#endif + +// IAD +../isaaccessextension_dll/inc/mist2iadapi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(mist2iadapi.h) +../isaaccessextension_dll/inc/miad2istapi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(miad2istapi.h) + +../isipipehandler_dll/inc/pipeisi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(wgmodem25/pipeisi.h) +../isipipehandler_dll/inc/pipe_sharedisi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(wgmodem25/pipe_sharedisi.h) + +// ISI COMMON PEP +../isicommonpep_dll/inc/misicommonpep.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(misicommonpep.h) + +../isicommunicationmanager_dll/inc/ape_commgrisi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(ape_commgrisi.h) +//Media +../isimediaapi_dll/inc/isimediaif.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(isimediaif.h) PRJ_MMPFILES ../ismpmultiplexer_dll/group/ismpmultiplexer.mmp ../memmanager_dll/group/memmanager.mmp -// P2P + +// Point-To-Point (P2P) API ../p2prouter_dll/group/p2prouter.mmp ../p2papi_dll/group/p2papi.mmp -// ISC & ISI -#ifdef INTERNAL_FLAG_ISI_ROUTER_IN_USE -../isirouter_dll/group/isirouter.mmp -../isiapi_dll/group/isiapi.mmp -../isinameservice_dll/group/isinameservice_isirouter.mmp -../isicommunicationmanager_dll/group/isicommunicationmanager_isirouter.mmp -#endif + +// ISC and ISA Kernel APIs ../isaaccessextension_dll/group/isaaccessextension.mmp ../isaaccessldd_ldd/group/isaaccessesldd.mmp ../iscapi_dll/group/isauserapi.mmp + +// ISI API +../isirouter_dll/group/isirouter.mmp +../isiapi_dll/group/isiapi.mmp ../isinameservice_dll/group/isinameservice.mmp ../isicommunicationmanager_dll/group/isicommunicationmanager.mmp -// No actions -#endif // NCP_COMMON_RD_ISCE_IN_USE +../isipipehandler_dll/group/isipipehandler.mmp +// ISI COMMON PEP +// NOT READY ../isicommonpep_dll/group/isicommonpep.mmp +../isimediaapi_dll/group/isimediaapi.mmp // End of File diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isaaccessextension_dll/eabi/isakernelapiu.def --- a/connectivitylayer/isce/isaaccessextension_dll/eabi/isakernelapiu.def Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isaaccessextension_dll/eabi/isakernelapiu.def Tue Oct 19 13:16:20 2010 +0300 @@ -24,7 +24,7 @@ _ZN13DIsaKernelAPID1Ev @ 23 NONAME _ZN13DIsaKernelAPID2Ev @ 24 NONAME _ZN19DIsaAccessExtension12GetDFCThreadE13TIADDfcThread @ 25 NONAME - _ZN7DRouter14DummyDoNothingEv @ 26 NONAME + _ZN11MIST2IADApi7GetSelfEv @ 26 NONAME _ZN19DIsaAccessExtension17GetChannel2IADApiEv @ 27 NONAME _ZN6DQueue3AddERK6TDesC8 @ 28 NONAME _ZN6DQueue3GetEv @ 29 NONAME @@ -41,7 +41,7 @@ _ZN7DRouter14GetMaxDataSizeEv @ 40 NONAME _ZN7DRouter14SendIndicationER5TDes8t @ 41 NONAME _ZN7DRouter15DeAllocateBlockER5TDes8 @ 42 NONAME - _ZN7DRouter15DummyDoNothing2Ev @ 43 NONAME + _ZN7DRouter14ReceiveMessageER5TDes8 @ 43 NONAME _ZN7DRouter15OrderIndicationER5TDes8ti @ 44 NONAME _ZN7DRouter17AllocateDataBlockEt @ 45 NONAME _ZN7DRouter19GetConnectionStatusEv @ 46 NONAME @@ -63,5 +63,11 @@ _ZN9DReqQueueD1Ev @ 62 NONAME _ZN9DReqQueueD2Ev @ 63 NONAME _ZNK13DIsaKernelAPI23NotifyStateChangeCancelEv @ 64 NONAME - _ZN18MISIObjectRouterIf7ConnectElRhP18MISIRouterObjectIf @ 65 NONAME + _ZN7DRouter14GetBlockConfigEv @ 65 NONAME + _ZN7DRouter22NotifyConnectionStatusEN11MIST2IADApi20TISTConnectionStatusE @ 66 NONAME + _ZN7DRouter8RegisterEP11MIAD2ISTApi @ 67 NONAME + _ZThn4_N7DRouter14GetBlockConfigEv @ 68 NONAME + _ZThn4_N7DRouter14ReceiveMessageER5TDes8 @ 69 NONAME + _ZThn4_N7DRouter22NotifyConnectionStatusEN11MIST2IADApi20TISTConnectionStatusE @ 70 NONAME + _ZThn4_N7DRouter8RegisterEP11MIAD2ISTApi @ 71 NONAME diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isaaccessextension_dll/group/isaaccessextension.mmp --- a/connectivitylayer/isce/isaaccessextension_dll/group/isaaccessextension.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isaaccessextension_dll/group/isaaccessextension.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -15,72 +15,48 @@ * */ -// NOTE! MISSING SUPPORT > -// -// Missing support for NCP_COMMON_BRIDGE_FAMILY_PIPE_SUPPORT, NCP_COMMON_BRIDGE_FAMILY_NAME_SERVICE_SUPPORT -// Using legacy indicationhandler -// -// NOTE! MISSING SUPPORT < - #include #include -#include "kernel/kern_ext.mmh" - +#include "kernel/kern_ext.mmh" +FEATUREVARIANT TARGET isaaccessextension.dll -TARGETTYPE kext +TARGETTYPE kext linkas isaaccessextension.dll UID 0x20012481 // UID: 536945793 VENDORID VID_DEFAULT CAPABILITY ALL -FEATUREVARIANT + EPOCALLOWDLLDATA SMPSAFE -SOURCEPATH ../src -SOURCE isakernelapi.cpp -SOURCE iadtrace.cpp -SOURCE isaaccessextension.cpp -SOURCE isakernelchannel.cpp -SOURCE queue.cpp -SOURCE router.cpp - -#ifdef NCP_COMMON_BRIDGE_FAMILY_PIPE_SUPPORT -SOURCE pep.cpp -SOURCE peptransceiver.cpp -SOURCE pipehandler.cpp -#endif -// ISCE -SOURCE isilink.cpp -// ISCE - USERINCLUDE ../inc -USERINCLUDE ../../ismpmultiplexer_dll/inc -// ISCE -USERINCLUDE ../../memmanager_dll/inc -USERINCLUDE ../../isicommunicationmanager_dll/inc -// ISCE -// ISI -USERINCLUDE ../../isirouter_dll/inc -//ISI USERINCLUDE ../traces +SOURCEPATH ../src + +USERINCLUDE ../../isirouter_dll/inc +USERINCLUDE ../../isicommunicationmanager_dll/inc +USERINCLUDE ../../memmanager_dll/inc + + +SOURCE common_wrapper.cpp +SOURCE isakernelapi_wrapper.cpp +SOURCE isaaccessextension_wrapper.cpp +SOURCE queue_wrapper.cpp +SOURCE router_wrapper.cpp + +LIBRARY isirouter.lib +LIBRARY memmanager.lib + OS_LAYER_SYSTEMINCLUDE -NON_FOUNDATION_ADAPT_LAYER_SYSTEMINCLUDE // FOR isakernelapi.h -SYSTEMINCLUDE /epoc32/include/kernel -SYSTEMINCLUDE /epoc32/include/nkern +NON_FOUNDATION_ADAPT_LAYER_SYSTEMINCLUDE +SYSTEMINCLUDE /epoc32/include/kernel +SYSTEMINCLUDE /epoc32/include/nkern -#if (NCP_COMMON_SOS_VERSION_SUPPORT >= SOS_VERSION_95) DEFFILE isakernelapi.def -#else -// TODO NOTE BC DEFFILE old_isakernelapi.def -#endif -// ISCE -LIBRARY memmanager.lib -LIBRARY ismpmultiplexer.lib -// ISCE START WINS win32_library kernel32.lib END @@ -96,3 +72,4 @@ //MACRO FULL_DATA_DUMP +MACRO ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isaaccessextension_dll/inc/iadinternaldefinitions.h --- a/connectivitylayer/isce/isaaccessextension_dll/inc/iadinternaldefinitions.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isaaccessextension_dll/inc/iadinternaldefinitions.h Tue Oct 19 13:16:20 2010 +0300 @@ -127,17 +127,17 @@ //////////////////////////////// DO NOT EDIT BEFORE THIS //////////////////////////////// -const TInt KIADMaxIsiMsgSize( 2048 ); // TODO: to be changed for MINI_OS could it be static? +const TInt KIADMaxIsiMsgSize( 2048 ); // to be changed for MINI_OS could it be static? // QUEUE CONFIGURATIONS -// TODO: configure properly +// configure properly const TInt KIADExtensionRxQueueSize( 200);//50 ); const TInt KIADLddFlowCtrlRxQueuSize( 5 ); const TInt KIADLddRxQueuSize( 50 ); const TInt KIADLddDataRxQueuSize( KIADChDataRxQueueSize ); const TInt KIADKernelRxQueuSize( 50 ); const TInt KIADKernelDataRxQueuSize( 100 ); -// Re-used due to buffer configurations TODO: how to ensure enough blocks without cbfc and knowing how big is the IST send que? +// Re-used due to buffer configurations how to ensure enough blocks without cbfc and knowing how big is the IST send que? const TInt KTotalDataSpace( KIADLddDataRxQueuSize + 50 ); // DFC Thread names. @@ -186,10 +186,8 @@ EIADDeAllocateDataBlock, EIADDeAllocateBlockInternal, EIADDeAllocateDataBlockInternal, -#if (NCP_COMMON_SOS_VERSION_SUPPORT >= SOS_VERSION_95) EIADLoan, - EIADReturnLoan, -#endif + EIADReturnLoan }; // FUNCTION PROTOTYPES diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isaaccessextension_dll/inc/iadnokiadefinitions.h --- a/connectivitylayer/isce/isaaccessextension_dll/inc/iadnokiadefinitions.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isaaccessextension_dll/inc/iadnokiadefinitions.h Tue Oct 19 13:16:20 2010 +0300 @@ -42,7 +42,7 @@ // MACROS // DATA TYPES -// For BC reasons see (iscnokiadefinitions.h). // TODO: change to here! +// For BC reasons see (iscnokiadefinitions.h). // change to here! enum TIADCustomFunctions { EIADCustomAsyncSubscribeIndications = EIscNokiaAsyncEventSubscribe, diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isaaccessextension_dll/inc/iadtrace.h --- a/connectivitylayer/isce/isaaccessextension_dll/inc/iadtrace.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isaaccessextension_dll/inc/iadtrace.h Tue Oct 19 13:16:20 2010 +0300 @@ -60,6 +60,8 @@ EIADCommon, // 0x1b ident 0 EIADOverTheLimits, // 0x1c ident 43 EIADDesWriteFailed, // 0x1d ident 4 + EIADInvalidRcvMsg, // 0x1e ident 0 + EIADInvalidRcvMsg2, // 0x1f ident 0 }; // Used to identify code line where reset happens enum TIADFaultIdentifier @@ -89,24 +91,41 @@ EIADFaultIdentifier23, // 0x17 EIADFaultIdentifier24, // 0x18 EIADFaultIdentifier25, // 0x19 - EIADFaultIdentifier26, // 0x1a - EIADFaultIdentifier27, // 0x1b - EIADFaultIdentifier28, // 0x1c - EIADFaultIdentifier29, // 0x1d - EIADFaultIdentifier30, // 0x1e - EIADFaultIdentifier31, // 0x1f - EIADFaultIdentifier32, // 0x20 - EIADFaultIdentifier33, // 0x21 - EIADFaultIdentifier34, // 0x22 - EIADFaultIdentifier35, // 0x23 - EIADFaultIdentifier36, // 0x24 - EIADFaultIdentifier37, // 0x25 - EIADFaultIdentifier38, // 0x26 - EIADFaultIdentifier39, // 0x27 - EIADFaultIdentifier40, // 0x28 - EIADFaultIdentifier41, // 0x29 - EIADFaultIdentifier42, // 0x2a - EIADFaultIdentifier43, // 0x2b + EIADFaultIdentifier26, // 0x20 + EIADFaultIdentifier27, // 0x21 + EIADFaultIdentifier28, // 0x22 + EIADFaultIdentifier29, // 0x23 + EIADFaultIdentifier30, // 0x24 + EIADFaultIdentifier31, // 0x25 + EIADFaultIdentifier32, // 0x26 + EIADFaultIdentifier33, // 0x27 + EIADFaultIdentifier34, // 0x28 + EIADFaultIdentifier35, // 0x29 + EIADFaultIdentifier36, // 0x2a + EIADFaultIdentifier37, // 0x2b + EIADFaultIdentifier38, // 0x2c + EIADFaultIdentifier39, // 0x2d + EIADFaultIdentifier40, // 0x2e + EIADFaultIdentifier41, // 0x2f + EIADFaultIdentifier42, // 0x30 + EIADFaultIdentifier43, // 0x31 + EIADFaultIdentifier44, // 0x32 + EIADFaultIdentifier45, // 0x33 + EIADFaultIdentifier46, // 0x34 + EIADFaultIdentifier47, // 0x35 + EIADFaultIdentifier48, // 0x36 + EIADFaultIdentifier49, // 0x37 + EIADFaultIdentifier50, // 0x38 + EIADFaultIdentifier51, // 0x39 + EIADFaultIdentifier52, // 0x3a + EIADFaultIdentifier53, // 0x3b + EIADFaultIdentifier54, // 0x3c + EIADFaultIdentifier55, // 0x3d + EIADFaultIdentifier56, // 0x3e + EIADFaultIdentifier57, // 0x3f + EIADFaultIdentifier58, // 0x40 + EIADFaultIdentifier59, // 0x41 + EIADFaultIdentifier60 // 0x42 }; //ISCE diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isaaccessextension_dll/inc/internalapi.h --- a/connectivitylayer/isce/isaaccessextension_dll/inc/internalapi.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isaaccessextension_dll/inc/internalapi.h Tue Oct 19 13:16:20 2010 +0300 @@ -47,8 +47,7 @@ // abstract interface for both channels user & kernel // called by extension, provided by extension -class MIAD2ChannelApi : public MISIRouterObjectIf - { +class MIAD2ChannelApi { public: @@ -112,8 +111,7 @@ // *called by LDD // *provided from extension // *must take care of syncronization, LDD and kernel channels using this -class MChannel2IADApi : public MISIObjectRouterIf - { +class MChannel2IADApi { public: @@ -153,13 +151,11 @@ */ virtual TInt SendIndication( TDes8& aMessage, const TUint16 aCh ) = 0; -#if (NCP_COMMON_SOS_VERSION_SUPPORT >= SOS_VERSION_95) virtual TInt Loan( const TUint16 aChannel, const TUint16 aRequest, MIAD2ChannelApi* aCallback ) = 0; virtual TInt ReturnLoan( const TUint16 aChannel, const TUint16 aRequest, MIAD2ChannelApi* aCallback ) = 0; -#endif }; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isaaccessextension_dll/inc/isakernelapi.h --- a/connectivitylayer/isce/isaaccessextension_dll/inc/isakernelapi.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isaaccessextension_dll/inc/isakernelapi.h Tue Oct 19 13:16:20 2010 +0300 @@ -36,7 +36,7 @@ // None // FORWARD DECLARATIONS -class DISAKernelChannel; +class DISAKernelWrapperHelper; // CLASS DECLARATION @@ -425,7 +425,7 @@ // Owned // Kernel channel dedicated for this. - DISAKernelChannel* iKernelChannel; + DISAKernelWrapperHelper* iHelper; }; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isaaccessextension_dll/inc/iscnokiadefinitions.h --- a/connectivitylayer/isce/isaaccessextension_dll/inc/iscnokiadefinitions.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isaaccessextension_dll/inc/iscnokiadefinitions.h Tue Oct 19 13:16:20 2010 +0300 @@ -51,7 +51,7 @@ EIscNokiaNifPep10, //0x17 EIscNokiaTest2, //0x18 EIscNokiaReserved8, //0x19 - EIscNokiaReserved9, //0x1a + EIscNokiaReserved7, //0x1a EIscNokiaPsy, //0x1b EIscNokiaNtm, //0x1c EIscNokiaNtmLicensee, //0x1d @@ -86,8 +86,8 @@ EIscNokiaUpdateServerApplication, //0x3a EIscNokiaReserved3, //0x3b EIscNokiaReserved4, //0x3c //60 - EIscNokiaReserved5, //0x3d - EIscNokiaReserved6, //0x3e + EIscNokiaAtController3, //0x3d + EIscNokiaAtController2, //0x3e EIscNokiaAtController, //0x3f //63 EIscNokiaLastUserChannel // This is actually first kernel side channel }; @@ -111,7 +111,8 @@ EIscNokiaUsbAudioDriver, //0x4e EIscNokiaDMC, //0x4f EIscNokiaReservedKern2, //0x50 - EIscNokiaLastKernelChannel //0x51 //81 + EIscNokiaMTC, //0x51 + EIscNokiaLastKernelChannel //0x52 //82 }; // MACROS @@ -140,29 +141,23 @@ }; #ifndef PN_DEV_PC -#define PN_DEV_PC 0x10 // Not in pn_const.h at the moment TODO: Remove when possible +#define PN_DEV_PC 0x10 // Not in pn_const.h at the moment Remove when possible #endif #ifndef PN_APE_COMMGR -#define PN_APE_COMMGR 0x11 //TODO remove when defined in pn_const.h +#define PN_APE_COMMGR 0x11 // remove when defined in pn_const.h #endif #ifndef THIS_DEVICE #if !defined (__WINS__) && !defined(NCP_COMMON_PLATFORM_SIMULATOR) - // Device IDs - #define THIS_DEVICE PN_DEV_HOST - #define OTHER_DEVICE_1 PN_DEV_MODEM - #define PN_DEV_OWN 0x6c - #define PN_DEV_DONT_CARE OTHER_DEVICE_1 - // Media IDs - #define PN_MEDIA_SOS PN_MEDIA_MODEM_HOST_IF - // Internals CLIENT OF ISC API OR ISA KERNEL API - DO NOT USE! -> - #define PN_MEDIA_NOT_USED 0xfe - #define PN_NO_ROUTING 0xff - #define PN_OBJ_ROUTER PN_OBJ_ROUTING_REQ - // To be removed when pipe changes are done. - #define PNS_PIPE_DATA_OFFSET_DATA 3 - // <- Internals CLIENT OF ISC API OR ISA KERNEL API - DO NOT USE! + #ifndef PN_DEV_OWN + #define PN_DEV_OWN 0 // PN_DEV_HOST + #endif // PN_DEV_OWN + + #define THIS_DEVICE PN_DEV_OWN #else - #define THIS_DEVICE PN_DEV_PC + #ifndef PN_DEV_OWN + #define PN_DEV_OWN PN_DEV_PC + #endif // PN_DEV_OWN + #define THIS_DEVICE PN_DEV_OWN #endif #endif diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isaaccessextension_dll/inc/router.h --- a/connectivitylayer/isce/isaaccessextension_dll/inc/router.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isaaccessextension_dll/inc/router.h Tue Oct 19 13:16:20 2010 +0300 @@ -23,24 +23,21 @@ #include // For TUint16 #include // For TDesC8 #include "internalapi.h" // For MIAD2ChannelApi -//ISCE #include "mist2iadapi.h" // For TIADConnectionStatus, MIST2IADApi +#include "mist2iadapi.h" // For TIADConnectionStatus, MIST2IADApi #include "iadinternaldefinitions.h" // For TIADConnectionStatus -#include "iadnokiadefinitions.h" // For EIADSizeOfChannels -//ISCE -#include "isirouterlinkifs.h" // For MLinkRouterIf -//ISCE -#ifdef NCP_COMMON_BRIDGE_FAMILY_PIPE_SUPPORT +#include "iadnokiadefinitions.h" // For EIADSizeOfChannels, includes iscnokiadefinitions.h. + class DPipeHandler; -#endif -//ISCE class MIAD2ISTApi; +class MIAD2ISTApi; class DRouter; +class DIndicationHandler; class MIAD2ChannelApi; class DQueue; static DObject* iThreadPtr = NULL; const TUint8 KIADEventSubscriptionObjId( 0xfc ); -// TODO: own API for indicationhandler (and pipehandler allocate, deallocate, sendmessage ?) +// own API for indicationhandler (and pipehandler allocate, deallocate, sendmessage ?) // - stores UL (APE destinated) message to receive queue // @@ -52,11 +49,7 @@ // receive DL message from LDD // // route DL message to appropriate handler -NONSHARABLE_CLASS( DRouter ) : public MChannel2IADApi, - // ISCE - public MISILinkRouterIf - // ISCE - +NONSHARABLE_CLASS( DRouter ) : public MChannel2IADApi, public MIST2IADApi { public: @@ -93,14 +86,22 @@ // From MChannel2IADApi end + // From MIST2IADApi start const, check others too + IMPORT_C void NotifyConnectionStatus( MIST2IADApi::TISTConnectionStatus aStatus ); + + IMPORT_C void ReceiveMessage( TDes8& aMsg ); + + IMPORT_C const RArray& GetBlockConfig(); + + IMPORT_C void Register( MIAD2ISTApi* aISTApi ); + // For Router and it's handler DPipeHandler and DIndicationHandler TInt SendMsg( TDes8& aMsg ); // For PipeHandler MIAD2ChannelApi* GetChannel( const TUint16 aChannel ); // For PipeHandler -// ISCE -// TODO: DEF files!!! + // From MISILinkRouterIf start /* * See comments from MISILinkRouterIf. @@ -112,21 +113,14 @@ */ void Receive( TDes8& aMsg ); // From MISILinkRouterIf end - IMPORT_C void DummyDoNothing(); - - IMPORT_C void DummyDoNothing2(); - -// ISCE - // For internal receiving. void DRouter::MessageReceived( TDes8& aMsg ); -#if (NCP_COMMON_SOS_VERSION_SUPPORT >= SOS_VERSION_95) + EXPORT_C TInt Loan( const TUint16 aChannel, const TUint16 aRequest, MIAD2ChannelApi* aCallback ); EXPORT_C TInt ReturnLoan( const TUint16 aChannel, const TUint16 aRequest, MIAD2ChannelApi* aCallback ); -#endif private: @@ -136,16 +130,15 @@ EPipeMsg, EMediaMsg, EIndicationMsg, + EControlMsg, + EPnNameAddRespMsg, ENotKnownMsg, - EUsbPhonetMsg }; enum TWaitingType { ENormalOpen = 1, -#if (NCP_COMMON_SOS_VERSION_SUPPORT >= SOS_VERSION_95) ELoan -#endif }; void HandleIsiMessage( TDes8& aMsg ); @@ -154,6 +147,9 @@ void HandleMediaMessage( TDes8& aMsg ); + void HandleControlMessage( TDes8& aMsg ); + + void HandlePnsNameAddResp( TDes8& aMsg ); void SendCommIsaEntityNotReachableResp( const TDesC8& aMsg ); @@ -164,23 +160,16 @@ public: static void CheckRouting( DRouter& aTmp, TDes8& aMsg ); - static DRouter* iThisPtr; - MISIRouterObjectIf* iNameService; - MISIRouterObjectIf* iCommunicationManager; - /* - * See comments from MISIChannelRouterIf - */ - TDfcQue* GetDfcThread( const TISIDfcQThreadType aType ); - - void FreeDfcThread( TDfcQue* aThread ); - - private: static void CommonRxDfc( TAny* aPtr ); static void InitCmtDfc( TAny* aPtr ); - void InitConnectionOk(); + void InitCmtConnection(); + + void SendDrmReq( const TUint16 aChannelId ); + + void SendPnsNameAddReq( const TUint16 aChannel, const TDesC8& aOpenInfo ); static void NotifyObjLayerConnStatDfc( TAny* aPtr ); @@ -188,15 +177,12 @@ void SetSenderInfo( TDes8& aMessage, const TUint16 aCh ); - //From objectapi - TInt Send( TDes8& aMessage, const TUint8 aObjId ); - // Member data private: void CheckSameThreadContext(); - // TODO + // // Needed due to opening that are waiting a response from cmt side. // Use iWaitingChannel to store a channel pointer then and when resp // received from cmt set iChannel = iWaitingChannel and complete request @@ -210,22 +196,11 @@ TWaitingType iType; }; -// ISCE - TUint8 MapMediaToLinkId( const TUint8 aMedia ); - - enum TISIMedias - { - EISIMediaHostSSI = 0x00, - EISIAmountOfMedias - }; -// ISCE - // owned // APE <-> CMT connection status ok/nok. TIADConnectionStatus iConnectionStatus; -#ifdef NCP_COMMON_BRIDGE_FAMILY_PIPE_SUPPORT DPipeHandler* iPipeHandler; -#endif + DIndicationHandler* iIndicationHandler; DQueue* iCommonRxQueue; TIADChannel iChannelTable[ EIADSizeOfChannels ]; //static TDfc* iConnStatusBcDfc; @@ -236,12 +211,13 @@ TUint16 iMaxFrameSize; // not owned, just using // When registered !NULL when unregistered NULL. API towards IST. - // ISCE RArray iArray; - TBool iBootDone; + MIAD2ISTApi* iIST; + + RArray iArray; - // ISCE - MISIRouterLinkIf** iLinksArray; - // ISCE + + TBool iBootDone; + }; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isaaccessldd_ldd/group/isaaccessesldd.mmp --- a/connectivitylayer/isce/isaaccessldd_ldd/group/isaaccessesldd.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isaaccessldd_ldd/group/isaaccessesldd.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -19,22 +19,27 @@ #include #include -#include "kernel/kern_ext.mmh" +#include "kernel/kern_ext.mmh" - +FEATUREVARIANT TARGET isaaccessldd.ldd TARGETTYPE ldd CAPABILITY ALL UID 0x100000AF 0x1028312A VENDORID VID_DEFAULT -FEATUREVARIANT SMPSAFE SOURCEPATH ../src -SOURCE isauserdevice.cpp -SOURCE isauserchannel.cpp +SOURCE isauserdevice_isce.cpp +SOURCE isauserchannel_isce.cpp +SOURCE queue.cpp +SOURCE ../../isaaccessextension_dll/src/common_wrapper.cpp + +USERINCLUDE ../../isirouter_dll/inc +USERINCLUDE ../../memmanager_dll/inc +USERINCLUDE ../../isicommunicationmanager_dll/inc USERINCLUDE ../inc USERINCLUDE ../traces @@ -44,9 +49,9 @@ NON_FOUNDATION_ADAPT_LAYER_SYSTEMINCLUDE // FOR isakernelapi.h SYSTEMINCLUDE /epoc32/include/kernel -LIBRARY isaaccessextension.lib // For DQueue - -DEFFILE isaaccessldd.def +LIBRARY memmanager.lib +LIBRARY isirouter.lib +DEFFILE isaaccessldd_isce.def START WINS win32_library kernel32.lib @@ -59,3 +64,4 @@ MACRO COMPONENT_TRACE_FLAG +MACRO ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/iscapi_dll/src/isaapi.cpp --- a/connectivitylayer/isce/iscapi_dll/src/isaapi.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/iscapi_dll/src/isaapi.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -241,7 +241,7 @@ C_TRACE( ( _T( "RIscApi::Loan 0x%x ->" ), iChannelNumber ) ); OstTraceExt1( TRACE_NORMAL, RISCAPI_LOAN_ENTRY, ">RIscApi::Loan;iChannelNumber=%hx", iChannelNumber ); - // TODO: panic if open? + // panic if open? // PanicIfNotOpen(); // Driver is tried to load everytime. TInt loadStatus( User::LoadLogicalDevice( KNameOfIsaAccessDriverLdd ) ); @@ -355,7 +355,7 @@ { C_TRACE((_T("RIscApi::Close error: channel number out of range"))); OstTrace0( TRACE_NORMAL, DUP1_RISCAPI_CLOSE, "RIscApi::Close channelnumber out of range" ); -// TRACE_ASSERT_ALWAYS; TODO: Trace assert? +// TRACE_ASSERT_ALWAYS; Trace assert? } C_TRACE( ( _T( "RIscApi::Close 0x%x <-" ), iChannelNumber ) ); @@ -946,7 +946,7 @@ PanicIfNotOpen(); TInt returnCode( DoControl( EIADGetMaxDataSize ) ); // If positive the maximum amount of data in ISI or data message to be send - // If negative, one of the error codes. TODO: add to documentation, check possible error codes. + // If negative, one of the error codes. add to documentation, check possible error codes. C_TRACE( ( _T( "RIscApi::MaximumDataSize 0x%x %d <-" ), iChannelNumber, returnCode ) ); OstTrace1( TRACE_NORMAL, RISCAPI_MAXIMUMDATASIZE_EXIT, "= KChannelInfoMax ? KErrNone : KErrArgument ); - // TODO: Returns information of user channels only, not possible to get information + // Returns information of user channels only, not possible to get information // about kernel channels at the moment. - // TODO: error if channel is out of range? + // error if channel is out of range? if( KErrArgument != error ) { aInfo.SetLength( KChannelInfoMax ); diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isicommunicationmanager_dll/group/isicommunicationmanager.mmp --- a/connectivitylayer/isce/isicommunicationmanager_dll/group/isicommunicationmanager.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isicommunicationmanager_dll/group/isicommunicationmanager.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -38,7 +38,6 @@ USERINCLUDE ../inc USERINCLUDE ../../isirouter_dll/inc -USERINCLUDE ../../isaaccessextension_dll/inc USERINCLUDE ../../memmanager_dll/inc USERINCLUDE ../../isinameservice_dll/inc @@ -49,7 +48,7 @@ LIBRARY memmanager.lib -LIBRARY isaaccessextension.lib +LIBRARY isirouter.lib LIBRARY isinameservice.lib NOEXPORTLIBRARY @@ -61,4 +60,6 @@ // flag to enable normal trace inside component MACRO COMPONENT_TRACE_FLAG +//MACRO COMPONENT_TRACE_FLAG_EXTEND +MACRO ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isicommunicationmanager_dll/inc/ape_commgrisi.h --- a/connectivitylayer/isce/isicommunicationmanager_dll/inc/ape_commgrisi.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isicommunicationmanager_dll/inc/ape_commgrisi.h Tue Oct 19 13:16:20 2010 +0300 @@ -21,6 +21,10 @@ #define APE_COMMUNICATION_MANAGER_SERVER_ISI_VERSION_Z 0 #define APE_COMMUNICATION_MANAGER_SERVER_ISI_VERSION_Y 1 +#ifndef PN_APE_COMMGR +#define PN_APE_COMMGR 0x11 // remove when defined in pn_const.h +#endif + //TABLES diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isicommunicationmanager_dll/inc/isicommunicationmanager.h --- a/connectivitylayer/isce/isicommunicationmanager_dll/inc/isicommunicationmanager.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isicommunicationmanager_dll/inc/isicommunicationmanager.h Tue Oct 19 13:16:20 2010 +0300 @@ -49,26 +49,39 @@ private: + void HandleBootMessage( const TDesC8& aMessageDuringBoot ); + + void HandleCommunicationManagerCommonMessage( const TDesC8& aMessageToCommunicationManager ); + + void HandleApeCommunicationManagerMessage( const TDesC8& aMessageToCommunicationManager ); + + void HandlePnCommgrMessage( const TDesC8& aMessageToCommunicationManager ); + + void HandleMessageMulticast( const TDesC8& aMessageToMulticast ); + void SendNameAddReqs(); - - void SendPnsSubscribeResp( const TDesC8& aMessage ); - + + void SendApeCommgrSubscribeResp( const TDesC8& aMessage ); + void SendCommServiceNotIdentifiedResp( const TDesC8& aMessage ); - + void SendCommIsiVersionGetResp( const TDesC8& aMessage ); - - private: + + void SetIsiHeaderForCommonMessage( TDes8& aCommonResponse, + const TDesC8& aCommonRequest ); static void InitDfc( TAny* aPtr ); + + private: // Owned static DMutex* iCommunicationManagerMutex; TDfc* iInitDfc; DISIIndicationHandler* iISIIndicationHandler; - TUint8 iObjId; + TUint8 iObjectIdentifier; + TUint8 iBootMsgCount; // Not owned MISIObjectRouterIf* iRouter; - TUint8 iBootMsgCount; }; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isicommunicationmanager_dll/inc/isicommunicationmanagertrace.h --- a/connectivitylayer/isce/isicommunicationmanager_dll/inc/isicommunicationmanagertrace.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isicommunicationmanager_dll/inc/isicommunicationmanagertrace.h Tue Oct 19 13:16:20 2010 +0300 @@ -45,14 +45,21 @@ #else #define C_TRACE(a) #endif // COMPONENT_TRACE_FLAG + #if defined COMPONENT_TRACE_FLAG_EXTEND + #define E_TRACE(a) __TRACE_PRINTF(a) + #else + #define E_TRACE(a) + #endif // COMPONENT_TRACE_FLAG_EXTEND #else #define C_TRACE(a) + #define E_TRACE(a) #endif // _DEBUG // Resets are made both in UDEB and UREL (traces only in udeb) #define ASSERT_RESET_ALWAYS(a,b) if(!(a)) { __TRACE_PRINTF(("Assertion failed: file=" __FILE__ ", line=%d, compiled="__DATE__" "__TIME__, __LINE__)); Kern::Fault( "ISICommunicationManager:", b ); } #define TRACE_ASSERT(a) if (!(a)) __TRACE_PRINTF(("Assertion failed: file=" __FILE__ ", line=%d, compiled=" __DATE__" "__TIME__, __LINE__ )) #define TRACE_ASSERT_INFO(a, b) if (!(a)) __TRACE_PRINTF(("Assertion failed: file=" __FILE__ ", line=%d, extra info 0x%08x, compiled=" __DATE__" "__TIME__, __LINE__, b )); +#define TRACE_ASSERT_ALWAYS { __TRACE_PRINTF(("Assertion failed: file=" __FILE__ ", line=%d, compiled="__DATE__" "__TIME__, __LINE__)); } #endif // __ISICOMMUNICATIONMANAGERTRACE_H__ diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isicommunicationmanager_dll/inc/isiindicationhandler.h --- a/connectivitylayer/isce/isicommunicationmanager_dll/inc/isiindicationhandler.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isicommunicationmanager_dll/inc/isiindicationhandler.h Tue Oct 19 13:16:20 2010 +0300 @@ -74,18 +74,20 @@ ~DISIIndicationHandler(); /* - * Multicast and Subscribe must be called in same DFC thread. + * NOTE! Multicast and Subscribe must be called in same DFC thread. * If not then take a deep look at synchronization. + * Assumption: executed in a thread safe manner. + * @param aIndication, indication to be multicasted */ - void Multicast( TDes8& aIndication ); + void Multicast( const TDesC8& aIndication ); /* - * Multicast and Subscribe must be called in same DFC thread. + * NOTE! Multicast and Subscribe must be called in same DFC thread. * If not then take a deep look at synchronization. + * Assumption: executed in a thread safe manner. + * @param aSubscriptionReq, subscription message */ - void Subscribe( TDes8& aSubscriptionReq ); - - + void Subscribe( const TDesC8& aSubscriptionMessage ); private: @@ -120,6 +122,7 @@ SDblQue iExternalDeviceQ; // Not owned MISIObjectRouterIf* iRouter; + TBool iSubscriberIsAnExternalDevice; }; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isicommunicationmanager_dll/src/isicommunicationmanager.cpp --- a/connectivitylayer/isce/isicommunicationmanager_dll/src/isicommunicationmanager.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isicommunicationmanager_dll/src/isicommunicationmanager.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -17,28 +17,28 @@ #include // For Kern +#include // For ISI_HEADER_SIZE +#include // For PN_OBJ_ROUTING_REQ... +#include // For Common messages +#include // PN_COMMG, PNS_SUBSCRIBED_RESOURCES_... #include "isicommunicationmanager.h" // For DISICommunicationManager #include "misiobjectrouterif.h" // For MISIObjectRouterIf #include "isicommunicationmanagertrace.h" // For C_TRACE, ASSERT_RESET.. and fault codes #include "memapi.h" // For MemApi -#include // For ISI_HEADER_SIZE -#include // For PN_OBJ_ROUTING_REQ... -#include "nsisi.h" // For PN_NAMESERVICE -#ifdef INTERNAL_FLAG_ISI_ROUTER_IN_USE + +// HOX! nsisi.h is this also exported by isimsg +#include "nsisi.h" // For PN_NAMESERVICE.. + #include "isihelpers.h" // For SET_RECEIVER_OBJ... + #include "isirouter.h" // For GetDFCThread -#else -//#include "misiobjectrouterif.h" // For MISIObjectRouterIf -#include "isaaccessextension.h" // For DIsaAccessExtension -#include "iadhelpers.h" // For SET_RECEIVER_OBJ... -#endif -#include // For THIS_DEVICE #include "isiindicationhandler.h" // For DISIIndicationHandler #include "ape_commgrisi.h" // For APE_COMMGR.. #include "misicommunicationmanagerif.h" // For MISICommunicationManagerIf -#include // For Common messages + +//#define ISCE_NO_NEED_TO_VALIDATE_RESOURCE // to skip resource validity check // Faults enum TISICommunicationManagerFaults @@ -46,66 +46,51 @@ EISICommunicationManagerMemAllocFailure = 0x01, EISICommunicationManagerMemAllocFailure1, EISICommunicationManagerNullPointer, + EISICommunicationManagerNullPointer1, + EISICommunicationManagerNullPointer2, + EISICommunicationManagerNullPointer3, + EISICommunicationManagerNullPointer4, + EISICommunicationManagerNullPointer5, + EISICommunicationManagerNullPointer6, + EISICommunicationManagerNullPointer7, + EISICommunicationManagerNullPointer8, + EISICommunicationManagerNullPointer9, + EISICommunicationManagerNullPointer10, + EISICommunicationManagerNullPointer11, + EISICommunicationManagerNullPointer12, + EISICommunicationManagerNullPointer13, + EISICommunicationManagerNullPointer14, + EISICommunicationManagerNullPointer15, + EISICommunicationManagerNullPointer16, EISICommunicationManagerUnknownMessage, EISICommunicationManagerMutexCreateFailed, EISICommunicationManagerMutexWaitFailed, EISICommunicationManagerWrongMessageOrder, + EISICommunicationManagerWrongMessageOrder2, + EISICommunicationManagerWrongMessage, + EISICommunicationManagerFatalError, + EISICommunicationInvalidLength, + EISICommunicationInvalidLength1, + EISICommunicationInvalidLength2, + EISICommunicationInvalidLength3, + EISICommunicationInvalidLength4, + EISICommunicationInvalidLength5, + EISICommunicationInvalidLength6, + EISICommunicationInvalidLength7, + EISICommunicationInvalidLength8, + EISICommunicationInvalidLength9, + EISICommunicationInvalidLength10, + EISICommunicationInvalidLength11, + EISICommunicationInvalidLength12, + EISICommunicationInvalidLength13, + EISICommunicationInvalidLength14, + EISICommunicationManagerSendFailed, + EISICommunicationManagerSendFailed1, + EISICommunicationManagerSendFailed2, + EISICommunicationManagerSendFailed3, + EISICommunicationManagerSendFailed4, }; - -/* PUTB8 macro writes byte value to given address. - * This macro is used mainly by other PUTBXX macros. - */ -#define PUTB8(p,v) \ - {(*(TUint8 *)(p)) = ((TUint8)(v));} - - -/* PUTB16 macro writes 16-bit value in Big Endian format - * to given address. 16-bit value is written as two separate - * bytes, and so this macro can write 16-bit value to whatever - * address, regardless of the processor alignment restrictions - */ -#define PUTB16(p,v) \ - {PUTB8((p),(TUint16)(v)>>8); PUTB8((TUint8*)(p)+1,v);} - - -/* PUTB32 macro writes 32-bit value in Big Endian format - * to given address. 32-bit value is written as four separate - * bytes, and so this macro can write 32-bit value to whatever - * address, regardless of the processor alignment restrictions - */ -#define PUTB32(p,v) \ - {PUTB16((p),(TUint32)(v)>>16); PUTB16((TUint8*)(p)+2,(TUint32)(v));} - - -/** - * Big Endian to local endian type - */ - /* GETB8 macro returns byte value from given address. - * This macro is used mainly by other GETBXX macros. - */ -#define GETB8(p) \ - (*(TUint8 *)(p)) - - -/* GETB16 macro reads 16-bit value in Big Endian format - * from given address. 16-bit value is read as two separate - * bytes, and so this macro can read 16-bit value from whatever - * address, regardless of the processor alignment restrictions - */ -#define GETB16(p) \ - (((TUint16) GETB8(p)<<8) | (TUint16) GETB8((TUint8 *)(p)+1)) - - -/* GETB32 macro reads 32-bit value in Big Endian format - * from given address. 32-bit value is read as four separate - * bytes, and so this macro can read 32-bit value from whatever - * address, regardless of the processor alignment restrictions - */ -#define GETB32(p) \ - (((TUint32) GETB16(p)<<16) | (TUint32) GETB16((TUint8 *)(p)+2)) - - DMutex* DISICommunicationManager::iCommunicationManagerMutex = NULL; _LIT8( KCommunicationManagerMutex, "KCommunicationManagerMutex" ); @@ -113,29 +98,30 @@ const TUint8 KFiller( 0 ); const TInt KInitDfcPriority( 7 ); const TUint8 KDone( 0 ); +const TUint8 KDefaultTransactionIdentifier( 0x00 ); +const TUint8 KUnitializedObjectIdentifier( 0xff ); +const TUint8 KNumberOfBootMessage( 0x04 ); DISICommunicationManager::DISICommunicationManager( // None ) - : iObjId( 0x00 ), - iBootMsgCount( 0x04 ) // 2xRESP, 2xIND + : iObjectIdentifier( KUnitializedObjectIdentifier ), + iBootMsgCount( KNumberOfBootMessage ) { - C_TRACE( ( _T( "DISICommunicationManager::DISICommunicationManager 0x%x 0x%x>" ), iObjId, iRouter ) ); - iRouter = MISIObjectRouterIf::Connect( KCommunicationManagerUID, iObjId, this ); + C_TRACE( ( _T( "DISICommunicationManager::DISICommunicationManager 0x%x 0x%x>" ), iObjectIdentifier, iRouter ) ); + iRouter = MISIObjectRouterIf::GetIf(); ASSERT_RESET_ALWAYS( iRouter, ( EISICommunicationManagerNullPointer | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); - // Must be > KMutexOrdGeneral1 for nesting purposes because trx shared memory uses KMutexOrdGeneral1 - TInt err( Kern::MutexCreate( iCommunicationManagerMutex, KCommunicationManagerMutex, KMutexOrdGeneral2 ) ); + iRouter->Connect( KCommunicationManagerUID, iObjectIdentifier, this ); + ASSERT_RESET_ALWAYS( iObjectIdentifier == PN_OBJ_EVENT_MULTICAST, ( EISICommunicationManagerFatalError | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + // Ordinal three as there is zero, one and two used in other places of ISCE. + TInt err( Kern::MutexCreate( iCommunicationManagerMutex, KCommunicationManagerMutex, KMutexOrdGeneral3 ) ); ASSERT_RESET_ALWAYS( ( KErrNone == err ), ( EISICommunicationManagerMutexCreateFailed | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); -#ifdef INTERNAL_FLAG_ISI_ROUTER_IN_USE iInitDfc = new TDfc( InitDfc, this, iRouter->GetDfcThread( MISIObjectRouterIf::EISIKernelMainThread ), KInitDfcPriority ); -#else - iInitDfc = new TDfc( InitDfc, this, DIsaAccessExtension::GetDFCThread( EIADExtensionDfcQueue ), KInitDfcPriority ); -#endif ASSERT_RESET_ALWAYS( iInitDfc, ( EISICommunicationManagerMemAllocFailure | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); iISIIndicationHandler = new DISIIndicationHandler( iRouter ); ASSERT_RESET_ALWAYS( iISIIndicationHandler, ( EISICommunicationManagerMemAllocFailure1 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); iInitDfc->Enque(); - C_TRACE( ( _T( "DISICommunicationManager::DISICommunicationManager 0x%x 0x%x<" ), iObjId, iRouter ) ); + C_TRACE( ( _T( "DISICommunicationManager::DISICommunicationManager 0x%x 0x%x<" ), iObjectIdentifier, iRouter ) ); } void DISICommunicationManager::InitDfc( @@ -144,11 +130,14 @@ { C_TRACE( ( _T( "DISICommunicationManager::InitDfc 0x%x>" ), aPtr ) ); DISICommunicationManager* tmp = reinterpret_cast( aPtr ); + ASSERT_RESET_ALWAYS( tmp, ( EISICommunicationManagerNullPointer3 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); tmp->SendNameAddReqs(); - C_TRACE( ( _T( "DISICommunicationManager::InitDfc<" ) ) ); + C_TRACE( ( _T( "DISICommunicationManager::InitDfc 0x%x<" ), aPtr ) ); } -void DISICommunicationManager::SendNameAddReqs() +void DISICommunicationManager::SendNameAddReqs( + // None + ) { C_TRACE( ( _T( "DISICommunicationManager::SendNameAddReqs>" ) ) ); //PN_COMMGR name @@ -156,31 +145,38 @@ TDes8& addMsg = MemApi::AllocBlock( msgLength ); addMsg.SetLength( msgLength ); TUint8* addPtr = const_cast( addMsg.Ptr() ); + ASSERT_RESET_ALWAYS( addPtr, ( EISICommunicationManagerNullPointer1 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( addMsg.Length() > ( ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY + PN_NAME_SRV_ITEM_STR_OFFSET_RESERVED ) ), + ( EISICommunicationInvalidLength | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); addPtr[ ISI_HEADER_OFFSET_MEDIA ] = PN_MEDIA_ROUTING_REQ; SET_RECEIVER_DEV( addPtr, PN_DEV_OWN ); SET_SENDER_DEV( addPtr, PN_DEV_OWN ); addPtr[ ISI_HEADER_OFFSET_RESOURCEID ] = PN_NAMESERVICE; SET_LENGTH( addPtr, ( msgLength - PN_HEADER_SIZE ) ); SET_RECEIVER_OBJ( addPtr, PN_OBJ_ROUTER ); - SET_SENDER_OBJ( addPtr, PN_OBJ_EVENT_MULTICAST ); - addPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_UTID ] = 0x00; + SET_SENDER_OBJ( addPtr, iObjectIdentifier ); + addPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_UTID ] = KDefaultTransactionIdentifier; addPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_SUBFUNCTION ] = PNS_NAME_ADD_REQ; addPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_RESERVED1 ] = KFiller; addPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_RESERVED2 ] = KFiller; PUTB32( &addPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY + PN_NAME_SRV_ITEM_STR_OFFSET_NAME ], PN_COMMGR ); addPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY + PN_NAME_SRV_ITEM_STR_OFFSET_DEV ] = PN_DEV_OWN; - addPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY + PN_NAME_SRV_ITEM_STR_OFFSET_OBJ ] = PN_OBJ_EVENT_MULTICAST; - addPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY + PN_NAME_SRV_ITEM_STR_OFFSET_FLAGS ] = PN_NAME_UNDEF; + addPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY + PN_NAME_SRV_ITEM_STR_OFFSET_OBJ ] = iObjectIdentifier; + addPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY + PN_NAME_SRV_ITEM_STR_OFFSET_FLAGS ] = PN_NAME_NOCHG; addPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY + PN_NAME_SRV_ITEM_STR_OFFSET_RESERVED ] = KFiller; //PN_APE_COMMGR name TDes8& addMsg2 = MemApi::AllocBlock( msgLength ); addMsg2.SetLength( msgLength ); addMsg2.Copy( addMsg ); TUint8* addPtr2 = const_cast( addMsg2.Ptr() ); + ASSERT_RESET_ALWAYS( addPtr2, ( EISICommunicationManagerNullPointer2 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( addMsg2.Length() > ( ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY + PN_NAME_SRV_ITEM_STR_OFFSET_NAME ) ), + ( EISICommunicationInvalidLength1 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); PUTB32( &addPtr2[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY + PN_NAME_SRV_ITEM_STR_OFFSET_NAME ], PN_APE_COMMGR ); - //Register PN_APE_COMMGR and PN_COMMGR - iRouter->Send( addMsg, PN_OBJ_EVENT_MULTICAST ); - iRouter->Send( addMsg2, PN_OBJ_EVENT_MULTICAST ); + TInt sendResult = iRouter->Send( addMsg, iObjectIdentifier ); + ASSERT_RESET_ALWAYS( ( sendResult == KErrNone ), ( EISICommunicationManagerSendFailed3 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + sendResult = iRouter->Send( addMsg2, iObjectIdentifier ); + ASSERT_RESET_ALWAYS( ( sendResult == KErrNone ), ( EISICommunicationManagerSendFailed4 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); C_TRACE( ( _T( "DISICommunicationManager::SendNameAddReqs<" ) ) ); } @@ -195,176 +191,346 @@ delete iISIIndicationHandler; iISIIndicationHandler = NULL; } - iInitDfc->Cancel(); - delete iInitDfc; - iInitDfc = NULL; + if ( iInitDfc ) + { + iInitDfc->Cancel(); + delete iInitDfc; + iInitDfc = NULL; + } if( iCommunicationManagerMutex ) { ((DObject*)iCommunicationManagerMutex)->Close( NULL ); + iCommunicationManagerMutex = NULL; } - iCommunicationManagerMutex = NULL; + C_TRACE( ( _T( "DISICommunicationManager::~DISICommunicationManager<" ) ) ); } - -void DISICommunicationManager::Receive( const TDesC8& aMessage ) +void DISICommunicationManager::Receive( + const TDesC8& aMessage + ) { C_TRACE( ( _T( "DISICommunicationManager::Receive 0x%x>" ), &aMessage ) ); - TInt err( Kern::MutexWait( *iCommunicationManagerMutex ) ); + TInt err( Kern::MutexWait( *iCommunicationManagerMutex ) );//! check usage of these mutexes (be aware of ordering violations) ASSERT_RESET_ALWAYS( ( KErrNone == err ), ( EISICommunicationManagerMutexWaitFailed | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); const TUint8* msgPtr( aMessage.Ptr() ); TDes8* blockPtr = reinterpret_cast( const_cast(&aMessage) ); if( iBootMsgCount == KDone ) { - if( msgPtr[ ISI_HEADER_OFFSET_MESSAGEID ] == COMMON_MESSAGE ) + switch( msgPtr[ ISI_HEADER_OFFSET_RESOURCEID ] ) { - switch( msgPtr[ ISI_HEADER_OFFSET_SUBMESSAGEID ] ) + case PN_APE_COMMGR: { - case COMM_ISA_ENTITY_NOT_REACHABLE_RESP: - { - C_TRACE( ( _T( "DISICommunicationManager::Received not reachable resp" ) ) ); - break; - } - case COMM_ISI_VERSION_GET_REQ: - { - C_TRACE( ( _T( "DISICommunicationManager::Received version get req" ) ) ); - SendCommIsiVersionGetResp( *blockPtr ); - break; - } - default: - { - C_TRACE( ( _T( "DISICommunicationManager::Received unknown common message" ) ) ); - SendCommServiceNotIdentifiedResp( *blockPtr ); - break; - } + HandleApeCommunicationManagerMessage( *blockPtr ); + break; + } + case PN_COMMGR: + { + HandlePnCommgrMessage( *blockPtr ); + break; + } + default: + { + HandleMessageMulticast( *blockPtr ); + break; } } - else if( ( msgPtr[ ISI_HEADER_OFFSET_RESOURCEID ] == PN_APE_COMMGR ) - || ( msgPtr[ ISI_HEADER_OFFSET_RESOURCEID ] == PN_COMMGR ) ) + } + else + { + C_TRACE( ( _T( "DISICommunicationManager booting %d" ), iBootMsgCount ) ); + HandleBootMessage( *blockPtr ); + } + MemApi::DeallocBlock( *blockPtr ); + Kern::MutexSignal( *iCommunicationManagerMutex ); + C_TRACE( ( _T( "DISICommunicationManager::Receive 0x%x<" ), &aMessage ) ); + } + +void DISICommunicationManager::HandleBootMessage( + const TDesC8& aMessageDuringBoot + ) + { + C_TRACE( ( _T( "DISICommunicationManager::HandleBootMessage 0x%x>" ), &aMessageDuringBoot ) ); + const TUint8* messageDuringBootPtr = aMessageDuringBoot.Ptr(); + ASSERT_RESET_ALWAYS( messageDuringBootPtr, ( EISICommunicationManagerNullPointer7 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aMessageDuringBoot.Length() > ( ISI_HEADER_SIZE + PNS_NAME_ADD_RESP_OFFSET_REASON ) ), + ( EISICommunicationInvalidLength5 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + if( messageDuringBootPtr[ ISI_HEADER_OFFSET_RESOURCEID ] == PN_NAMESERVICE ) + { + switch( messageDuringBootPtr[ ISI_HEADER_OFFSET_MESSAGEID ] ) { - C_TRACE( ( _T( "DISICommunicationManager::Receive subscription" ) ) ); - SendPnsSubscribeResp( *blockPtr ); - if( msgPtr[ ISI_HEADER_OFFSET_SENDERDEVICE ] == PN_DEV_OWN ) + case PNS_NAME_ADD_IND : { - C_TRACE( ( _T( "DISICommunicationManager PNS_SUBSCRIBE_REQ from APE" ) ) ); - iISIIndicationHandler->Subscribe( *blockPtr ); + C_TRACE( ( _T( "DISICommunicationManager::HandleBootMessage PNS_NAME_ADD_IND" ) ) ); + iBootMsgCount--; + break; } - } - else - { - if( ( msgPtr[ ISI_HEADER_OFFSET_SENDERDEVICE ] != PN_DEV_OWN ) - || ( MISICommunicationManagerIf::IsValidResource( *blockPtr ) ) ) + case PNS_NAME_ADD_RESP : { - C_TRACE( ( _T( "DISICommunicationManager::Receive indication" ) ) ); - iISIIndicationHandler->Multicast( *blockPtr ); + C_TRACE( ( _T( "DISICommunicationManager::HandleBootMessage PNS_NAME_ADD_RESP" ) ) ); + ASSERT_RESET_ALWAYS( ( messageDuringBootPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_RESP_OFFSET_REASON ] == PN_NAME_OK ), ( EISICommunicationManagerWrongMessage | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + iBootMsgCount--; + break; } - else + default: { - C_TRACE( ( _T( "DISICommunicationManager not allowed resource from APE" ) ) ); + ASSERT_RESET_ALWAYS( 0, ( EISICommunicationManagerWrongMessageOrder2 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + break; } } } else { - C_TRACE( ( _T( "DISICommunicationManager not indication %d" ), iBootMsgCount ) ); - // From PN_NAMESERVICE && ( IND || successfull RESP ) - if( ( msgPtr[ ISI_HEADER_OFFSET_RESOURCEID ] == PN_NAMESERVICE ) - && ( msgPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_SUBFUNCTION ]== PNS_NAME_ADD_IND - || ( msgPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_RESP_OFFSET_SUBFUNCTION ]== PNS_NAME_ADD_RESP - && msgPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_RESP_OFFSET_REASON ] == PN_NAME_OK ) ) ) - { - C_TRACE( ( _T( "DISICommunicationManager::Receive from NAMESERVICE message id 0x%x" ), msgPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_SUBFUNCTION ] ) ); - iBootMsgCount--; - } - else - { - ASSERT_RESET_ALWAYS( 0, ( EISICommunicationManagerWrongMessageOrder | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); - } + ASSERT_RESET_ALWAYS( 0, ( EISICommunicationManagerWrongMessageOrder | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); } - MemApi::DeallocBlock( *blockPtr ); - Kern::MutexSignal( *iCommunicationManagerMutex ); - C_TRACE( ( _T( "DISICommunicationManager::Receive<" ) ) ); + C_TRACE( ( _T( "DISICommunicationManager::HandleBootMessage 0x%x<" ), &aMessageDuringBoot ) ); } -void DISICommunicationManager::SendPnsSubscribeResp( const TDesC8& aMessage ) +void DISICommunicationManager::HandleApeCommunicationManagerMessage( + const TDesC8& aMessageToCommunicationManager + ) { - C_TRACE( ( _T( "DISICommunicationManager::SendPnsSubscribeResp 0x%x>" ), &aMessage ) ); - TUint16 msgLength( ISI_HEADER_SIZE + SIZE_APE_COMMGR_SUBSCRIBE_RESP ); - TDes8& respMsg = MemApi::AllocBlock( msgLength ); - respMsg.SetLength( msgLength ); - TUint8* msgPtr = const_cast( aMessage.Ptr() ); - TUint8* respPtr = const_cast( respMsg.Ptr() ); - respPtr[ ISI_HEADER_OFFSET_MEDIA ] = msgPtr[ ISI_HEADER_OFFSET_MEDIA ]; - SET_RECEIVER_DEV( respPtr, GET_SENDER_DEV( aMessage ) ); - SET_SENDER_DEV( respPtr, PN_DEV_OWN ); - respPtr[ ISI_HEADER_OFFSET_RESOURCEID ] = PN_APE_COMMGR; - SET_LENGTH( respPtr, ( msgLength - PN_HEADER_SIZE ) ); - SET_RECEIVER_OBJ( respPtr, GET_SENDER_OBJ( aMessage ) ); - SET_SENDER_OBJ( respPtr, PN_OBJ_ROUTER ); - respPtr[ ISI_HEADER_SIZE + APE_COMMGR_SUBSCRIBE_RESP_OFFSET_TRANSID ] = msgPtr[ ISI_HEADER_OFFSET_TRANSID ]; - respPtr[ ISI_HEADER_SIZE + APE_COMMGR_SUBSCRIBE_RESP_OFFSET_MESSAGEID ] = APE_COMMGR_SUBSCRIBE_RESP; - if( msgPtr[ ISI_HEADER_OFFSET_SENDERDEVICE ] == PN_DEV_OWN ) + C_TRACE( ( _T( "DISICommunicationManager::HandleApeCommunicationManagerMessage 0x%x>" ), &aMessageToCommunicationManager ) ); + const TUint8* messagePtr = aMessageToCommunicationManager.Ptr(); + ASSERT_RESET_ALWAYS( messagePtr, ( EISICommunicationManagerNullPointer9 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aMessageToCommunicationManager.Length() > ( ISI_HEADER_OFFSET_MESSAGEID ) ), + ( EISICommunicationInvalidLength7 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + if( messagePtr[ ISI_HEADER_OFFSET_MESSAGEID ] == COMMON_MESSAGE ) + { + HandleCommunicationManagerCommonMessage( aMessageToCommunicationManager ); + } + else { - respPtr[ ISI_HEADER_SIZE + APE_COMMGR_SUBSCRIBE_RESP_OFFSET_RESULT ] = APE_COMMGR_OK; + C_TRACE( ( _T( "DISICommunicationManager::HandleApeCommunicationManagerMessage subscription x%x" ), &aMessageToCommunicationManager ) ); + switch( messagePtr[ ISI_HEADER_OFFSET_MESSAGEID ] ) + { + case APE_COMMGR_SUBSCRIBE_REQ: + { + SendApeCommgrSubscribeResp( aMessageToCommunicationManager ); + iISIIndicationHandler->Subscribe( aMessageToCommunicationManager ); + break; + } + default: + { + TRACE_ASSERT_ALWAYS; + SendCommServiceNotIdentifiedResp( aMessageToCommunicationManager ); + break; + } + } + } + C_TRACE( ( _T( "DISICommunicationManager::HandleApeCommunicationManagerMessage 0x%x<" ), &aMessageToCommunicationManager ) ); + } + +void DISICommunicationManager::HandlePnCommgrMessage( + const TDesC8& aMessageToCommunicationManager + ) + { + C_TRACE( ( _T( "DISICommunicationManager::HandleCellmoCommunicationManagerMessage 0x%x>" ), &aMessageToCommunicationManager ) ); + const TUint8* messagePtr = aMessageToCommunicationManager.Ptr(); + ASSERT_RESET_ALWAYS( messagePtr, ( EISICommunicationManagerNullPointer15 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aMessageToCommunicationManager.Length() > ( ISI_HEADER_OFFSET_MESSAGEID ) ), + ( EISICommunicationInvalidLength13 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + if( messagePtr[ ISI_HEADER_OFFSET_MESSAGEID ] == COMMON_MESSAGE ) + { + HandleCommunicationManagerCommonMessage( aMessageToCommunicationManager ); } else { - respPtr[ ISI_HEADER_SIZE + APE_COMMGR_SUBSCRIBE_RESP_OFFSET_RESULT ] = APE_COMMGR_NOT_ALLOWED; - } - iRouter->Send( respMsg, PN_OBJ_EVENT_MULTICAST ); - C_TRACE( ( _T( "DISICommunicationManager::SendPnsSubscribeResp<" ) ) ); + C_TRACE( ( _T( "DISICommunicationManager::HandleCellmoCommunicationManagerMessage subscription x%x" ), &aMessageToCommunicationManager ) ); + switch( messagePtr[ ISI_HEADER_OFFSET_MESSAGEID ] ) + { + case PNS_SUBSCRIBED_RESOURCES_EXTEND_IND: //PNS_SUBSCRIBED_RESOURCES_EXTEND_IND: + { + iISIIndicationHandler->Subscribe( aMessageToCommunicationManager ); + break; + } + default: + { + TRACE_ASSERT_ALWAYS; + SendCommServiceNotIdentifiedResp( aMessageToCommunicationManager ); + break; + } + } + } + C_TRACE( ( _T( "DISICommunicationManager::HandleCellmoCommunicationManagerMessage 0x%x<" ), &aMessageToCommunicationManager ) ); + } + +void DISICommunicationManager::HandleCommunicationManagerCommonMessage( + const TDesC8& aMessageToCommunicationManager + ) + { + C_TRACE( ( _T( "DISICommunicationManager::HandleCommunicationManagerCommonMessage 0x%x>" ), &aMessageToCommunicationManager ) ); + const TUint8* messagePtr = aMessageToCommunicationManager.Ptr(); + ASSERT_RESET_ALWAYS( messagePtr, ( EISICommunicationManagerNullPointer16 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aMessageToCommunicationManager.Length() > ( ISI_HEADER_OFFSET_MESSAGEID ) ), + ( EISICommunicationInvalidLength14 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + if( messagePtr[ ISI_HEADER_OFFSET_MESSAGEID ] == COMMON_MESSAGE ) + { + ASSERT_RESET_ALWAYS( ( aMessageToCommunicationManager.Length() > ( ISI_HEADER_OFFSET_SUBMESSAGEID ) ), + ( EISICommunicationInvalidLength9 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + switch( messagePtr[ ISI_HEADER_OFFSET_SUBMESSAGEID ] ) + { + case COMM_ISA_ENTITY_NOT_REACHABLE_RESP: + { + C_TRACE( ( _T( "DISICommunicationManager::HandleCommunicationManagerCommonMessage COMM_ISA_ENTITY_NOT_REACHABLE_RESP0 x%x" ), &aMessageToCommunicationManager ) ); + break; + } + case COMM_ISI_VERSION_GET_REQ: + { + C_TRACE( ( _T( "DISICommunicationManager::HandleCommunicationManagerCommonMessage COMM_ISI_VERSION_GET_REQ x%x" ), &aMessageToCommunicationManager ) ); + SendCommIsiVersionGetResp( aMessageToCommunicationManager ); + break; + } + default: + { + C_TRACE( ( _T( "DISICommunicationManager::HandleCommunicationManagerCommonMessage unknown COMMON_MESSAGE x%x" ), &aMessageToCommunicationManager ) ); + SendCommServiceNotIdentifiedResp( aMessageToCommunicationManager ); + break; + } + } + } } +void DISICommunicationManager::HandleMessageMulticast( + const TDesC8& aMessageToMulticast + ) + { + C_TRACE( ( _T( "DISICommunicationManager::HandleMessageMulticast 0x%x>" ), &aMessageToMulticast ) ); + const TUint8* messageToMulticastPtr = aMessageToMulticast.Ptr(); + ASSERT_RESET_ALWAYS( messageToMulticastPtr, ( EISICommunicationManagerNullPointer10 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aMessageToMulticast.Length() > ( ISI_HEADER_OFFSET_SENDERDEVICE ) ), + ( EISICommunicationInvalidLength8 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + if( ( messageToMulticastPtr[ ISI_HEADER_OFFSET_SENDERDEVICE ] != PN_DEV_OWN ) || +#ifndef ISCE_NO_NEED_TO_VALIDATE_RESOURCE + ( MISICommunicationManagerIf::IsValidResource( aMessageToMulticast ) ) +#else + ETrue +#endif + ) + { + C_TRACE( ( _T( "DISICommunicationManager::HandleMessageMulticast multicasting 0x%x" ), &aMessageToMulticast ) ); + iISIIndicationHandler->Multicast( aMessageToMulticast ); + } + else + { + TRACE_ASSERT_ALWAYS; + C_TRACE( ( _T( "DISICommunicationManager::HandleMessageMulticast ILLEGAL Resource from APE in message 0x%x" ), &aMessageToMulticast ) ); + } + C_TRACE( ( _T( "DISICommunicationManager::HandleMessageMulticast 0x%x<" ), &aMessageToMulticast ) ); + } -void DISICommunicationManager::SendCommServiceNotIdentifiedResp( const TDesC8& aMessage ) +void DISICommunicationManager::SendApeCommgrSubscribeResp( + const TDesC8& aMessage + ) + { + C_TRACE( ( _T( "DISICommunicationManager::SendApeCommgrSubscribeResp 0x%x>" ), &aMessage ) ); + TUint16 msgLength( ISI_HEADER_SIZE + SIZE_APE_COMMGR_SUBSCRIBE_RESP ); + TDes8& pnsSubscribeResp = MemApi::AllocBlock( msgLength ); + pnsSubscribeResp.SetLength( msgLength ); + TUint8* msgPtr = const_cast( aMessage.Ptr() ); + ASSERT_RESET_ALWAYS( msgPtr, ( EISICommunicationManagerNullPointer4 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aMessage.Length() > ( ISI_HEADER_OFFSET_TRANSID ) ), + ( EISICommunicationInvalidLength2 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + TUint8* pnsSubscribeRespPtr = const_cast( pnsSubscribeResp.Ptr() ); + ASSERT_RESET_ALWAYS( pnsSubscribeRespPtr, ( EISICommunicationManagerNullPointer5 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( pnsSubscribeResp.Length() > ( ISI_HEADER_SIZE + APE_COMMGR_SUBSCRIBE_RESP_OFFSET_RESULT ) ), + ( EISICommunicationInvalidLength3 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + pnsSubscribeRespPtr[ ISI_HEADER_OFFSET_MEDIA ] = msgPtr[ ISI_HEADER_OFFSET_MEDIA ]; + SET_RECEIVER_DEV( pnsSubscribeRespPtr, GET_SENDER_DEV( aMessage ) ); + SET_SENDER_DEV( pnsSubscribeRespPtr, PN_DEV_OWN ); + pnsSubscribeRespPtr[ ISI_HEADER_OFFSET_RESOURCEID ] = PN_APE_COMMGR; + SET_LENGTH( pnsSubscribeRespPtr, ( msgLength - PN_HEADER_SIZE ) ); + SET_RECEIVER_OBJ( pnsSubscribeRespPtr, GET_SENDER_OBJ( aMessage ) ); + SET_SENDER_OBJ( pnsSubscribeRespPtr, iObjectIdentifier ); + pnsSubscribeRespPtr[ ISI_HEADER_SIZE + APE_COMMGR_SUBSCRIBE_RESP_OFFSET_TRANSID ] = msgPtr[ ISI_HEADER_OFFSET_TRANSID ]; + pnsSubscribeRespPtr[ ISI_HEADER_SIZE + APE_COMMGR_SUBSCRIBE_RESP_OFFSET_MESSAGEID ] = APE_COMMGR_SUBSCRIBE_RESP; + pnsSubscribeRespPtr[ ISI_HEADER_SIZE + APE_COMMGR_SUBSCRIBE_RESP_OFFSET_RESULT ] = msgPtr[ ISI_HEADER_OFFSET_SENDERDEVICE ] == PN_DEV_OWN ? APE_COMMGR_OK : APE_COMMGR_NOT_ALLOWED; + TRACE_ASSERT( APE_COMMGR_OK == pnsSubscribeRespPtr[ ISI_HEADER_SIZE + APE_COMMGR_SUBSCRIBE_RESP_OFFSET_RESULT ] ); + TInt sendResult = iRouter->Send( pnsSubscribeResp, iObjectIdentifier ); + ASSERT_RESET_ALWAYS( ( sendResult == KErrNone ), ( EISICommunicationManagerSendFailed2 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + C_TRACE( ( _T( "DISICommunicationManager::SendApeCommgrSubscribeResp 0x%x<" ), &aMessage ) ); + } + +void DISICommunicationManager::SendCommServiceNotIdentifiedResp( + const TDesC8& aMessage + ) { C_TRACE( ( _T( "DISICommunicationManager::SendCommServiceNotIdentifiedResp 0x%x>" ), &aMessage ) ); - TDes8& respMsg = MemApi::AllocBlock( ISI_HEADER_SIZE + SIZE_COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP ); - TUint8* ptr( const_cast( respMsg.Ptr() ) ); - const TUint8* msgPtr( aMessage.Ptr() ); - ptr[ ISI_HEADER_OFFSET_MEDIA ] = PN_MEDIA_ROUTING_REQ; - SET_RECEIVER_DEV( ptr, GET_SENDER_DEV( aMessage ) ); - SET_SENDER_DEV( ptr, PN_DEV_OWN ); - ptr[ ISI_HEADER_OFFSET_RESOURCEID ] = PN_APE_COMMGR; - SET_RECEIVER_OBJ( ptr, GET_SENDER_OBJ( aMessage ) ); - SET_SENDER_OBJ( ptr, PN_OBJ_EVENT_MULTICAST ); - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_TRANSACTIONID ] = 0x00; - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_MESSAGEID ] = COMMON_MESSAGE; - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_SUBMESSAGEID ] = COMM_SERVICE_NOT_IDENTIFIED_RESP; - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_NOTSERVEDMESSAGEID ] = msgPtr[ ISI_HEADER_OFFSET_MESSAGEID ]; - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_FILLERBYTE1 ] = KFiller; - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_NOTSERVEDSUBMESSAGEID ] = msgPtr[ ISI_HEADER_OFFSET_SUBMESSAGEID ]; - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_FILLERBYTE2 ] = KFiller; - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_FILLERBYTE3 ] = KFiller; - iRouter->Send( respMsg, PN_OBJ_EVENT_MULTICAST ); - C_TRACE( ( _T( "DISICommunicationManager::SendCommServiceNotIdentifiedResp<" ) ) ); + // check if possible to go in wild loop if incoming message is not_reachable_resp + TInt commonServiceNotIdentifiedLength( ISI_HEADER_SIZE + SIZE_COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP ); + TDes8& commonServiceNotIdentifiedResp = MemApi::AllocBlock( commonServiceNotIdentifiedLength ); + commonServiceNotIdentifiedResp.SetLength( commonServiceNotIdentifiedLength ); + TUint8* commonServiceNotIdentifiedRespPtr( const_cast( commonServiceNotIdentifiedResp.Ptr() ) ); + ASSERT_RESET_ALWAYS( commonServiceNotIdentifiedRespPtr, ( EISICommunicationManagerNullPointer6 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( commonServiceNotIdentifiedResp.Length() > ( ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_FILLERBYTE3 ) ), + ( EISICommunicationInvalidLength4 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + const TUint8* receivedMsgPtr( aMessage.Ptr() ); + ASSERT_RESET_ALWAYS( receivedMsgPtr, ( EISICommunicationManagerNullPointer11 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aMessage.Length() > ( ISI_HEADER_OFFSET_SUBMESSAGEID ) ), + ( EISICommunicationInvalidLength10 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + SetIsiHeaderForCommonMessage( commonServiceNotIdentifiedResp, aMessage ); + commonServiceNotIdentifiedRespPtr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_SUBMESSAGEID ] = COMM_SERVICE_NOT_IDENTIFIED_RESP; + commonServiceNotIdentifiedRespPtr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_NOTSERVEDMESSAGEID ] = receivedMsgPtr[ ISI_HEADER_OFFSET_MESSAGEID ]; + commonServiceNotIdentifiedRespPtr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_FILLERBYTE1 ] = KFiller; + commonServiceNotIdentifiedRespPtr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_NOTSERVEDSUBMESSAGEID ] = receivedMsgPtr[ ISI_HEADER_OFFSET_SUBMESSAGEID ]; + commonServiceNotIdentifiedRespPtr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_FILLERBYTE2 ] = KFiller; + commonServiceNotIdentifiedRespPtr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_FILLERBYTE3 ] = KFiller; + TInt sendResult = iRouter->Send( commonServiceNotIdentifiedResp, iObjectIdentifier ); + ASSERT_RESET_ALWAYS( ( sendResult == KErrNone ), ( EISICommunicationManagerSendFailed | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + C_TRACE( ( _T( "DISICommunicationManager::SendCommServiceNotIdentifiedResp 0x%x<" ), &aMessage ) ); } - -void DISICommunicationManager::SendCommIsiVersionGetResp( const TDesC8& aMessage ) +void DISICommunicationManager::SendCommIsiVersionGetResp( + const TDesC8& aMessage + ) { C_TRACE( ( _T( "DISICommunicationManager::SendCommIsiVersionGetResp 0x%x>" ), &aMessage ) ); - TDes8& respMsg = MemApi::AllocBlock( ISI_HEADER_SIZE + SIZE_COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP ); - TUint8* ptr( const_cast( respMsg.Ptr() ) ); - const TUint8* msgPtr( aMessage.Ptr() ); - ptr[ ISI_HEADER_OFFSET_MEDIA ] = PN_MEDIA_ROUTING_REQ; - SET_RECEIVER_DEV( ptr, GET_SENDER_DEV( aMessage ) ); - SET_SENDER_DEV( ptr, PN_DEV_OWN ); - ptr[ ISI_HEADER_OFFSET_RESOURCEID ] = PN_APE_COMMGR; - SET_RECEIVER_OBJ( ptr, GET_SENDER_OBJ( aMessage ) ); - SET_SENDER_OBJ( ptr, PN_OBJ_EVENT_MULTICAST ); - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_TRANSACTIONID ] = 0x00; - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_MESSAGEID ] = COMMON_MESSAGE; - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_SUBMESSAGEID ] = COMM_ISI_VERSION_GET_RESP; - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_ISIVERSIONZZZ ] = APE_COMMUNICATION_MANAGER_SERVER_ISI_VERSION_Z; - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_ISIVERSIONYYY ] = APE_COMMUNICATION_MANAGER_SERVER_ISI_VERSION_Y; - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_FILLERBYTE1 ] = KFiller; - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_FILLERBYTE2 ] = KFiller; - ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_FILLERBYTE3 ] = KFiller; - iRouter->Send( respMsg, PN_OBJ_EVENT_MULTICAST ); - C_TRACE( ( _T( "DISICommunicationManager::SendCommIsiVersionGetResp<" ) ) ); + TInt commonIsiVersionGetRespLength( ISI_HEADER_SIZE + SIZE_COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP ); + TDes8& commonIsiVersionGetResp = MemApi::AllocBlock( commonIsiVersionGetRespLength ); + commonIsiVersionGetResp.SetLength( commonIsiVersionGetRespLength ); + TUint8* commonIsiVersionGetRespPtr( const_cast( commonIsiVersionGetResp.Ptr() ) ); + ASSERT_RESET_ALWAYS( commonIsiVersionGetRespPtr, ( EISICommunicationManagerNullPointer8 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( commonIsiVersionGetResp.Length() > ( ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_FILLERBYTE3 ) ), + ( EISICommunicationInvalidLength6 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + const TUint8* receivedMsgPtr( aMessage.Ptr() ); + ASSERT_RESET_ALWAYS( receivedMsgPtr, ( EISICommunicationManagerNullPointer12 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + SetIsiHeaderForCommonMessage( commonIsiVersionGetResp, aMessage ); + commonIsiVersionGetRespPtr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_SUBMESSAGEID ] = COMM_ISI_VERSION_GET_RESP; + commonIsiVersionGetRespPtr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_ISIVERSIONZZZ ] = APE_COMMUNICATION_MANAGER_SERVER_ISI_VERSION_Z; + commonIsiVersionGetRespPtr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_ISIVERSIONYYY ] = APE_COMMUNICATION_MANAGER_SERVER_ISI_VERSION_Y; + commonIsiVersionGetRespPtr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_FILLERBYTE1 ] = KFiller; + commonIsiVersionGetRespPtr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_FILLERBYTE2 ] = KFiller; + commonIsiVersionGetRespPtr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_FILLERBYTE3 ] = KFiller; + TInt sendResult = iRouter->Send( commonIsiVersionGetResp, iObjectIdentifier ); + ASSERT_RESET_ALWAYS( ( sendResult == KErrNone ), ( EISICommunicationManagerSendFailed1 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + C_TRACE( ( _T( "DISICommunicationManager::SendCommIsiVersionGetResp 0x%x<" ), &aMessage ) ); } +void DISICommunicationManager::SetIsiHeaderForCommonMessage( + TDes8& aCommonResponse, + const TDesC8& aCommonRequest + ) + { + C_TRACE( ( _T( "DISICommunicationManager::SetIsiHeaderForCommonMessage 0x%x 0x%x>" ), &aCommonResponse, &aCommonRequest ) ); + const TUint8* commonRequestPtr = aCommonRequest.Ptr(); + TUint8* commonResponsePtr = const_cast( aCommonResponse.Ptr() ); + ASSERT_RESET_ALWAYS( commonRequestPtr, ( EISICommunicationManagerNullPointer13 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( commonResponsePtr, ( EISICommunicationManagerNullPointer14 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aCommonRequest.Length() > ISI_HEADER_OFFSET_TRANSID ), + ( EISICommunicationInvalidLength11 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aCommonResponse.Length() > ISI_HEADER_OFFSET_MESSAGEID ), + ( EISICommunicationInvalidLength12 | EDISICommunicationManagerTraceId << KClassIdentifierShift ) ); + commonResponsePtr[ ISI_HEADER_OFFSET_MEDIA ] = commonRequestPtr[ ISI_HEADER_OFFSET_MEDIA ]; + SET_RECEIVER_DEV( commonResponsePtr, GET_SENDER_DEV( commonRequestPtr ) ); + SET_SENDER_DEV( commonResponsePtr, PN_DEV_OWN ); + commonResponsePtr[ ISI_HEADER_OFFSET_RESOURCEID ] = commonRequestPtr[ ISI_HEADER_OFFSET_RESOURCEID ]; + SET_LENGTH( commonResponsePtr, ( aCommonResponse.Length() - PN_HEADER_SIZE ) ); + SET_RECEIVER_OBJ( commonResponsePtr, GET_SENDER_OBJ( commonRequestPtr ) ); + SET_SENDER_OBJ( commonResponsePtr, iObjectIdentifier ); + commonResponsePtr[ ISI_HEADER_OFFSET_TRANSID ] = commonRequestPtr[ ISI_HEADER_OFFSET_TRANSID ]; + commonResponsePtr[ ISI_HEADER_OFFSET_MESSAGEID ] = COMMON_MESSAGE; + C_TRACE( ( _T( "DISICommunicationManager::SetIsiHeaderForCommonMessage 0x%x 0x%x<" ), &aCommonResponse, &aCommonRequest ) ); + } DECLARE_STANDARD_EXTENSION() { diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isicommunicationmanager_dll/src/isiindicationhandler.cpp --- a/connectivitylayer/isce/isicommunicationmanager_dll/src/isiindicationhandler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isicommunicationmanager_dll/src/isiindicationhandler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -15,66 +15,31 @@ * */ -#include // PNS_SUBSCRIBED_RESOURCES_EXTEND_IND_... + +#include // PN_COMMG, PNS_SUBSCRIBED_RESOURCES_... #include // For ISI_HEADER_SIZE #include // For PN_HEADER_SIZE +#include // For common ISI messages + #include "isiindicationhandler.h" // For DISIIndicationHandler #include "isicommunicationmanagertrace.h" // For C_TRACE.. #include "misiobjectrouterif.h" // For DISICommunicationManager #include "memapi.h" // For MemApi -#ifdef INTERNAL_FLAG_ISI_ROUTER_IN_USE -#include "isihelpers.h" // For SET_RECEIVER_OBJ... -#else -#include "iadhelpers.h" // For SET_RECEIVER_OBJ... -#endif -#include "nsisi.h" // For PN_MEDIA_ROUTING_REQ -#include "ape_commgrisi.h" // For APE_COMMGR.. -#include +#include "isihelpers.h" // For SET_RECEIVER_OBJ... -/* PUTB8 macro writes byte value to given address. - * This macro is used mainly by other PUTBXX macros. - */ -#define PUTB8(p,v) \ - {(*(TUint8 *)(p)) = ((TUint8)(v));} - - -/* PUTB16 macro writes 16-bit value in Big Endian format - * to given address. 16-bit value is written as two separate - * bytes, and so this macro can write 16-bit value to whatever - * address, regardless of the processor alignment restrictions - */ -#define PUTB16(p,v) \ - {PUTB8((p),(TUint16)(v)>>8); PUTB8((TUint8*)(p)+1,v);} - +// HOX! nsisi.h is also exported by ??? +#include "nsisi.h" // For PN_MEDIA_ROUTING_REQ -/* PUTB32 macro writes 32-bit value in Big Endian format - * to given address. 32-bit value is written as four separate - * bytes, and so this macro can write 32-bit value to whatever - * address, regardless of the processor alignment restrictions - */ -#define PUTB32(p,v) \ - {PUTB16((p),(TUint32)(v)>>16); PUTB16((TUint8*)(p)+2,(TUint32)(v));} +#include "ape_commgrisi.h" // For APE_COMMGR.. +#ifdef ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE +#include "misicommunicationmanagerif.h" // For MISICommunicationManagerIf +#define ISCE_INTERNAL_EXTENDED_RESOURCE_ROUTING_SUPPORTED // May be used without wider name service too +#endif // ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE -/** - * Big Endian to local endian type - */ - /* GETB8 macro returns byte value from given address. - * This macro is used mainly by other GETBXX macros. - */ -#define GETB8(p) \ - (*(TUint8 *)(p)) - - -/* GETB16 macro reads 16-bit value in Big Endian format - * from given address. 16-bit value is read as two separate - * bytes, and so this macro can read 16-bit value from whatever - * address, regardless of the processor alignment restrictions - */ -#define GETB16(p) \ - (((TUint16) GETB8(p)<<8) | (TUint16) GETB8((TUint8 *)(p)+1)) - -#define GETB32(p) \ - (((TUint32) GETB16(p)<<16) | (TUint32) GETB16((TUint8 *)(p)+2)) +#ifdef ISCE_INTERNAL_EXTENDED_RESOURCE_ROUTING_SUPPORTED +const TUint8 KEightBitShift( 8 ); +const TUint8 KSixteenBitShift( 16 ); +#endif // ISCE_INTERNAL_EXTENDED_RESOURCE_ROUTING_SUPPORTED const TUint8 KMaxAmountOfResources( 255 ); const TUint8 KPnsSubscribedResourcesExtendLength( 12 ); @@ -90,6 +55,7 @@ EISIIndicationHandlerMemAllocFailure3, EISIIndicationHandlerMemAllocFailure4, EISIIndicationHandlerMemAllocFailure5, + EISIIndicationHandlerMemAllocFailure6, EISIIndicationHandlerQueNULLPointer, EISIIndicationHandlerQueNULLPointer1, EISIIndicationHandlerQueNULLPointer2, @@ -125,6 +91,7 @@ DISIIndicationHandler::DISIIndicationHandler( MISIObjectRouterIf* aRouter ) : iRouter( aRouter ) + , iSubscriberIsAnExternalDevice( EFalse ) { C_TRACE( ( _T( "DISIIndicationHandler::DISIIndicationHandler 0x%x>" ), &iRouter ) ); C_TRACE( ( _T( "DISIIndicationHandler::DISIIndicationHandler 0x%x<" ), &iRouter ) ); @@ -233,22 +200,20 @@ // ----------------------------------------------------------------------------- // void DISIIndicationHandler::Subscribe( - TDes8& aSubscriptionReq + const TDesC8& aSubscriptionMessage ) { - C_TRACE( ( _T( "DISIIndicationHandler::Subscribe 0x%x>" ), &aSubscriptionReq ) ); - - TUint8* msgPtr( const_cast( aSubscriptionReq.Ptr() ) ); - TInt msgLength( aSubscriptionReq.Length() ); + C_TRACE( ( _T( "DISIIndicationHandler::Subscribe 0x%x>" ), &aSubscriptionMessage ) ); + TUint8* msgPtr( const_cast( aSubscriptionMessage.Ptr() ) ); + TInt msgLength( aSubscriptionMessage.Length() ); TUint32 resourceId( 0 ); TUint8 deviceId( 0 ); TUint16 objId( 0 ); - - objId = GET_SENDER_OBJ( aSubscriptionReq ); - RemoveSubscription( objId ); - + objId = GET_SENDER_OBJ( aSubscriptionMessage ); if( msgPtr[ ISI_HEADER_OFFSET_SENDERDEVICE ] == PN_DEV_OWN ) - { + { + iSubscriberIsAnExternalDevice = EFalse; + RemoveSubscription( objId ); //If any subblocks if( msgPtr[ ISI_HEADER_SIZE + APE_COMMGR_SUBSCRIBE_REQ_OFFSET_FILLERBYTE1 ] != 0 ) { @@ -257,12 +222,17 @@ { deviceId = msgPtr[ subBlockOffset + APE_COMMGR_SUBSCRIBE_SB_OFFSET_DEVICEID ]; resourceId = GETB32( &msgPtr[ subBlockOffset + APE_COMMGR_SUBSCRIBE_SB_OFFSET_FILLERBYTE1 ] ); //resource offset +#ifdef ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE + C_TRACE( ( _T( "DISIIndicationHandler::Subscribe 0x%x ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE device id to be overwritten 0x%x resource 0x%x" ), &aSubscriptionMessage, deviceId, resourceId ) ); + deviceId = MISICommunicationManagerIf::GetDeviceIdentifierByResource( resourceId ); + C_TRACE( ( _T( "DISIIndicationHandler::Subscribe 0x%x ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE new device id 0x%x resource 0x%x" ), &aSubscriptionMessage, deviceId, resourceId ) ); +#endif // ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE indication = msgPtr[ subBlockOffset + APE_COMMGR_SUBSCRIBE_SB_OFFSET_RESOURCEID ]; - C_TRACE( ( _T("DISIIndicationHandler indication 0x%x objId 0x%x resource 0x%x device 0x%x"), indication, objId, resourceId, deviceId ) ); + E_TRACE( ( _T("DISIIndicationHandler indication 0x%x objId 0x%x resource 0x%x device 0x%x"), indication, objId, resourceId, deviceId ) ); TDeviceIdLink* deviceLink = GetDeviceLink( deviceId ); if( !deviceLink ) { - C_TRACE( ( _T("DISIIndicationHandler::Subscribe device not found yet -> create: 0x%x"), deviceId ) ); + E_TRACE( ( _T("DISIIndicationHandler::Subscribe device not found yet -> create: 0x%x"), deviceId ) ); deviceLink = new TDeviceIdLink(); ASSERT_RESET_ALWAYS( deviceLink, ( EISIIndicationHandlerMemAllocFailure | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); deviceLink->iDeviceId = deviceId; @@ -284,10 +254,10 @@ { deviceLink = _LOFF( next, TDeviceIdLink, iDeviceLink ); ASSERT_RESET_ALWAYS( deviceLink, ( EISIIndicationHandlerQueNULLPointer5 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T("DISIIndicationHandler::Subscribe device: 0x%x"), deviceLink->iDeviceId ) ); + E_TRACE( ( _T("DISIIndicationHandler::Subscribe device: 0x%x"), deviceLink->iDeviceId ) ); if( deviceLink->iDeviceId != PN_DEV_OWN ) { - C_TRACE( ( _T("DISIIndicationHandler::Subscribe send subscription to device: 0x%x"), deviceLink->iDeviceId ) ); + E_TRACE( ( _T("DISIIndicationHandler::Subscribe send subscription to device: 0x%x"), deviceLink->iDeviceId ) ); SendSubscription( *deviceLink ); } next = next->iNext; @@ -295,15 +265,17 @@ } else { - deviceId = GET_SENDER_DEV( aSubscriptionReq ); + deviceId = GET_SENDER_DEV( aSubscriptionMessage ); + iSubscriberIsAnExternalDevice = ETrue; + RemoveSubscription( objId ); TDeviceIdLink* deviceLink = GetExternalDeviceLink( deviceId ); if( !deviceLink ) { - C_TRACE( ( _T("DISIIndicationHandler::Subscribe external device not found yet -> create: 0x%x"), deviceId ) ); + E_TRACE( ( _T("DISIIndicationHandler::Subscribe external device not found yet -> create: 0x%x"), deviceId ) ); deviceLink = new TDeviceIdLink(); ASSERT_RESET_ALWAYS( deviceLink, ( EISIIndicationHandlerMemAllocFailure4 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); deviceLink->iDeviceId = deviceId; - iDeviceQ.Add( &( deviceLink->iDeviceLink ) ); + iExternalDeviceQ.Add( &( deviceLink->iDeviceLink ) ); } else { @@ -316,7 +288,7 @@ { serverLink = _LOFF( serverNext, TServerIdLink, iServerLink ); ASSERT_RESET_ALWAYS( serverLink, ( EISIIndicationHandlerQueNULLPointer6 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T("DISIIndicationHandler::~DISIIndicationHandler remove server: 0x%x"), serverLink->iResourceId )); + E_TRACE( ( _T("DISIIndicationHandler::~DISIIndicationHandler remove server: 0x%x"), serverLink->iResourceId )); serverLink->iServerLink.Deque(); delete serverLink; serverLink = NULL; @@ -327,13 +299,109 @@ subBlockOffset < msgLength; subBlockOffset += KResourceArraySize ) { resourceId = GETB32( &msgPtr[ subBlockOffset ] ); - C_TRACE( ( _T("DISIIndicationHandler resource 0x%x device 0x%x"), resourceId, deviceId ) ); + E_TRACE( ( _T("DISIIndicationHandler resource 0x%x device 0x%x"), resourceId, deviceId ) ); AddServer( *deviceLink, resourceId ); } } C_TRACE( ( _T( "DISIIndicationHandler::Subscribe<" ) ) ); } +// ----------------------------------------------------------------------------- +// DIndicationHandler:: +// +// ----------------------------------------------------------------------------- +// +void DISIIndicationHandler::Multicast( + const TDesC8& aIndication + ) + { + C_TRACE( ( _T( "DISIIndicationHandler::Multicast 0x%x>" ), &aIndication ) ); + TUint8* ptr = const_cast( aIndication.Ptr() ); + TDeviceIdLink* deviceLink = NULL; + SDblQueLink* anchor = &iDeviceQ.iA; + SDblQueLink* next = anchor->iNext; + while( anchor != next ) + { + deviceLink = _LOFF( next, TDeviceIdLink, iDeviceLink ); + ASSERT_RESET_ALWAYS( deviceLink, ( EISIIndicationHandlerQueNULLPointer20 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); + C_TRACE( ( _T("DISIIndicationHandler::Multicast device: 0x%x"), deviceLink->iDeviceId ) ); + TUint32 resource = ptr[ ISI_HEADER_OFFSET_RESOURCEID ]; +#ifdef ISCE_INTERNAL_EXTENDED_RESOURCE_ROUTING_SUPPORTED + // Extended Resource Routing + if( PN_PREFIX == ptr[ ISI_HEADER_OFFSET_RESOURCEID ] ) + { + resource = ( resource | (TUint32)( ptr[ ISI_HEADER_OFFSET_TYPE ] << KEightBitShift ) ); + resource = ( resource | (TUint32)( ptr[ ISI_HEADER_OFFSET_SUBTYPE ] << KSixteenBitShift ) ); + C_TRACE( ( _T( "DISIIndicationHandler::Multicast 0x%x extended resource 0x%x" ), &aIndication, resource ) ); + } +#endif // ISCE_INTERNAL_EXTENDED_RESOURCE_ROUTING_SUPPORTED + TServerIdLink* serverLink = GetServerLink( *deviceLink, resource ); + //TServerIdLink* serverLink = GetServerLink( *deviceLink, ptr[ ISI_HEADER_OFFSET_RESOURCEID ] ); + TIndicationLink* indicationLink = NULL; + TSubscriberLink* subscriberLink = NULL; + if( serverLink ) + { + indicationLink = GetIndicationLink( *serverLink, ptr[ ISI_HEADER_OFFSET_MESSAGEID ] ); + } + if( indicationLink ) + { + SDblQueLink* subscriberAnchor = NULL; + SDblQueLink* subscriberNext = NULL; + subscriberAnchor = &indicationLink->iSubscriberQ.iA; + subscriberNext = subscriberAnchor->iNext; + while( subscriberAnchor != subscriberNext ) + { + subscriberLink = _LOFF( subscriberNext, TSubscriberLink, iSubscriberLink ); + ASSERT_RESET_ALWAYS( subscriberLink, ( EISIIndicationHandlerQueNULLPointer21 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); + C_TRACE( ( _T("DISIIndicationHandler::Multicast Subscriber objid: 0x%x"), subscriberLink->iObjId )); + // Make a copy to every subscriber + TDes8& tempPtr = MemApi::AllocBlock( aIndication.Length() ); + tempPtr.Copy( ptr, aIndication.Length() ); + TUint8* copyPtr = const_cast( tempPtr.Ptr() ); + SET_RECEIVER_OBJ( copyPtr, subscriberLink->iObjId ); + iRouter->Send( tempPtr, PN_OBJ_EVENT_MULTICAST ); + subscriberNext = subscriberNext->iNext; + } + } + next = next->iNext; + } + deviceLink = NULL; + anchor = &iExternalDeviceQ.iA; + next = anchor->iNext; + while( anchor != next ) + { + deviceLink = _LOFF( next, TDeviceIdLink, iDeviceLink ); + ASSERT_RESET_ALWAYS( deviceLink, ( EISIIndicationHandlerQueNULLPointer22 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); + C_TRACE( ( _T("DISIIndicationHandler::Multicast external device: 0x%x"), deviceLink->iDeviceId ) ); + TUint32 resource = ptr[ ISI_HEADER_OFFSET_RESOURCEID ]; +#ifdef ISCE_INTERNAL_EXTENDED_RESOURCE_ROUTING_SUPPORTED + // Extended Resource Routing + if( PN_PREFIX == ptr[ ISI_HEADER_OFFSET_RESOURCEID ] ) + { + resource = ( resource | (TUint32)( ptr[ ISI_HEADER_OFFSET_TYPE ] << KEightBitShift ) ); + resource = ( resource | (TUint32)( ptr[ ISI_HEADER_OFFSET_SUBTYPE ] << KSixteenBitShift ) ); + C_TRACE( ( _T( "DISIIndicationHandler::Multicast 0x%x extended resource 0x%x, external device 0x%x" ), &aIndication, resource, deviceLink->iDeviceId ) ); + } +#endif // ISCE_INTERNAL_EXTENDED_RESOURCE_ROUTING_SUPPORTED + TServerIdLink* serverLink = GetServerLink( *deviceLink, resource ); + if( serverLink ) + { + C_TRACE( ( _T("DISIIndicationHandler::Multicast resource: 0x%x"), serverLink->iResourceId )); + // Make a copy to every external subscriber + TDes8& tempPtr2 = MemApi::AllocBlock( aIndication.Length() ); + tempPtr2.Copy( ptr, aIndication.Length() ); + TUint8* copyPtr2 = const_cast( tempPtr2.Ptr() ); + SET_RECEIVER_DEV( tempPtr2, deviceLink->iDeviceId ); + tempPtr2[ ISI_HEADER_OFFSET_RESOURCEID ] = ptr[ ISI_HEADER_OFFSET_RESOURCEID ]; + SET_RECEIVER_OBJ( tempPtr2, PN_OBJ_EVENT_MULTICAST ); + SET_SENDER_OBJ( tempPtr2, ptr[ ISI_HEADER_OFFSET_SENDEROBJECT ] ); + iRouter->Send( tempPtr2, PN_OBJ_EVENT_MULTICAST ); + } + next = next->iNext; + } + C_TRACE( ( _T( "DISIIndicationHandler::Multicast 0x%x<" ), &aIndication ) ); + } + // ----------------------------------------------------------------------------- // DISIIndicationHandler::AddServer @@ -458,7 +526,7 @@ { tmpDeviceLink = _LOFF( next, TDeviceIdLink, iDeviceLink ); ASSERT_RESET_ALWAYS( tmpDeviceLink, ( EISIIndicationHandlerQueNULLPointer7 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T( "DISIIndicationHandler::GetDeviceLink device: 0x%x"), tmpDeviceLink->iDeviceId ) ); + E_TRACE( ( _T( "DISIIndicationHandler::GetDeviceLink device: 0x%x"), tmpDeviceLink->iDeviceId ) ); if( tmpDeviceLink->iDeviceId == aDeviceId ) { deviceLink = tmpDeviceLink; @@ -488,7 +556,7 @@ { tmpDeviceLink = _LOFF( next, TDeviceIdLink, iDeviceLink ); ASSERT_RESET_ALWAYS( tmpDeviceLink, ( EISIIndicationHandlerQueNULLPointer8 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T( "DISIIndicationHandler::GetExternalDeviceLink device: 0x%x"), tmpDeviceLink->iDeviceId ) ); + E_TRACE( ( _T( "DISIIndicationHandler::GetExternalDeviceLink device: 0x%x"), tmpDeviceLink->iDeviceId ) ); if( tmpDeviceLink->iDeviceId == aDeviceId ) { deviceLink = tmpDeviceLink; @@ -520,7 +588,7 @@ { tmpServerLink = _LOFF( next, TServerIdLink, iServerLink ); ASSERT_RESET_ALWAYS( tmpServerLink, ( EISIIndicationHandlerQueNULLPointer9 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T( "DISIIndicationHandler::GetServerLink server: 0x%x"), tmpServerLink->iResourceId ) ); + E_TRACE( ( _T( "DISIIndicationHandler::GetServerLink server: 0x%x"), tmpServerLink->iResourceId ) ); if( tmpServerLink->iResourceId == aResourceId ) { serverLink = tmpServerLink; @@ -663,7 +731,16 @@ { C_TRACE( ( _T( "DISIIndicationHandler::RemoveSubscription 0x%x>" ), aObjId ) ); - SDblQueLink* deviceAnchor = &iDeviceQ.iA; + SDblQueLink* deviceAnchor; + if( iSubscriberIsAnExternalDevice ) + { + deviceAnchor = &iExternalDeviceQ.iA; + iSubscriberIsAnExternalDevice = EFalse; + } + else + { + deviceAnchor = &iDeviceQ.iA; + } SDblQueLink* next = deviceAnchor->iNext; TDeviceIdLink* deviceLink = NULL; @@ -683,7 +760,7 @@ { deviceLink = _LOFF( next, TDeviceIdLink, iDeviceLink ); ASSERT_RESET_ALWAYS( deviceLink, ( EISIIndicationHandlerQueNULLPointer16 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T("DISIIndicationHandler::RemoveSubscription device: 0x%x"), deviceLink->iDeviceId ) ); + E_TRACE( ( _T("DISIIndicationHandler::RemoveSubscription device: 0x%x"), deviceLink->iDeviceId ) ); serverAnchor = &deviceLink->iServerQ.iA; serverNext = serverAnchor->iNext; while( serverAnchor != serverNext ) @@ -696,7 +773,7 @@ { indicationLink = _LOFF( indicationNext, TIndicationLink, iIndicationLink ); ASSERT_RESET_ALWAYS( indicationLink, ( EISIIndicationHandlerQueNULLPointer18 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T("DISIIndicationHandler::RemoveSubscription indication: 0x%x"), indicationLink->iIndication )); + E_TRACE( ( _T("DISIIndicationHandler::RemoveSubscription indication: 0x%x"), indicationLink->iIndication )); // get next link already in case if particular link is to be deleted indicationNext = indicationNext->iNext; subscriberAnchor = &indicationLink->iSubscriberQ.iA; @@ -705,17 +782,17 @@ { subscriberLink = _LOFF( subscriberNext, TSubscriberLink, iSubscriberLink ); ASSERT_RESET_ALWAYS( subscriberLink, ( EISIIndicationHandlerQueNULLPointer19 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T("DISIIndicationHandler::RemoveSubscription objid: 0x%x"), subscriberLink->iObjId )); + E_TRACE( ( _T("DISIIndicationHandler::RemoveSubscription objid: 0x%x"), subscriberLink->iObjId )); if( subscriberLink->iObjId == aObjId ) { - C_TRACE( ( _T("DISIIndicationHandler::RemoveSubscription remove objid: 0x%x"), subscriberLink->iObjId )); + E_TRACE( ( _T("DISIIndicationHandler::RemoveSubscription remove objid: 0x%x"), subscriberLink->iObjId )); TBool onlySubscriber( subscriberLink->iSubscriberLink.Alone() ); subscriberLink->iSubscriberLink.Deque(); delete subscriberLink; subscriberLink = NULL; if( onlySubscriber ) { - C_TRACE( ( _T("DISIIndicationHandler::RemoveSubscription remove indication: 0x%x"), indicationLink->iIndication )); + E_TRACE( ( _T("DISIIndicationHandler::RemoveSubscription remove indication: 0x%x"), indicationLink->iIndication )); indicationLink->iIndicationLink.Deque(); delete indicationLink; indicationLink = NULL; @@ -735,7 +812,7 @@ if( indicationAnchor == indicationNext ) { // No more indications for the server -> server link can be deleted - C_TRACE( ( _T("DISIIndicationHandler::RemoveSubscription remove server: 0x%x"), serverLink->iResourceId )); + E_TRACE( ( _T("DISIIndicationHandler::RemoveSubscription remove server: 0x%x"), serverLink->iResourceId )); serverLink->iServerLink.Deque(); delete serverLink; serverLink = NULL; @@ -747,7 +824,7 @@ if( serverAnchor == serverNext ) { // No more servers for the device -> device link can be deleted - C_TRACE( ( _T("DISIIndicationHandler::RemoveSubscription remove device: 0x%x"), deviceLink->iDeviceId )); + E_TRACE( ( _T("DISIIndicationHandler::RemoveSubscription remove device: 0x%x"), deviceLink->iDeviceId )); deviceLink->iDeviceLink.Deque(); delete deviceLink; deviceLink = NULL; @@ -755,86 +832,7 @@ } C_TRACE( ( _T( "DISIIndicationHandler::RemoveSubscription 0x%x<" ), aObjId ) ); } - -// ----------------------------------------------------------------------------- -// DIndicationHandler:: -// -// ----------------------------------------------------------------------------- -// -void DISIIndicationHandler::Multicast( - TDes8& aIndication - ) - { - C_TRACE( ( _T( "DISIIndicationHandler::Multicast 0x%x ->" ), &aIndication ) ); - - TUint8* ptr = const_cast( aIndication.Ptr() ); - - TDeviceIdLink* deviceLink = NULL; - SDblQueLink* anchor = &iDeviceQ.iA; - SDblQueLink* next = anchor->iNext; - while( anchor != next ) - { - deviceLink = _LOFF( next, TDeviceIdLink, iDeviceLink ); - ASSERT_RESET_ALWAYS( deviceLink, ( EISIIndicationHandlerQueNULLPointer20 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T("DISIIndicationHandler::Multicast device: 0x%x"), deviceLink->iDeviceId ) ); - TServerIdLink* serverLink = GetServerLink( *deviceLink, ptr[ ISI_HEADER_OFFSET_RESOURCEID ] ); - TIndicationLink* indicationLink = NULL; - TSubscriberLink* subscriberLink = NULL; - if( serverLink ) - { - indicationLink = GetIndicationLink( *serverLink, ptr[ ISI_HEADER_OFFSET_MESSAGEID ] ); - } - if( indicationLink ) - { - SDblQueLink* subscriberAnchor = NULL; - SDblQueLink* subscriberNext = NULL; - subscriberAnchor = &indicationLink->iSubscriberQ.iA; - subscriberNext = subscriberAnchor->iNext; - while( subscriberAnchor != subscriberNext ) - { - subscriberLink = _LOFF( subscriberNext, TSubscriberLink, iSubscriberLink ); - ASSERT_RESET_ALWAYS( subscriberLink, ( EISIIndicationHandlerQueNULLPointer21 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T("DISIIndicationHandler::Multicast Subscriber objid: 0x%x"), subscriberLink->iObjId )); - // Make a copy to every subscriber - TDes8& tempPtr = MemApi::AllocBlock( aIndication.Length() ); - tempPtr.Copy( ptr, aIndication.Length() ); - TUint8* ptr = const_cast( tempPtr.Ptr() ); - SET_RECEIVER_OBJ( ptr, subscriberLink->iObjId ); - iRouter->Send( tempPtr, PN_OBJ_EVENT_MULTICAST ); - subscriberNext = subscriberNext->iNext; - } - } - next = next->iNext; - } - deviceLink = NULL; - anchor = &iExternalDeviceQ.iA; - next = anchor->iNext; - while( anchor != next ) - { - deviceLink = _LOFF( next, TDeviceIdLink, iDeviceLink ); - ASSERT_RESET_ALWAYS( deviceLink, ( EISIIndicationHandlerQueNULLPointer22 | EDISIIndicationHandlerTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T("DISIIndicationHandler::Multicast external device: 0x%x"), deviceLink->iDeviceId ) ); - TServerIdLink* serverLink = GetServerLink( *deviceLink, ptr[ ISI_HEADER_OFFSET_RESOURCEID ] ); - if( serverLink ) - { - C_TRACE( ( _T("DISIIndicationHandler::Multicast resource: 0x%x"), serverLink->iResourceId )); - // Make a copy to every external subscriber - TDes8& tempPtr = MemApi::AllocBlock( aIndication.Length() ); - tempPtr.Copy( ptr, aIndication.Length() ); - TUint8* ptr = const_cast( tempPtr.Ptr() ); - SET_RECEIVER_DEV( tempPtr, deviceLink->iDeviceId ); - tempPtr[ ISI_HEADER_OFFSET_RESOURCEID ] = ptr[ ISI_HEADER_OFFSET_RESOURCEID ]; - SET_RECEIVER_OBJ( tempPtr, PN_OBJ_EVENT_MULTICAST ); - SET_SENDER_OBJ( tempPtr, ptr[ ISI_HEADER_OFFSET_SENDEROBJECT ] ); - iRouter->Send( tempPtr, PN_OBJ_EVENT_MULTICAST ); - } - next = next->iNext; - } - C_TRACE( ( _T( "DISIIndicationHandler::Multicast 0x%x <-" ), &aIndication ) ); - } - - - + // ----------------------------------------------------------------------------- // DISIIndicationHandler::SendSubscription // @@ -846,15 +844,10 @@ TDes8& desPtr = MemApi::AllocBlock( ISI_HEADER_SIZE + SIZE_PNS_SUBSCRIBED_RESOURCES_EXTEND_IND + ( KMaxAmountOfResources * KResourceArraySize ) ); TUint8* ptr( const_cast( desPtr.Ptr() ) ); + C_TRACE( ( _T( "DISIIndicationHandler::SendSubscription SET_SENDER_DEV to PN_DEV_OWN = 0x%x and SET_RECEIVER_DEV to 0x%x" ), PN_DEV_OWN, aDevice.iDeviceId ) ); ptr[ ISI_HEADER_OFFSET_MEDIA ] = PN_MEDIA_ROUTING_REQ; - // TODO a bug? SET_RECEIVER_DEV( ptr, aDevice.iDeviceId ); -#ifdef NCP_COMMON_BRIDGE_FAMILY - SET_SENDER_DEV( ptr, PN_DEV_HOST ); - SET_RECEIVER_DEV( ptr, PN_DEV_MODEM ); -#else - SET_SENDER_DEV( ptr, PN_DEV_SOS ); - SET_RECEIVER_DEV( ptr, PN_DEV_HOST ); -#endif + SET_SENDER_DEV( ptr, PN_DEV_OWN ); + SET_RECEIVER_DEV( ptr, aDevice.iDeviceId ); ptr[ ISI_HEADER_OFFSET_RESOURCEID ] = PN_COMMGR; SET_RECEIVER_OBJ( ptr, PN_OBJ_ROUTER ); SET_SENDER_OBJ( ptr, PN_OBJ_EVENT_MULTICAST ); diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isinameservice_dll/eabi/isinameserviceu.def --- a/connectivitylayer/isce/isinameservice_dll/eabi/isinameserviceu.def Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isinameservice_dll/eabi/isinameserviceu.def Tue Oct 19 13:16:20 2010 +0300 @@ -1,3 +1,4 @@ EXPORTS _ZN26MISICommunicationManagerIf15IsValidResourceERK6TDesC8 @ 1 NONAME + _ZN26MISICommunicationManagerIf29GetDeviceIdentifierByResourceEm @ 2 NONAME diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isinameservice_dll/group/isinameservice.mmp --- a/connectivitylayer/isce/isinameservice_dll/group/isinameservice.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isinameservice_dll/group/isinameservice.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -39,7 +39,6 @@ USERINCLUDE ../inc USERINCLUDE ../../isirouter_dll/inc -USERINCLUDE ../../isaaccessextension_dll/inc USERINCLUDE ../../memmanager_dll/inc @@ -51,7 +50,7 @@ DEFFILE isinameservice.def LIBRARY memmanager.lib -LIBRARY isaaccessextension.lib +LIBRARY isirouter.lib START WINS win32_library kernel32.lib @@ -60,4 +59,6 @@ // flag to enable normal trace inside component MACRO COMPONENT_TRACE_FLAG +//MACRO COMPONENT_TRACE_FLAG_EXTEND +MACRO ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isinameservice_dll/inc/isinameservice.h --- a/connectivitylayer/isce/isinameservice_dll/inc/isinameservice.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isinameservice_dll/inc/isinameservice.h Tue Oct 19 13:16:20 2010 +0300 @@ -22,6 +22,11 @@ #include "misirouterobjectif.h" #include "misicommunicationmanagerif.h" +#ifdef ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE +class DISINameServiceExtended; +#define ISCE_INTERNAL_EXTENDED_RESOURCE_ROUTING_SUPPORTED +#endif + class MISIObjectRouterIf; class DNameRecords; @@ -48,14 +53,45 @@ */ void Receive( const TDesC8& aMessage ); - void HandlePNSNameMessage( const TDesC8& aMessage ); - void HandleNameQueryResp( const TDesC8& aMessage, const TUint8* msgPtr ); - void HandleNameRemoveResp( const TDesC8& aMessage, const TUint8* msgPtr ); + /* + * See comments from MISICommunicationManagerIf + */ + static TBool IsValidResource( const TDesC8& aMessage ); /* * See comments from MISICommunicationManagerIf */ - static TBool IsValidResource( const TDesC8& aMessage ); + static TUint8 GetDeviceIdentifierByResource( const TUint32 aResourceIdentifier ); + + /* + * Return device identifier for a given resource identifier + * @param aResourceIdentifier + * @return device identifier + */ + TUint8 GetDeviceIdByResource( const TUint32 aResourceIdentifier ); + + /* + * Return device identifier for a given resource identifier + * @param aMessage, message which contains the resource to check + * @return ETrue if resource was valid + */ + TBool HandleResourceValidationCheck( const TDesC8& aMessage ); + + /* + * Returns a pointer to self. + * If pointer does not exist shall assert and throw a fault. + * @return DISINameService* + */ + static DISINameService* GetISINameServiceF(); + + /* + * Returns pointer to name records. + * If pointer does not exist shall assert and throws a fault. + * @return DNameRecords* + */ + DNameRecords* GetNameRecordsF(); + + private: /* * Construct COMM_ISA_ENTITY_NOT_REACHABLE_RESP message and @@ -63,19 +99,161 @@ */ void BuildAndSendCommIsaEntityNotReachableResp( const TDesC8& aMsg ); - static DISINameService* iThisptr; + void HandlePnsNameMessage( const TDesC8& aMessage ); + void HandleNameQueryReq( const TDesC8& aPnsNameQueryReq ); + void HandleNameRemoveReq( const TDesC8& aPnsNameRemoveReq ); + void HandleNameAddReq( const TDesC8& aPnsNameAddReq ); + void HandleCommonMessage( const TDesC8& aCommonMessage ); + + void SendCommServiceNotIdentifiedResp( TDes8& aCommServiceNotIdentifiedRespMsg ); + void SendCommIsiVersionGetResp( TDes8& aCommIsiVersionGetRespMsg ); + + // Extended resource identifier support for NameService + TUint32 GetResourceUsedInMessage( const TDesC8& aMessageToBeResourceRouted ); + + void SetIsiHeaderForCommonResp( const TDesC8& aResponseMessage, + const TDesC8& aRequestMessage ); + + void SetIsiHeaderForResp( const TDesC8& aResponseMessage, + const TDesC8& aRequestMessage, + const TUint8 aResponseMessageIdentifier ); + + void SetIsiHeaderForIndication( const TDesC8& aIndicationToModify, + const TDesC8& aPnsNameRequest, + const TUint8 aIndicationMessageIdentifier ); + + void TxPnsNameAddInd( const TDesC8& aPnsNameAddReq, + const TUint32 aName, + const TUint16 aPhoNetAddress, + const TUint8 aFlags ); + + void TxPnsNameRemoveInd( const TDesC8& aPnsNameRemoveReq, + const TUint32 aName, + const TUint16 aPhoNetAddress, + const TUint8 aFlags ); + +#ifdef ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE + public: +#endif // ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE + void SendToRouter( TDes8& aMessage ); + + // Because accessed from MISICommunicationManagerIf::IsValidResource function. + public: + + void LockNameServiceDMutex(); + void FreeNameServiceDMutex(); + +#ifdef ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE + private: + DISINameServiceExtended* iISINameServiceExtended; +#endif // ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE + private: + + // Not owned. + MISIObjectRouterIf* iRouter; + // Owned + static DMutex* iNameServiceMutex; + // Owned + DNameRecords* iNameRecords; + // Owned + static DISINameService* iThisptr; + TUint8 iObjId; + + }; + +#ifdef ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE +class DISINameService; - static DMutex* iNameServiceMutex; +/* +* ISI router. +*/ +NONSHARABLE_CLASS( DISINameServiceExtended ) : public DBase + { + + private: + + enum TStateOfSubscription + { + ENotSubscribed = 0, + ESubscribed, + EDone, + }; + + public: + + /* + * Default contructor + */ + DISINameServiceExtended( DISINameService* aNameService ); + + /* + * Destructor + */ + ~DISINameServiceExtended(); + + /* + * Responsibility to deallocate message is transferred. + * @aPnsNameAddInd, message + */ + void RxPnsNameAddInd( const TDesC8& aPnsNameAddInd ); - DNameRecords* iNameRecords; + /* + * Ownership of the message is not transferred. + * @param aMessage, message where to check the device id + * @return ETrue if own device + */ + TBool IsRxDeviceOwnDevice( const TDesC8& aMessage ); + + /* + * Check is the ape commgr subscribe response message already received + * @return ETrue if not received ape commgr subscribe resp already + */ + TBool ApeCommgrSubscribeRespNotReceived(); + + /* + * @return ETrue if not subsribed name add ind message + */ + TBool NotSubscribedNameAddIndAlready(); + + /* + * Receive the ape commgr subscribe response. + * Ownership of the message is transferred. + * @param aMessage + */ + void RxApeCommgrSubscribeResp( const TDesC8& aMessage ); + + /* + * Subscribes pns name add ind + */ + void SubscribePnsNameAddInd(); + + /* + * Modifies communication manager resource to contain also device identifier + * [0]=PN_COMMGR [1]=Device Identifier [2]=don't care [3]=don't care + * @param aCommgrResource, reference to resource, which value shall be modified + * @param aDeviceIdentifier + */ + void ModifyCommgrResource( TUint32& aCommgrResource, const TUint8 aDeviceIdentifier ); private: - MISIObjectRouterIf* iRouter; - TUint8 iObjId; + void AddModemResources(); + //void AddPnDevDspMainResources(); + + void HandleApeCommgrSubscribeResp( const TDesC8& aApeCommGrSubscribeResp ); + + //void HandleNameAddInd( const TDesC8& aNameAddInd ); + + //void SubscribeNameAddInd(); + + // Not owned + DISINameService* iISINameService; + TStateOfSubscription iShNameAddIndSubscriptionState; }; +#endif // ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE + #endif /* __ISINAMESERVICE_H__ */ diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isinameservice_dll/inc/isinameservicetrace.h --- a/connectivitylayer/isce/isinameservice_dll/inc/isinameservicetrace.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isinameservice_dll/inc/isinameservicetrace.h Tue Oct 19 13:16:20 2010 +0300 @@ -46,12 +46,19 @@ #else #define C_TRACE(a) #endif // COMPONENT_TRACE_FLAG + #if defined COMPONENT_TRACE_FLAG_EXTEND + #define E_TRACE(a) __TRACE_PRINTF(a) + #else + #define E_TRACE(a) + #endif // COMPONENT_TRACE_FLAG_EXTEND #else #define C_TRACE(a) + #define E_TRACE(a) #endif // _DEBUG // Resets are made both in UDEB and UREL (traces only in udeb) #define ASSERT_RESET_ALWAYS(a,b) if(!(a)) { __TRACE_PRINTF(("Assertion failed: file=" __FILE__ ", line=%d, compiled="__DATE__" "__TIME__, __LINE__)); Kern::Fault( "ISINameService:", b ); } +#define TRACE_ASSERT_ALWAYS(a) if (!(a)) __TRACE_PRINTF(("Assertion failed: file=" __FILE__ ", line=%d, compiled=" __DATE__" "__TIME__, __LINE__ )) #define TRACE_ASSERT(a) if (!(a)) __TRACE_PRINTF(("Assertion failed: file=" __FILE__ ", line=%d, compiled=" __DATE__" "__TIME__, __LINE__ )) #endif // __ISINAMESERVICETRACE_H__ diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isinameservice_dll/inc/misicommunicationmanagerif.h --- a/connectivitylayer/isce/isinameservice_dll/inc/misicommunicationmanagerif.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isinameservice_dll/inc/misicommunicationmanagerif.h Tue Oct 19 13:16:20 2010 +0300 @@ -35,6 +35,13 @@ */ IMPORT_C static TBool IsValidResource( const TDesC8& aMessage ); + /* + * Returns device identifier where the resource is located. + * @param aResourceIdentifier + * @return Device Identifier of the resource + */ + IMPORT_C static TUint8 GetDeviceIdentifierByResource( const TUint32 aResourceIdentifier ); + }; #endif /* __MISICOMMUNICATIONMANAGERIF_H__ */ diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isinameservice_dll/inc/namerecords.h --- a/connectivitylayer/isce/isinameservice_dll/inc/namerecords.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isinameservice_dll/inc/namerecords.h Tue Oct 19 13:16:20 2010 +0300 @@ -23,40 +23,146 @@ #include // For TDesC8 #include // For DBase -NONSHARABLE_CLASS ( TNameTable ) -{ -public: - TNameTable( const TUint32 aName, const TUint16 aPhonetAddress, const TUint8 aFlags ) - :iName(aName), - iPhonetAddress(aPhonetAddress), - iFlags(aFlags) - {} +NONSHARABLE_CLASS( TNameTableEntry ) + { + public: + + TNameTableEntry( const TUint32 aName, const TUint16 aPhonetAddress, const TUint8 aFlags ) + :iName(aName), + iPhonetAddress(aPhonetAddress), + iFlags(aFlags) + {} + + TUint32 iName; + TUint16 iPhonetAddress; + TUint8 iFlags; + + }; + +NONSHARABLE_CLASS( DNameRecords ) : public DBase + { + + public: + + /* + * Assumption each function executed from single thread at the time. + * Constructor + */ + DNameRecords(); + + /* + * Assumption each function executed from single thread at the time. + * Destructor + */ + ~DNameRecords(); - TUint32 iName; - TUint16 iPhonetAddress; - TUint8 iFlags; - }; + /* + * Assumption each function executed from single thread at the time. + * @param aName, name to be added + * @param aPhonetAddress, PhoNet address of the name to be added + * @param aFlags, flags of the name to be added + * @return PN_NAME_UNKNOWN if flags value invalid, PN_NAME_NOT_ALLOWED if not changeable name + */ + TUint8 AddName( const TUint32 aName, + const TUint16 aPhonetAddress, + const TUint8 aFlags ); + + /* + * Assumption each function executed from single thread at the time. + * @param aName + * @param aPhonetAddress, modified to contain names PhoNet address if name is found + * @return KErrNone if found KErrNotFound if not + */ + TInt LookupPhonetAddress( const TUint32 aName, TUint16* aPhonetAddress ); + + /* + * Assumption each function executed from single thread at the time. + * @param aName + * @param aPhonetAddress, modified to contain names PhoNet address if name is found + * @param aFlags, modified to contain names flag if name is found + * @return KErrNone if found KErrNotFound if not + */ + TInt LookupNamePhonetAddressAndFlags( const TUint32 aName, TUint16* aPhonetAddress, TUint8* aFlags ); + + /* + * Assumption each function executed from single thread at the time. + * @param aName + * @param aMask, mask for matching names + * @param aResultsArray, array where matches are appended + */ + void NameQuery( const TUint32 aName, const TUint32 aMask, RArray *aResultsArray ); -NONSHARABLE_CLASS (DNameRecords) : public DBase -{ -public: - DNameRecords(); - ~DNameRecords(); + /* + * Assumption each function executed from single thread at the time. + * @param aName + * @return PN_NAME_UNKNOWN if name not found, PN_NAME_NOT_ALLOWED if not allowed to remove name + */ + TUint8 RemoveName( const TUint32 aName ); + + private: - RArray iNameTableArray; + /* + * Adds new name to name table. + * @param aName + * @param aPhonetAddress + * @param aFlags + * @return PN_NAME_NOT_ALLOWED if name not found or it's address was equal to own device router, otherwise PN_NAME_OK + */ + TUint8 AddNewName( const TUint32 aName, + const TUint16 aPhonetAddress, + const TUint8 aFlags ); + /* + * Ownership of the parameter not given. + * Adds existing name to the name table. + * @param aNameTableEntry + * @param aName + * @param aPhonetAddress + * @param aFlags + * @return PN_NAME_NOT_ALLOWED if not changeable PN_NAME_OK otherwise + */ + TUint8 AddExistinNameToNameTableArray( TNameTableEntry* aNameTableEntry, + const TUint32 aName, + const TUint16 aPhonetAddress, + const TUint8 aFlags ); - TUint8 AddName( const TUint32 aName, - const TUint16 aPhonetAddress, - const TUint8 aFlags ); + /* + * Adds and creates new name table entry + * @param aName + * @param aPhonetAddress + * @param aFlags + * @return PN_NAME_NOT_ALLOWED if router object tried to add PN_NAME_OK otherwise + */ + TUint8 AddNewNameToNameTableArray( const TUint32 aName, + const TUint16 aPhonetAddress, + const TUint8 aFlags ); - TUint8 RemoveName( const TUint32 aName ); + /* + * Ownership of the return value not given. + * @param aName + * @return pointer to table entry, NULL if not found + */ + TNameTableEntry* FindMatchingNameTableEntry( const TUint32 aName ); - TInt32 LookupPhonetAddress( const TUint32 aName, TUint16* aPhonetAddress ); + /* + * Ownership of the array is not given. + * @param aName + * @param aMask, mask to find name table entries + * @aResultsArray, array where found name table entries are added + */ + void FindMatchingNameTableEntriesWithMask( const TUint32 aName, + const TUint32 aMask, + RArray * aResultsArray ); - RArray * GetNameTable(); + /* + * Remove entry given as paramater. + * @param aNameEntryToRemove + */ + void RemoveUndefinedEntry( TNameTableEntry& aNameEntryToRemove ); - TInt32 NameQuery( const TUint32 aName, const TUint32 aMask, RArray *aResultsArray ); -}; + // Name table array, owned. + RArray iNameTableArray; + + }; #endif /* __NAMERECORDS_H__ */ diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isinameservice_dll/src/isinameservice.cpp --- a/connectivitylayer/isce/isinameservice_dll/src/isinameservice.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isinameservice_dll/src/isinameservice.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -15,7 +15,6 @@ * */ - #include // For Kern #include "isinameservice.h" // For DISINameService #include "misiobjectrouterif.h" // For MISIObjectRouterIf @@ -24,86 +23,101 @@ #include // For ISI_HEADER_SIZE #include // For PN_NAMESERVICE #include // For PN - -#ifdef INTERNAL_FLAG_ISI_ROUTER_IN_USE +#include "misiobjectrouterif.h" // For MISIObjectRouterIf #include "isihelpers.h" // For SET_RECEIVER_OBJ... -#else -#include "iadhelpers.h" // For SET_RECEIVER_OBJ... +#include "namerecords.h" // For DNameRecords +#include "routerisi.h" // For PN_ROUTER +#include // For SIZE_COMMON_MESSAGE_COMM_ISA_ENTITY_NOT_REACHABLE_RESP + +#ifdef ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE +#include "ape_commgrisi.h" // For APE_COMMGR +#define ISCE_INTERNAL_EXTENDED_RESOURCE_ROUTING_SUPPORTED +//#include "isinameserviceextended.h" // For DISINameServiceExtended #endif -#include "namerecords.h" // For DNameRecords -#include // For THIS_DEVICE -#include // For SIZE_COMMON_MESSAGE_COMM_ISA_ENTITY_NOT_REACHABLE_RESP + // Faults enum TISINameServiceFaults { EISINameServiceMemAllocFailure = 0x01, EISINameServiceNullPointer, + EISINameServiceNullPointer1, + EISINameServiceNullPointer2, + EISINameServiceNullPointer6, + EISINameServiceNullPointer7, + EISINameServiceNullPointer8, + EISINameServiceNullPointer9, + EISINameServiceNullPointer10, + EISINameServiceNullPointer11, + EISINameServiceNullPointer12, + EISINameServiceNullPointer13, + EISINameServiceNullPointer14, + EISINameServiceNullPointer15, + EISINameServiceNullPointer16, + EISINameServiceNullPointer17, + EISINameServiceNullPointer18, + EISINameServiceNullPointer19, + EISINameServiceWrongLength, + EISINameServiceWrongLength1, + EISINameServiceWrongLength6, + EISINameServiceWrongLength7, + EISINameServiceWrongLength8, + EISINameServiceWrongLength9, + EISINameServiceWrongLength10, + EISINameServiceWrongLength11, + EISINameServiceWrongLength12, EISINameServiceUnknownMessage, EISINameServiceMutexCreateFailed, EISINameServiceMutexWaitFailed, + EISINameServiceSendFailed, + EISINameServiceFatalError, +#ifdef ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE + EISINameServiceWrongLength2, + EISINameServiceWrongLength3, + EISINameServiceNullPointer3, + EISINameServiceNullPointer4, + EISINameServiceNullPointer5, + EISINameServiceNameCreateFailed, + EISINameServiceNameCreateFailed1, + EISINameServiceNameCreateFailed2, + EISINameServiceNameCreateFailed3, + EISINameServiceNameCreateFailed4, + EISINameServiceNameCreateFailed5, + EISINameServiceNameCreateFailed6, + EISINameServiceNameCreateFailed7, + EISINameServiceNameCreateFailed8, + EISINameServiceNameCreateFailed9, + EISINameServiceNameCreateFailed10, + EISINameServiceNameCreateFailed11, + EISINameServiceNameCreateFailed12, + EISINameServiceNameCreateFailed13, + EISINameServiceNameCreateFailed14, + EISINameServiceNameCreateFailed15, + EISINameServiceNameCreateFailed16, + EISINameServiceNameCreateFailed17, + EISINameServiceNameCreateFailed18, + EISINameServiceWrongResponse, + EISINameServiceNameExtendedCreateFailed, + EISINameServiceExtendedNullPointer, + EISINameServiceNameNotCommgrResource, + EISINameServiceNameNotCommgrDevice, + EISINameServiceLookUpForPhoNetAddressAndFlagsFailed, +#endif // ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE }; - -/* PUTB8 macro writes byte value to given address. - * This macro is used mainly by other PUTBXX macros. - */ -#define PUTB8(p,v) \ - {(*(TUint8 *)(p)) = ((TUint8)(v));} - - -/* PUTB16 macro writes 16-bit value in Big Endian format - * to given address. 16-bit value is written as two separate - * bytes, and so this macro can write 16-bit value to whatever - * address, regardless of the processor alignment restrictions - */ -#define PUTB16(p,v) \ - {PUTB8((p),(TUint16)(v)>>8); PUTB8((TUint8*)(p)+1,v);} - - -/* PUTB32 macro writes 32-bit value in Big Endian format - * to given address. 32-bit value is written as four separate - * bytes, and so this macro can write 32-bit value to whatever - * address, regardless of the processor alignment restrictions - */ -#define PUTB32(p,v) \ - {PUTB16((p),(TUint32)(v)>>16); PUTB16((TUint8*)(p)+2,(TUint32)(v));} - - -/** - * Big Endian to local endian type - */ - /* GETB8 macro returns byte value from given address. - * This macro is used mainly by other GETBXX macros. - */ -#define GETB8(p) \ - (*(TUint8 *)(p)) - - -/* GETB16 macro reads 16-bit value in Big Endian format - * from given address. 16-bit value is read as two separate - * bytes, and so this macro can read 16-bit value from whatever - * address, regardless of the processor alignment restrictions - */ -#define GETB16(p) \ - (((TUint16) GETB8(p)<<8) | (TUint16) GETB8((TUint8 *)(p)+1)) - - -/* GETB32 macro reads 32-bit value in Big Endian format - * from given address. 32-bit value is read as four separate - * bytes, and so this macro can read 32-bit value from whatever - * address, regardless of the processor alignment restrictions - */ -#define GETB32(p) \ - (((TUint32) GETB16(p)<<16) | (TUint32) GETB16((TUint8 *)(p)+2)) - - const TUint32 KNameServiceUID( 0x2002A5A1 ); const TUint8 KFiller( 0 ); +const TUint8 KAlwaysAssert( 0x00 ); + +const TUint16 KOneMatch( 0x00001 ); DISINameService* DISINameService::iThisptr = NULL; DMutex* DISINameService::iNameServiceMutex = NULL; _LIT8( KNameServiceMutex, "KNameServiceMutex" ); - +const TUint8 KEightBitShift( 8 ); +const TUint8 KSixteenBitShift( 16 ); +const TUint8 KDeviceIdentifierPhoNetAddressShift( KEightBitShift ); +const TUint16 KUninitializedPhoNetAddress( 0x0000 ); +const TUint8 KRouterObjId( 0xFA ); // Only internally agreed inside isi router DISINameService::DISINameService( // None @@ -111,12 +125,29 @@ : iObjId( 0x00 ) { C_TRACE( ( _T( "DISINameService::DISINameService 0x%x 0x%x>" ), iObjId, iRouter ) ); - iRouter = MISIObjectRouterIf::Connect( KNameServiceUID, iObjId, this ); - ASSERT_RESET_ALWAYS( iRouter, ( EISINameServiceNullPointer | EDISINameServiceTraceId << KClassIdentifierShift ) ); iNameRecords = new DNameRecords(); - ASSERT_RESET_ALWAYS( iNameRecords, ( EISINameServiceMemAllocFailure | EDISINameServiceTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( iNameRecords ), + ( EISINameServiceMemAllocFailure | EDISINameServiceTraceId << KClassIdentifierShift ) ); TInt err( Kern::MutexCreate( iNameServiceMutex, KNameServiceMutex, KMutexOrdGeneral0 ) ); - ASSERT_RESET_ALWAYS( ( KErrNone == err ), ( EISINameServiceMutexCreateFailed | EDISINameServiceTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( KErrNone == err ), + ( EISINameServiceMutexCreateFailed | EDISINameServiceTraceId << KClassIdentifierShift ) ); + iRouter = MISIObjectRouterIf::GetIf(); + ASSERT_RESET_ALWAYS( ( iRouter ), + ( EISINameServiceNullPointer | EDISINameServiceTraceId << KClassIdentifierShift ) ); + iRouter->Connect( KNameServiceUID, iObjId, this ); + C_TRACE( ( _T( "DISINameService::DISINameService 0x%x" ), iObjId ) ); + ASSERT_RESET_ALWAYS( ( iObjId == PN_OBJ_ROUTING_REQ ), + ( EISINameServiceFatalError | EDISINameServiceTraceId << KClassIdentifierShift ) ); + // Starting from here we add the PN_ROUTER object 'statically' to Name Service + TUint32 name = PN_ROUTER; + TUint16 phonetAddr = ( ( PN_DEV_OWN << KDeviceIdentifierPhoNetAddressShift ) | KRouterObjId ); + TUint8 flags = PN_NAME_NOCHG; + err = iNameRecords->AddName( name, phonetAddr, flags ); +#ifdef ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE + iISINameServiceExtended = new DISINameServiceExtended( this ); + ASSERT_RESET_ALWAYS( ( iISINameServiceExtended ), ( EISINameServiceNameExtendedCreateFailed | EDISINameServiceTraceId << KClassIdentifierShift ) ); +#endif // ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE + iThisptr = this; C_TRACE( ( _T( "DISINameService::DISINameService 0x%x 0x%x<" ), iObjId, iRouter ) ); } @@ -130,305 +161,264 @@ delete iNameRecords; iNameRecords = NULL; } - +#ifdef ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE + if( iISINameServiceExtended ) + { + delete iISINameServiceExtended; + iISINameServiceExtended = NULL; + } +#endif C_TRACE( ( _T( "DISINameService::~DISINameService<" ) ) ); } - -void DISINameService::Receive( const TDesC8& aMessage ) +void DISINameService::Receive( + const TDesC8& aMessage + ) { C_TRACE( ( _T( "DISINameService::Receive 0x%x>" ), &aMessage ) ); - TInt err( Kern::MutexWait( *iNameServiceMutex ) ); - ASSERT_RESET_ALWAYS( ( KErrNone == err ), ( EISINameServiceMutexWaitFailed | EDISINameServiceTraceId << KClassIdentifierShift ) ); + // This to be signaled (and only) when send back. + LockNameServiceDMutex(); TUint8* msgPtr( (TUint8*)aMessage.Ptr() ); + TUint32 resource = GetResourceUsedInMessage( aMessage ); + if( resource == PN_NAMESERVICE + ) + { + C_TRACE( ( _T( "DISINameService::Receive to PN_NAMESERVICE" ) ) ); + HandlePnsNameMessage( aMessage ); + } - TUint8 resource = msgPtr[ ISI_HEADER_OFFSET_RESOURCEID ]; - if( resource == PN_NAMESERVICE ) - { - C_TRACE( ( _T( "DISINameService message to PN_NAMESERVICE" ) ) ); - HandlePNSNameMessage( aMessage ); - } + // Messages which are to be Resource routed. else { - //RouterByResource( aMessage ); - - C_TRACE( ( _T( "DISINameService message to RESOURCE : %d" ),resource ) ); - //look for nametable by resource in message - TUint16 phonetAddress = 0; - TInt32 error = iNameRecords->LookupPhonetAddress(resource, &phonetAddress); - + C_TRACE( ( _T( "DISINameService::Receive to Resource : 0x%x" ),resource ) ); + TUint16 phoNetAddress( KUninitializedPhoNetAddress ); + TInt32 error = iNameRecords->LookupPhonetAddress( resource, &phoNetAddress ); if( KErrNone == error ) { - //change phonet addr to current message from table entries - - - msgPtr[ISI_HEADER_OFFSET_RECEIVERDEVICE] = (TUint8)( (phonetAddress & 0xFF00) >> 8); - msgPtr[ISI_HEADER_OFFSET_RECEIVEROBJECT] = (TUint8) (phonetAddress & 0xFF); - TDes8* messagePtr = reinterpret_cast( const_cast(&aMessage) ); - - C_TRACE( ( _T( "<-DISINameService message to recDev: 0x%x" ),msgPtr[ISI_HEADER_OFFSET_RECEIVERDEVICE] ) ); - C_TRACE( ( _T( "<-DISINameService message to recObj: 0x%x" ),msgPtr[ISI_HEADER_OFFSET_RECEIVEROBJECT] ) ); - - //send data to router for handling - iRouter->Send( *messagePtr, iObjId); + // Change phonet addr to current message from table entries. + msgPtr[ ISI_HEADER_OFFSET_RECEIVERDEVICE ] = (TUint8) ( phoNetAddress >> KEightBitShift ); + msgPtr[ ISI_HEADER_OFFSET_RECEIVEROBJECT ] = (TUint8) ( phoNetAddress ); + TDes8* messagePtr = reinterpret_cast( const_cast( &aMessage ) ); + C_TRACE( ( _T( "DISINameService message to recDev: 0x%x recObj: 0x%x" ), msgPtr[ ISI_HEADER_OFFSET_RECEIVERDEVICE ], msgPtr[ ISI_HEADER_OFFSET_RECEIVEROBJECT ] ) ); + SendToRouter( *messagePtr ); } else { - //construct not reachable resp message - C_TRACE( ( _T( "DISINameService::Receive **ELSE** !!" ) ) ); + C_TRACE( ( _T( "DISINameService::Receive no Resource found : 0x%x" ), resource ) ); + + TRACE_ASSERT_ALWAYS( KAlwaysAssert ); BuildAndSendCommIsaEntityNotReachableResp(aMessage); + } } - Kern::MutexSignal( *iNameServiceMutex ); - C_TRACE( ( _T( "DISINameService::DISINameService<" ) ) ); + C_TRACE( ( _T( "DISINameService::Receive 0x%x<" ), &aMessage ) ); } -void DISINameService::HandleNameQueryResp( const TDesC8& aMessage, const TUint8* msgPtr ) + +void DISINameService::HandleNameQueryReq( + const TDesC8& aPnsNameQueryReq + ) { - C_TRACE( ( _T( "DISINameService::HandleNameQueryResp>" ) ) ); + C_TRACE( ( _T( "DISINameService::HandleNameQueryReq 0x%x>" ) ,&aPnsNameQueryReq ) ); + const TUint8* msgPtr = aPnsNameQueryReq.Ptr(); + ASSERT_RESET_ALWAYS( msgPtr, ( EISINameServiceNullPointer6 | EDISINameServiceTraceId << KClassIdentifierShift ) ); TUint32 name = GETB32( &msgPtr[ ISI_HEADER_SIZE + PNS_NAME_QUERY_REQ_OFFSET_NAME ] ); TUint32 mask = GETB32( &msgPtr[ ISI_HEADER_SIZE + PNS_NAME_QUERY_REQ_OFFSET_BITMASK ] ); - RArray nameTable; - TInt32 count = iNameRecords->NameQuery( name, mask, &nameTable ); + RArray nameTable; + iNameRecords->NameQuery( name, mask, &nameTable ); + TUint32 count( nameTable.Count() ); + // Hoks! not needed ISI_HEADER_SIZE because in below resp contains assumption that there is one entry always. TUint16 msgLength = ( SIZE_PNS_NAME_QUERY_RESP + ( count * SIZE_PN_NAME_SRV_ITEM_STR ) ); TDes8& respMsg = MemApi::AllocBlock( msgLength ); respMsg.SetLength( msgLength ); TUint8* respPtr = const_cast( respMsg.Ptr() ); - - respPtr[ ISI_HEADER_OFFSET_MEDIA ] = msgPtr[ ISI_HEADER_OFFSET_MEDIA ]; - SET_RECEIVER_DEV( respPtr, msgPtr[ ISI_HEADER_OFFSET_SENDERDEVICE ] ); - SET_SENDER_DEV( respPtr, PN_DEV_OWN ); - respPtr[ ISI_HEADER_OFFSET_RESOURCEID ] = PN_NAMESERVICE; - SET_LENGTH( respPtr, ( msgLength - PN_HEADER_SIZE ) ); - SET_RECEIVER_OBJ( respPtr, msgPtr[ ISI_HEADER_OFFSET_SENDEROBJECT ] ); - SET_SENDER_OBJ( respPtr, PN_OBJ_ROUTER ); - respPtr[ ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_UTID ] = msgPtr[ ISI_HEADER_OFFSET_TRANSID ]; - respPtr[ ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_SUBFUNCTION ]= PNS_NAME_QUERY_RESP; - respPtr[ ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_TOTALMATCHES ] = count >> 8; - respPtr[ ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_TOTALMATCHES + 1 ] = count; - respPtr[ ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_MATCHESINMSG ] = count >> 8; - respPtr[ ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_MATCHESINMSG + 1 ] = count; + ASSERT_RESET_ALWAYS( respPtr, ( EISINameServiceNullPointer7 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + SetIsiHeaderForResp( respMsg, aPnsNameQueryReq, PNS_NAME_QUERY_RESP ); + PUTB16( &respPtr[ ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_TOTALMATCHES ], count ); + PUTB16( &respPtr[ ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_MATCHESINMSG ], count ); respPtr[ ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_RESERVED1 ] = KFiller; respPtr[ ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_RESERVED2 ] = KFiller; - - TUint16 index = ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_NAMEENTRYTBL; - for( int i = 0; i < count; i++) + TUint16 index( ISI_HEADER_SIZE + PNS_NAME_QUERY_RESP_OFFSET_NAMEENTRYTBL ); + C_TRACE( ( _T( "DISINameService::HandleNameQueryReq 0x%x entry count %d" ) ,&aPnsNameQueryReq, count ) ); + for( TInt i( 0 ); i < count; i++ ) { - //AddNameTable(); - TNameTable* tmp = (nameTable)[ i ]; - - // Name - respPtr[ index++ ] = (TUint8)(tmp->iName >> 24); - respPtr[ index++ ] = (TUint8)(tmp->iName >> 16); - respPtr[ index++ ] = (TUint8)(tmp->iName >> 8); - respPtr[ index++ ] = (TUint8)(tmp->iName); - // DevId - respPtr[ index++ ] = (TUint8)(tmp->iPhonetAddress >> 8); - // ObjId - respPtr[ index++ ] = (TUint8)(tmp->iPhonetAddress); - // Record flags - respPtr[ index++ ] = tmp->iFlags; - respPtr[ index++ ] = KFiller; // Reserved + ASSERT_RESET_ALWAYS( ( respMsg.Length() > index + PN_NAME_SRV_ITEM_STR_OFFSET_RESERVED ), + ( EISINameServiceWrongLength7 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + TNameTableEntry* tmp = ( nameTable )[ i ]; + if ( ( (TUint8)( tmp->iPhonetAddress ) == PN_OBJ_ROUTING_REQ ) && + ( tmp->iName == name ) ) + { + TRACE_ASSERT_ALWAYS( KAlwaysAssert ); + Kern::Printf("PNS_NAME_QUERY_REQ NOTE! Obj Id 0 not valid!! name 0x%08x txDev 0x%02x txObj 0x%02x", name, msgPtr[ISI_HEADER_OFFSET_SENDERDEVICE], msgPtr[ISI_HEADER_OFFSET_SENDEROBJECT] ); + } + PUTB32( &respPtr[ index + PN_NAME_SRV_ITEM_STR_OFFSET_NAME ], tmp->iName ); + respPtr[ index + PN_NAME_SRV_ITEM_STR_OFFSET_DEV ] = (TUint8)( tmp->iPhonetAddress >> KEightBitShift ); + respPtr[ index + PN_NAME_SRV_ITEM_STR_OFFSET_OBJ ] = (TUint8)( tmp->iPhonetAddress ); + respPtr[ index + PN_NAME_SRV_ITEM_STR_OFFSET_FLAGS ] = tmp->iFlags; + respPtr[ index + PN_NAME_SRV_ITEM_STR_OFFSET_RESERVED ] = KFiller; + index += SIZE_PN_NAME_SRV_ITEM_STR; } - - iRouter->Send( respMsg, iObjId ); - TDes8* block = reinterpret_cast( const_cast(&aMessage) ); + SendToRouter( respMsg ); + TDes8* block = reinterpret_cast( const_cast(&aPnsNameQueryReq) ); MemApi::DeallocBlock( *block ); - C_TRACE( ( _T( "DISINameService::HandleNameQueryResp<" ) ) ); + C_TRACE( ( _T( "DISINameService::HandleNameQueryReq 0x%x<" ) ,&aPnsNameQueryReq ) ); } -void DISINameService::HandleNameRemoveResp( const TDesC8& aMessage, const TUint8* msgPtr ) +void DISINameService::HandleNameRemoveReq( + const TDesC8& aPnsNameRemoveReq + ) { - C_TRACE( ( _T( "DISINameService::HandleNameRemoveResp>" ) ) ); + C_TRACE( ( _T( "DISINameService::HandleNameRemoveReq 0x%x>" ), &aPnsNameRemoveReq ) ); + const TUint8* msgPtr = aPnsNameRemoveReq.Ptr(); + ASSERT_RESET_ALWAYS( msgPtr, ( EISINameServiceNullPointer8 | EDISINameServiceTraceId << KClassIdentifierShift ) ); TUint32 name = GETB32( &msgPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_REQ_OFFSET_NAME ] ); - - TInt8 err = iNameRecords->RemoveName( name ); - C_TRACE( ( _T( "DISINameService PNS_NAME_REMOVE_RESP 0x%x>" ), name ) ); - + TUint16 phonetAddress( KUninitializedPhoNetAddress ); + TUint8 flags( 0x00 ); + // Need to get these values in here to guarantee that they are the same in IND if needed. + TInt error = iNameRecords->LookupNamePhonetAddressAndFlags( name, &phonetAddress, &flags ); + TRACE_ASSERT_ALWAYS( ( KErrNone == error ) ); + const TUint8 err = iNameRecords->RemoveName( name ); + C_TRACE( ( _T( "DISINameService::HandleNameRemoveReq PNS_NAME_REMOVE_RESP name 0x%x err 0x%x" ), name, err ) ); TUint16 msgLength( ISI_HEADER_SIZE + SIZE_PNS_NAME_REMOVE_RESP ); TDes8& respMsg = MemApi::AllocBlock( msgLength ); respMsg.SetLength( msgLength ); TUint8* respPtr = const_cast( respMsg.Ptr() ); - - respPtr[ ISI_HEADER_OFFSET_MEDIA ] = msgPtr[ ISI_HEADER_OFFSET_MEDIA ]; - SET_RECEIVER_DEV( respPtr, msgPtr[ ISI_HEADER_OFFSET_SENDERDEVICE ] ); - SET_SENDER_DEV( respPtr, PN_DEV_OWN ); - respPtr[ ISI_HEADER_OFFSET_RESOURCEID ] = PN_NAMESERVICE; - SET_LENGTH( respPtr, ( msgLength - PN_HEADER_SIZE ) ); - SET_RECEIVER_OBJ( respPtr, msgPtr[ ISI_HEADER_OFFSET_SENDEROBJECT ] ); - SET_SENDER_OBJ( respPtr, PN_OBJ_ROUTER ); - respPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_RESP_OFFSET_UTID ] = msgPtr[ ISI_HEADER_OFFSET_TRANSID ]; - respPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_RESP_OFFSET_SUBFUNCTION ] = PNS_NAME_REMOVE_RESP; + ASSERT_RESET_ALWAYS( respPtr, ( EISINameServiceNullPointer9 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( respMsg.Length() > ISI_HEADER_SIZE + PNS_NAME_REMOVE_RESP_OFFSET_REASON ), + ( EISINameServiceWrongLength6 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + SetIsiHeaderForResp( respMsg, aPnsNameRemoveReq, PNS_NAME_REMOVE_RESP ); if( msgPtr[ ISI_HEADER_OFFSET_SENDERDEVICE ] == PN_DEV_OWN ) { + C_TRACE( ( _T( "DISINameService::HandleNameRemoveReq from own device err 0x%x" ) ) ); respPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_RESP_OFFSET_REASON ] = err; - iRouter->Send( respMsg, iObjId ); - + SendToRouter( respMsg ); if( PN_NAME_OK == err ) { - C_TRACE( ( _T( "DISINameService PNS_NAME_REMOVE_IND>" ) ) ); - msgLength = ( SIZE_PNS_NAME_REMOVE_IND + PNS_NAME_REMOVE_IND_OFFSET_NAMEENTRYTBL ); - TDes8& indMsg = MemApi::AllocBlock( msgLength ); - indMsg.SetLength( msgLength ); - TUint8* indPtr = const_cast( indMsg.Ptr() ); - - indPtr[ ISI_HEADER_OFFSET_MEDIA ] = PN_MEDIA_ROUTING_REQ; - SET_RECEIVER_DEV( indPtr, msgPtr[ ISI_HEADER_OFFSET_SENDERDEVICE ] ); - SET_SENDER_DEV( indPtr, PN_DEV_OWN ); - indPtr[ ISI_HEADER_OFFSET_RESOURCEID ] = PN_NAMESERVICE; - SET_LENGTH( indPtr, ( msgLength - PN_HEADER_SIZE ) ); - SET_RECEIVER_OBJ( indPtr, PN_OBJ_EVENT_MULTICAST ); //communicationmanager - SET_SENDER_OBJ( indPtr, PN_OBJ_ROUTER ); - indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_UTID ] = 0x00; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_SUBFUNCTION ]= PNS_NAME_REMOVE_IND; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_TOTALMATCHES ] = 0x00; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_TOTALMATCHES + 1 ] = 0x01; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_MATCHESINMSG ] = 0x00; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_MATCHESINMSG + 1 ] = 0x01; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_RESERVED1 ] = KFiller; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_RESERVED2 ] = KFiller; - PUTB32( &indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_NAMEENTRYTBL + PN_NAME_SRV_ITEM_STR_OFFSET_NAME ], name ); - - iRouter->Send( indMsg, iObjId ); - TDes8* block = reinterpret_cast( const_cast(&aMessage) ); - MemApi::DeallocBlock( *block ); - C_TRACE( ( _T( "DISINameService PNS_NAME_QUERY_IND<" ) ) ); + TxPnsNameRemoveInd( aPnsNameRemoveReq, name, phonetAddress, flags ); } - C_TRACE( ( _T( "DISINameService PNS_NAME_REMOVE_RESP<" ) ) ); + // No need to send indication if removal did not succeed as state is the same. } else { - C_TRACE( ( _T( "DISINameService::HandlePNSNameMessage PNS_NAME_REMOVE_REQ from other device, PN_NAME_NOT_ALLOWED" ) ) ); + C_TRACE( ( _T( "DISINameService::HandleNameRemoveReq PNS_NAME_REMOVE_REQ from other device not allowed" ) ) ); respPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_RESP_OFFSET_REASON ] = PN_NAME_NOT_ALLOWED; - iRouter->Send( respMsg, iObjId ); + SendToRouter( respMsg ); } - C_TRACE( ( _T( "DISINameService::HandleNameRemoveResp<" ) ) ); + TDes8* block = reinterpret_cast( const_cast(&aPnsNameRemoveReq) ); + MemApi::DeallocBlock( *block ); + C_TRACE( ( _T( "DISINameService::HandleNameRemoveReq 0x%x<" ), &aPnsNameRemoveReq ) ); } -void DISINameService::HandlePNSNameMessage( const TDesC8& aMessage ) +void DISINameService::SendToRouter( + TDes8& aMessage + ) { - C_TRACE( ( _T( "DISINameService::HandlePNSNameMessage 0x%x>" ), &aMessage ) ); + C_TRACE( ( _T( "DISINameService::SendToRouter 0x%x>" ), &aMessage ) ); + FreeNameServiceDMutex(); + TInt value = iRouter->Send( aMessage, iObjId ); + ASSERT_RESET_ALWAYS( value == KErrNone, ( EISINameServiceSendFailed | EDISINameServiceTraceId << KClassIdentifierShift ) ); + C_TRACE( ( _T( "DISINameService::SendToRouter 0x%x<" ), &aMessage ) ); + } + +void DISINameService::HandlePnsNameMessage( const TDesC8& aMessage ) + { + C_TRACE( ( _T( "DISINameService::HandlePnsNameMessage 0x%x>" ), &aMessage ) ); const TUint8* msgPtr( aMessage.Ptr() ); - TInt8 err( KErrArgument ); switch( msgPtr[ ISI_HEADER_OFFSET_MESSAGEID ] ) { case PNS_NAME_QUERY_REQ: { - C_TRACE( ( _T( "DISINameService PNS_NAME_QUERY_REQ>" ) ) ); - HandleNameQueryResp( aMessage, msgPtr ); - C_TRACE( ( _T( "DISINameService PNS_NAME_QUERY_REQ<" ) ) ); + C_TRACE( ( _T( "DISINameService::HandlePnsNameMessage PNS_NAME_QUERY_REQ" ) ) ); + HandleNameQueryReq( aMessage ); break; } case PNS_NAME_ADD_REQ: { - C_TRACE( ( _T( "DISINameService PNS_NAME_ADD_REQ>" ) ) ); - - TUint16 msgLength( ISI_HEADER_SIZE + SIZE_PNS_NAME_ADD_RESP ); - TDes8& respMsg = MemApi::AllocBlock( msgLength ); - respMsg.SetLength( msgLength ); - TUint8* respPtr = const_cast( respMsg.Ptr() ); - - respPtr[ ISI_HEADER_OFFSET_MEDIA ] = msgPtr[ ISI_HEADER_OFFSET_MEDIA ]; - SET_RECEIVER_DEV( respPtr, msgPtr[ ISI_HEADER_OFFSET_SENDERDEVICE ] ); - SET_SENDER_DEV( respPtr, PN_DEV_OWN ); - respPtr[ ISI_HEADER_OFFSET_RESOURCEID ] = PN_NAMESERVICE; - SET_LENGTH( respPtr, ( msgLength - PN_HEADER_SIZE ) ); - SET_RECEIVER_OBJ( respPtr, msgPtr[ ISI_HEADER_OFFSET_SENDEROBJECT ] ); - SET_SENDER_OBJ( respPtr, PN_OBJ_ROUTER ); - respPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_RESP_OFFSET_UTID ] = msgPtr[ ISI_HEADER_OFFSET_TRANSID ]; - respPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_RESP_OFFSET_SUBFUNCTION ] = PNS_NAME_ADD_RESP; - - if( msgPtr[ ISI_HEADER_OFFSET_SENDERDEVICE ] == PN_DEV_OWN ) - { - C_TRACE( ( _T( "DISINameService PNS_NAME_ADD_REQ from this device" ) ) ); - TUint32 name = GETB32( &msgPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY ] ); - TUint16 phonetAddr = GETB16( &msgPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY + PN_NAME_SRV_ITEM_STR_OFFSET_DEV ] ); - TUint8 flags = msgPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY + PN_NAME_SRV_ITEM_STR_OFFSET_FLAGS ]; - err = iNameRecords->AddName( name, phonetAddr, flags ); - respPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_RESP_OFFSET_REASON ] = err; - iRouter->Send( respMsg, iObjId ); - C_TRACE( ( _T( "DISINameService PNS_NAME_ADD_RESP from this device<" ) ) ); - if( err == PN_NAME_OK ) - { - C_TRACE( ( _T( "DISINameService PNS_NAME_ADD_IND>" ) ) ); - msgLength = ( SIZE_PNS_NAME_ADD_IND + ( SIZE_PN_NAME_SRV_ITEM_STR ) ); - TDes8& indMsg = MemApi::AllocBlock( msgLength ); - indMsg.SetLength( msgLength ); - TUint8* indPtr = const_cast( indMsg.Ptr() ); - indPtr[ ISI_HEADER_OFFSET_MEDIA ] = PN_MEDIA_ROUTING_REQ; - SET_RECEIVER_DEV( indPtr, msgPtr[ ISI_HEADER_OFFSET_SENDERDEVICE ] ); - SET_SENDER_DEV( indPtr, PN_DEV_OWN ); - indPtr[ ISI_HEADER_OFFSET_RESOURCEID ] = PN_NAMESERVICE; - SET_LENGTH( indPtr, ( msgLength - PN_HEADER_SIZE ) ); - SET_RECEIVER_OBJ( indPtr, PN_OBJ_EVENT_MULTICAST ); //communicationmanager - SET_SENDER_OBJ( indPtr, PN_OBJ_ROUTER ); - indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_UTID ] = 0x00; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_SUBFUNCTION ]= PNS_NAME_ADD_IND; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_TOTALMATCHES ] = 0x00; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_TOTALMATCHES + 1 ] = 0x01; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_MATCHESINMSG ] = 0x00; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_MATCHESINMSG + 1 ] = 0x01; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_RESERVED1 ] = KFiller; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_RESERVED2 ] = KFiller; - PUTB32( &indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + PN_NAME_SRV_ITEM_STR_OFFSET_NAME ], name ); - PUTB16( &indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + PN_NAME_SRV_ITEM_STR_OFFSET_DEV ], phonetAddr ); - indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + PN_NAME_SRV_ITEM_STR_OFFSET_FLAGS ] = flags; - indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + PN_NAME_SRV_ITEM_STR_OFFSET_RESERVED ] = KFiller; - iRouter->Send( indMsg, iObjId ); - C_TRACE( ( _T( "DISINameService PNS_NAME_ADD_IND<" ) ) ); - } - } - else - { - C_TRACE( ( _T( "DISINameService PNS_NAME_ADD_REQ from other device>" ) ) ); - respPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_RESP_OFFSET_REASON ] = PN_NAME_NOT_ALLOWED; - iRouter->Send( respMsg, iObjId ); - C_TRACE( ( _T( "DISINameService PNS_NAME_ADD_RESP from other device<" ) ) ); - } - TDes8* block = reinterpret_cast( const_cast(&aMessage) ); - MemApi::DeallocBlock( *block ); - C_TRACE( ( _T( "DISINameService PNS_NAME_ADD_REQ<" ) ) ); + C_TRACE( ( _T( "DISINameService::HandlePnsNameMessage PNS_NAME_ADD_REQ" ) ) ); + HandleNameAddReq( aMessage ); break; } case PNS_NAME_REMOVE_REQ: { - C_TRACE( ( _T( "DISINameService PNS_NAME_REMOVE_REQ>" ) ) ); - HandleNameRemoveResp( aMessage, msgPtr ); - C_TRACE( ( _T( "DISINameService PNS_NAME_REMOVE_REQ<" ) ) ); + C_TRACE( ( _T( "DISINameService::HandlePnsNameMessage PNS_NAME_REMOVE_REQ" ) ) ); + HandleNameRemoveReq( aMessage ); + break; + } + case COMMON_MESSAGE: + { + C_TRACE( ( _T( "DISINameService::HandlePnsNameMessage COMMON_MESSAGE" ) ) ); + HandleCommonMessage( aMessage ); break; } default: { - ASSERT_RESET_ALWAYS( 0, ( EISINameServiceUnknownMessage | EDISINameServiceTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T( "DISINameService::HandlePNSNameMessage unknown NAMESERVICE message" ) ) ); + TRACE_ASSERT_ALWAYS( KAlwaysAssert ); + TDes8& commonMessage = reinterpret_cast( const_cast( aMessage ) ); + SendCommServiceNotIdentifiedResp( commonMessage ); + C_TRACE( ( _T( "DISINameService::HandlePnsNameMessage unknown NAMESERVICE message" ) ) ); } } - C_TRACE( ( _T( "DISINameService::HandlePNSNameMessage<" ) ) ); + C_TRACE( ( _T( "DISINameService::HandlePnsNameMessage 0x%x<" ), &aMessage ) ); } - + +void DISINameService::HandleNameAddReq( + const TDesC8& aPnsNameAddReq + ) + { + C_TRACE( ( _T( "DISINameService::HandleNameAddReq 0x%x>" ), &aPnsNameAddReq ) ); + TInt err( KErrArgument ); + TUint16 respMsgLength( ISI_HEADER_SIZE + SIZE_PNS_NAME_ADD_RESP ); + TDes8& respMsg = MemApi::AllocBlock( respMsgLength ); + respMsg.SetLength( respMsgLength ); + TUint8* respPtr = const_cast( respMsg.Ptr() ); + const TUint8* msgPtr = const_cast( aPnsNameAddReq.Ptr() ); + SetIsiHeaderForResp( respMsg, aPnsNameAddReq, PNS_NAME_ADD_RESP ); + if( msgPtr[ ISI_HEADER_OFFSET_SENDERDEVICE ] == PN_DEV_OWN ) + { + C_TRACE( ( _T( "DISINameService::HandleNameAddReq PNS_NAME_ADD_REQ from this device" ) ) ); + TUint32 name = GETB32( &msgPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY ] ); + TUint16 phonetAddr = GETB16( &msgPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY + PN_NAME_SRV_ITEM_STR_OFFSET_DEV ] ); + TUint8 flags = msgPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_REQ_OFFSET_NAMEENTRY + PN_NAME_SRV_ITEM_STR_OFFSET_FLAGS ]; + err = iNameRecords->AddName( name, phonetAddr, flags ); + respPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_RESP_OFFSET_REASON ] = err; + SendToRouter( respMsg ); + if( err == PN_NAME_OK ) + { + TxPnsNameAddInd( aPnsNameAddReq, name, phonetAddr, flags ); + } + // No need for else as state is not changed and indication is not needed to send. + } + else + { + C_TRACE( ( _T( "DISINameService::HandleNameAddReq PNS_NAME_ADD_REQ from other device" ) ) ); + respPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_RESP_OFFSET_REASON ] = PN_NAME_NOT_ALLOWED; + SendToRouter( respMsg ); + } + TDes8* block = reinterpret_cast( const_cast(&aPnsNameAddReq) ); + MemApi::DeallocBlock( *block ); + C_TRACE( ( _T( "DISINameService::HandleNameAddReq 0x%x<" ), &aPnsNameAddReq ) ); + } EXPORT_C TBool MISICommunicationManagerIf::IsValidResource( const TDesC8& aMessage ) { - C_TRACE( ( _T( "DISINameService::IsValidResource 0x%x>" ), &aMessage ) ); - TInt err( Kern::MutexWait( *DISINameService::iThisptr->iNameServiceMutex ) ); - ASSERT_RESET_ALWAYS( ( KErrNone == err ), ( EISINameServiceMutexWaitFailed | EDISINameServiceTraceId << KClassIdentifierShift ) ); - TUint8* msgPtr = const_cast( aMessage.Ptr() ); - TUint16 phonetAddress( 0 ); - DISINameService::iThisptr->iNameRecords->LookupPhonetAddress( msgPtr[ ISI_HEADER_OFFSET_RESOURCEID ], &phonetAddress ); - Kern::MutexSignal( *DISINameService::iThisptr->iNameServiceMutex ); - if( phonetAddress == GET_SENDER_OBJ( aMessage ) ) - { - C_TRACE( ( _T( "DISINameService::IsValidResource phonetAddress found 0x%x" ), phonetAddress ) ); - return ETrue; - } - else - { - C_TRACE( ( _T( "DISINameService::IsValidResource phonetAddress not found 0x%x" ), phonetAddress ) ); - return EFalse; - } + C_TRACE( ( _T( "MISICommunicationManagerIf::IsValidResource 0x%x>" ), &aMessage ) ); + DISINameService* self = DISINameService::GetISINameServiceF(); + TBool found = self->HandleResourceValidationCheck( aMessage ); + C_TRACE( ( _T( "MISICommunicationManagerIf::IsValidResource 0x%x %d<" ), &aMessage, found ) ); + return found; } +EXPORT_C TUint8 MISICommunicationManagerIf::GetDeviceIdentifierByResource( + const TUint32 aResourceIdentifier + ) + { + C_TRACE( ( _T( "MISICommunicationManagerIf::GetDeviceIdentifierByResource 0x%x>" ), aResourceIdentifier ) ); + DISINameService* self = DISINameService::GetISINameServiceF(); + TUint8 deviceIdentifier = self->GetDeviceIdByResource( aResourceIdentifier ); + C_TRACE( ( _T( "MISICommunicationManagerIf::GetDeviceIdentifierByResource 0x%x 0x%x<" ), aResourceIdentifier, deviceIdentifier ) ); + return deviceIdentifier; + } DECLARE_STANDARD_EXTENSION() { @@ -436,7 +426,6 @@ // Create a container extension DISINameService* extension = new DISINameService(); TRACE_ASSERT( extension ); - DISINameService::iThisptr = static_cast< DISINameService* >( extension ); Kern::Printf( "ISI Name Service extension<" ); return extension ? KErrNone : KErrNoMemory; } @@ -445,9 +434,8 @@ const TDesC8& aMsg ) { - C_TRACE( ( _T( "DISINameService::ConstructCommIsaEntityNotReachableResp 0x%x ->" ), &aMsg ) ); + C_TRACE( ( _T( "DISINameService::ConstructCommIsaEntityNotReachableResp 0x%x>" ), &aMsg ) ); // Make channel opening request followinfg COMM specification: 000.026 - // Length is sixteen bytes. TUint8 length( ISI_HEADER_SIZE + SIZE_COMMON_MESSAGE_COMM_ISA_ENTITY_NOT_REACHABLE_RESP ); TDes8& tempPtr = MemApi::AllocBlock( length ); ASSERT_RESET_ALWAYS( &tempPtr, EISINameServiceMemAllocFailure ); //lisää jotakin infoa jotta löytyy ilman tracea...pelkän luvun perusteella?? @@ -464,7 +452,7 @@ SET_LENGTH( ptr, length - PN_HEADER_SIZE ); SET_RECEIVER_OBJ( ptr, GET_SENDER_OBJ( aMsg ) ); SET_SENDER_OBJ( ptr, GET_RECEIVER_OBJ( aMsg ) ); - // Transactionid. Set to 0x01 since this is the first. + // Transactionid. tempPtr.Append( msgTmpPtr[ ISI_HEADER_OFFSET_TRANSID ] ); // Message ID tempPtr.Append( COMMON_MESSAGE ); // 0xF0 @@ -475,18 +463,456 @@ // Status - COMM_ISA_ENTITY_NOT_EXISTING tempPtr.Append( COMM_ISA_ENTITY_NOT_EXISTING); //0x01 // Filler - tempPtr.Append( 0x00 ); + tempPtr.Append( KFiller ); // Filler - tempPtr.Append( 0x00 ); + tempPtr.Append( KFiller ); // Filler - tempPtr.Append( 0x00 ); - + tempPtr.Append( KFiller ); //send data to router for handling - iRouter->Send( tempPtr, iObjId); - + SendToRouter( tempPtr ); TDes8* block = reinterpret_cast( const_cast(&aMsg) ); MemApi::DeallocBlock( *block ); - C_TRACE( ( _T( "DISINameService::SendCommIsaEntityNotReachableResp 0x%x <-" ), &aMsg ) ); + C_TRACE( ( _T( "DISINameService::SendCommIsaEntityNotReachableResp 0x%x<" ), &aMsg ) ); + } + +void DISINameService::HandleCommonMessage( + const TDesC8& aCommonMessage + ) + { + + C_TRACE( ( _T( "DISINameService::HandleCommonMessage 0x%x>" ), &aCommonMessage ) ); + TDes8& commonMessage = reinterpret_cast( const_cast(aCommonMessage) ); + const TUint8 subMessageIdentifier = commonMessage.Ptr()[ ISI_HEADER_OFFSET_SUBMESSAGEID ]; + switch( subMessageIdentifier ) + { + case COMM_ISA_ENTITY_NOT_REACHABLE_RESP: + { + const TUint8 notDeliveredMessageIndex = ( ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISA_ENTITY_NOT_REACHABLE_RESP_OFFSET_NOTDELIVEREDMESSAGEID ); + const TUint8 notDeliveredMessageIdentifier = commonMessage.Ptr()[ notDeliveredMessageIndex ]; + // If some of name service _RESP worryig behaviour from client. If _IND it does not matter so much, although unsubscription for indications is not working then. + C_TRACE( ( _T( "DISINameService::HandleCommonMessage COMM_ISA_ENTITY_NOT_REACHABLE_RESP not delivered message 0x%x" ), notDeliveredMessageIdentifier ) ); + TRACE_ASSERT_ALWAYS( KAlwaysAssert ); + // Dellocate here, because this is not sending a reply at all to avoid never ending loop. + MemApi::DeallocBlock( commonMessage ); + // Signal here because it does not send a reply. + FreeNameServiceDMutex(); + break; + } + case COMM_ISI_VERSION_GET_REQ: + { + C_TRACE( ( _T( "DISINameService::HandleCommonMessage version get req" ) ) ); + SendCommIsiVersionGetResp( commonMessage ); + break; + } + default: + { + C_TRACE( ( _T( "DISINameService::HandleCommonMessage unknown common message" ) ) ); + TRACE_ASSERT_ALWAYS( KAlwaysAssert ); + SendCommServiceNotIdentifiedResp( commonMessage ); + break; + } + } + C_TRACE( ( _T( "DISINameService::HandleCommonMessage 0x%x<" ), &aCommonMessage ) ); + } + +void DISINameService::SendCommServiceNotIdentifiedResp( + TDes8& aCommServiceNotIdentifiedReq + ) + { + C_TRACE( ( _T( "DISINameService::SendCommServiceNotIdentifiedResp 0x%x>" ), &aCommServiceNotIdentifiedReq ) ); + TUint8 length( ISI_HEADER_SIZE + SIZE_COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP ); + TDes8& respMsg = MemApi::AllocBlock( length ); + respMsg.SetLength(ISI_HEADER_SIZE + SIZE_COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP ); + TUint8* ptr( const_cast( respMsg.Ptr() ) ); + ASSERT_RESET_ALWAYS( ptr, ( EISINameServiceNullPointer1 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( respMsg.Length() >= (ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_FILLERBYTE2) ), + ( EISINameServiceWrongLength | EDISINameServiceTraceId << KClassIdentifierShift ) ); + const TUint8* msgPtr( aCommServiceNotIdentifiedReq.Ptr() ); + SetIsiHeaderForCommonResp( respMsg, aCommServiceNotIdentifiedReq ); + ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_SUBMESSAGEID ] = COMM_SERVICE_NOT_IDENTIFIED_RESP; + ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_NOTSERVEDMESSAGEID ] = msgPtr[ ISI_HEADER_OFFSET_MESSAGEID ]; + ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_FILLERBYTE1 ] = KFiller;// ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_MESSAGEEXTENSION ] = KNoExtension; + ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_NOTSERVEDSUBMESSAGEID ] = msgPtr[ ISI_HEADER_OFFSET_SUBMESSAGEID ]; + ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_FILLERBYTE1 ] = KFiller; + ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_FILLERBYTE2 ] = KFiller; + SendToRouter( respMsg ); + MemApi::DeallocBlock( aCommServiceNotIdentifiedReq ); + C_TRACE( ( _T( "DISINameService::SendCommServiceNotIdentifiedResp 0x%x<" ), &aCommServiceNotIdentifiedReq ) ); + } + +void DISINameService::SendCommIsiVersionGetResp( + TDes8& aCommIsiVersionGetReq + ) + { + C_TRACE( ( _T( "DISINameService::SendCommIsiVersionGetResp 0x%x>" ), &aCommIsiVersionGetReq ) ); + TUint8 length( ISI_HEADER_SIZE + SIZE_COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP ); + TDes8& respMsg = MemApi::AllocBlock( length ); + respMsg.SetLength(ISI_HEADER_SIZE + SIZE_COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP); + TUint8* ptr( const_cast( respMsg.Ptr() ) ); + ASSERT_RESET_ALWAYS( ptr, ( EISINameServiceNullPointer2 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( respMsg.Length() >= (ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_FILLERBYTE3) ), + ( EISINameServiceWrongLength1 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + const TUint8* msgPtr( aCommIsiVersionGetReq.Ptr() ); + SetIsiHeaderForCommonResp( respMsg, aCommIsiVersionGetReq ); + ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_SUBMESSAGEID ] = COMM_ISI_VERSION_GET_RESP; + ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_ISIVERSIONZZZ ] = NAME_SERVICE_ISI_VERSION_Z; + ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_ISIVERSIONYYY ] = NAME_SERVICE_ISI_VERSION_Y; + ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_FILLERBYTE1 ] = KFiller; + ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_FILLERBYTE2 ] = KFiller; + ptr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_ISI_VERSION_GET_RESP_OFFSET_FILLERBYTE3 ] = KFiller; + SendToRouter( respMsg ); + MemApi::DeallocBlock( aCommIsiVersionGetReq ); + C_TRACE( ( _T( "DISINameService::SendCommIsiVersionGetResp 0x%x<" ), &aCommIsiVersionGetReq ) ); + } + +void DISINameService::LockNameServiceDMutex() + { + C_TRACE( ( _T( "DISINameService::LockNameServiceDMutex 0x%x>" ), &iNameServiceMutex ) ); + TInt err( Kern::MutexWait( *iNameServiceMutex ) ); + ASSERT_RESET_ALWAYS( ( KErrNone == err ), ( EISINameServiceMutexWaitFailed | EDISINameServiceTraceId << KClassIdentifierShift ) ); + C_TRACE( ( _T( "DISINameService::LockNameServiceDMutex 0x%x<" ), &iNameServiceMutex ) ); + } + +void DISINameService::FreeNameServiceDMutex() + { + C_TRACE( ( _T( "DISINameService::FreeNameServiceDMutex 0x%x>" ), &iNameServiceMutex ) ); + Kern::MutexSignal( *iNameServiceMutex ); + C_TRACE( ( _T( "DISINameService::FreeNameServiceDMutex 0x%x<" ), &iNameServiceMutex ) ); + } + +TBool DISINameService::HandleResourceValidationCheck( + const TDesC8& aMessage + ) + { + C_TRACE( ( _T( "DISINameService::HandleResourceValidationCheck 0x%x>" ), &aMessage ) ); + LockNameServiceDMutex(); + TUint8* msgPtr = const_cast( aMessage.Ptr() ); + TUint16 phonetAddress( KUninitializedPhoNetAddress ); + // Extended resource identifier support for NameService + TUint32 resource = GetResourceUsedInMessage( aMessage ); + iNameRecords->LookupPhonetAddress( resource, &phonetAddress ); + FreeNameServiceDMutex(); + TBool found( EFalse ); + TUint16 phonetAddressFromMsg = ( ( GET_SENDER_DEV( msgPtr ) << KDeviceIdentifierPhoNetAddressShift ) | GET_SENDER_OBJ( msgPtr ) ); + if( phonetAddress == phonetAddressFromMsg ) + { + C_TRACE( ( _T( "DISINameService::IsValidResource phonetAddress found 0x%x" ), phonetAddress ) ); + found = ETrue; + } + // No need for else, assert tells that somebody violates indication sending + TRACE_ASSERT( found ); + C_TRACE( ( _T( "DISINameService::HandleResourceValidationCheck 0x%x %d<" ), &aMessage, found ) ); + return found; + } + +// Extended resource identifier support for NameService +TUint32 DISINameService::GetResourceUsedInMessage( + const TDesC8& aMessageToBeResourceRouted + ) + { + C_TRACE( ( _T( "DISINameService::GetResourceUsedInMessage 0x%x>" ), &aMessageToBeResourceRouted ) ); + const TUint8* msgPtr( aMessageToBeResourceRouted.Ptr() ); + ASSERT_RESET_ALWAYS( ( msgPtr ), + ( EISINameServiceNullPointer11 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + TUint32 resource = msgPtr[ ISI_HEADER_OFFSET_RESOURCEID ]; +#ifdef ISCE_INTERNAL_EXTENDED_RESOURCE_ROUTING_SUPPORTED + // Extended Resource Routing + if( PN_PREFIX == msgPtr[ ISI_HEADER_OFFSET_RESOURCEID ] ) + { + C_TRACE( ( _T( "DISINameService::GetResourceUsedInMessage 0x%x extended resource 0x%x" ), &aMessageToBeResourceRouted, resource ) ); + resource = ( resource | (TUint32)( msgPtr[ ISI_HEADER_OFFSET_TYPE ] << KEightBitShift ) ); + resource = ( resource | (TUint32)( msgPtr[ ISI_HEADER_OFFSET_SUBTYPE ] << KSixteenBitShift ) ); + } + +#endif // ISCE_INTERNAL_EXTENDED_RESOURCE_ROUTING_SUPPORTED + // No need for else as first 8 bits are already used. + C_TRACE( ( _T( "DISINameService::GetResourceUsedInMessage 0x%x resource 0x%x<" ), &aMessageToBeResourceRouted, resource ) ); + return resource; + } + +TUint8 DISINameService::GetDeviceIdByResource( + const TUint32 aResourceIdentifier + ) + { + C_TRACE( ( _T( "DISINameService::GetDeviceIdByResource 0x%x>" ), aResourceIdentifier ) ); + TUint8 deviceIdentifier = PN_DEV_OWN; +#ifdef ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE + C_TRACE( ( _T( "DISINameService::GetDeviceIdByResource 0x%x ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE" ), aResourceIdentifier ) ); + LockNameServiceDMutex(); + TUint16 phonetAddress( KUninitializedPhoNetAddress ); + TUint32 result = iNameRecords->LookupPhonetAddress( aResourceIdentifier, &phonetAddress ); + FreeNameServiceDMutex(); + if( result == KErrNone ) + { + C_TRACE( ( _T( "DISINameService::GetDeviceIdByResource 0x%x old device 0x%x phonetAddress 0x%x" ), aResourceIdentifier, deviceIdentifier, phonetAddress ) ); + deviceIdentifier = ( (TUint8)( phonetAddress >> KEightBitShift ) ); + C_TRACE( ( _T( "DISINameService::GetDeviceIdByResource 0x%x new device 0x%x phonetAddress 0x%x" ), aResourceIdentifier, deviceIdentifier, phonetAddress ) ); + } +#endif // ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE + // No need for else as going to default + C_TRACE( ( _T( "DISINameService::GetDeviceIdByResource 0x%x 0x%x<" ), aResourceIdentifier, deviceIdentifier ) ); + return deviceIdentifier; + } + +void DISINameService::TxPnsNameAddInd( + const TDesC8& aPnsNameAddReq, + const TUint32 aName, + const TUint16 aPhoNetAddress, + const TUint8 aFlags + ) + { + C_TRACE( ( _T( "DISINameService::TxPnsNameAddInd 0x%x>" ), &aPnsNameAddReq ) ); + LockNameServiceDMutex(); + const TUint8* msgPtr( aPnsNameAddReq.Ptr() ); + ASSERT_RESET_ALWAYS( msgPtr, + ( EISINameServiceNullPointer13 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + TUint32 msgLength = ( ISI_HEADER_SIZE + SIZE_PNS_NAME_ADD_IND ); + TDes8& indMsg = MemApi::AllocBlock( msgLength ); + indMsg.SetLength( msgLength ); + ASSERT_RESET_ALWAYS( ( indMsg.Length() > ( ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + PN_NAME_SRV_ITEM_STR_OFFSET_RESERVED ) ), + ( EISINameServiceWrongLength8 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + TUint8* indPtr = const_cast( indMsg.Ptr() ); + SetIsiHeaderForIndication( indMsg, aPnsNameAddReq, PNS_NAME_ADD_IND ); + PUTB16( &indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_TOTALMATCHES ], KOneMatch ); + PUTB16( &indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_MATCHESINMSG ], KOneMatch ); + indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_RESERVED1 ] = KFiller; + indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_RESERVED2 ] = KFiller; + PUTB32( &indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + PN_NAME_SRV_ITEM_STR_OFFSET_NAME ], aName ); + PUTB16( &indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + PN_NAME_SRV_ITEM_STR_OFFSET_DEV ], aPhoNetAddress ); + indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + PN_NAME_SRV_ITEM_STR_OFFSET_FLAGS ] = aFlags; + indPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_NAMEENTRYTBL + PN_NAME_SRV_ITEM_STR_OFFSET_RESERVED ] = KFiller; + SendToRouter( indMsg ); + + C_TRACE( ( _T( "DISINameService::TxPnsNameAddInd 0x%x<" ), &aPnsNameAddReq ) ); } +void DISINameService::TxPnsNameRemoveInd( + const TDesC8& aPnsNameRemoveReq, + const TUint32 aName, + const TUint16 aPhoNetAddress, + const TUint8 aFlags + ) + { + C_TRACE( ( _T( "DISINameService::TxPnsNameRemoveInd 0x%x>" ), &aPnsNameRemoveReq ) ); + LockNameServiceDMutex(); + const TUint8* msgPtr( aPnsNameRemoveReq.Ptr() ); + ASSERT_RESET_ALWAYS( msgPtr, + ( EISINameServiceNullPointer14 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + TUint32 msgLength = ( ISI_HEADER_SIZE + SIZE_PNS_NAME_REMOVE_IND ); + TDes8& indMsg = MemApi::AllocBlock( msgLength ); + indMsg.SetLength( msgLength ); + ASSERT_RESET_ALWAYS( ( indMsg.Length() > ( ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_NAMEENTRYTBL + PN_NAME_SRV_ITEM_STR_OFFSET_FLAGS ) ), + ( EISINameServiceWrongLength8 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + TUint8* indPtr = const_cast( indMsg.Ptr() ); + ASSERT_RESET_ALWAYS( indPtr, ( EISINameServiceNullPointer10 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + SetIsiHeaderForIndication( indMsg, aPnsNameRemoveReq, PNS_NAME_REMOVE_IND ); + C_TRACE( ( _T( "DISINameService::TxPnsNameRemoveInd 0x%x name 0x%x phonetAddress 0x%x flags 0x%x" ), &aPnsNameRemoveReq, aName, aPhoNetAddress, aFlags ) ); + PUTB16( &indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_TOTALMATCHES ], KOneMatch ); + PUTB16( &indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_MATCHESINMSG ], KOneMatch ); + indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_RESERVED1 ] = KFiller; + indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_RESERVED2 ] = KFiller; + PUTB32( &indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_NAMEENTRYTBL + PN_NAME_SRV_ITEM_STR_OFFSET_NAME ], aName ); + PUTB16( &indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_NAMEENTRYTBL + PN_NAME_SRV_ITEM_STR_OFFSET_DEV ], aPhoNetAddress ); + indPtr[ ISI_HEADER_SIZE + PNS_NAME_REMOVE_IND_OFFSET_NAMEENTRYTBL + PN_NAME_SRV_ITEM_STR_OFFSET_FLAGS ] = aFlags; + SendToRouter( indMsg ); + C_TRACE( ( _T( "DISINameService::TxPnsNameRemoveInd 0x%x<" ), &aPnsNameRemoveReq ) ); + } +DISINameService* DISINameService::GetISINameServiceF( + // None + ) + { + ASSERT_RESET_ALWAYS( iThisptr, + ( EISINameServiceNullPointer12 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + return iThisptr; + } + +DNameRecords* DISINameService::GetNameRecordsF( + // None + ) + { + ASSERT_RESET_ALWAYS( iNameRecords, + ( EISINameServiceNullPointer15 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + return iNameRecords; + } + +void DISINameService::SetIsiHeaderForResp( + const TDesC8& aResponseMessage, + const TDesC8& aRequestMessage, + const TUint8 aResponseMessageIdentifier + ) + { + C_TRACE( ( _T( "DISINameService::SetIsiHeaderForResp 0x%x 0x%x 0x%x>" ), &aResponseMessage, &aRequestMessage, aResponseMessageIdentifier ) ); + const TUint8* reqMsgPtr = aRequestMessage.Ptr(); + ASSERT_RESET_ALWAYS( reqMsgPtr, ( EISINameServiceNullPointer16 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + TUint8* respMsgPtr = const_cast( aResponseMessage.Ptr() ); + ASSERT_RESET_ALWAYS( respMsgPtr, ( EISINameServiceNullPointer17 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aResponseMessage.Length() > ISI_HEADER_OFFSET_MESSAGEID ), + ( EISINameServiceWrongLength9 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aRequestMessage.Length() > ISI_HEADER_OFFSET_TRANSID ), + ( EISINameServiceWrongLength10 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + respMsgPtr[ ISI_HEADER_OFFSET_MEDIA ] = reqMsgPtr[ ISI_HEADER_OFFSET_MEDIA ]; + SET_RECEIVER_DEV( respMsgPtr, GET_SENDER_DEV( reqMsgPtr ) ); + SET_SENDER_DEV( respMsgPtr, PN_DEV_OWN ); + respMsgPtr[ ISI_HEADER_OFFSET_RESOURCEID ] = PN_NAMESERVICE; + SET_LENGTH( respMsgPtr, ( aResponseMessage.Length() - PN_HEADER_SIZE ) ); + SET_RECEIVER_OBJ( respMsgPtr, GET_SENDER_OBJ( reqMsgPtr ) ); + SET_SENDER_OBJ( respMsgPtr, PN_OBJ_ROUTER ); + respMsgPtr[ ISI_HEADER_OFFSET_TRANSID ] = reqMsgPtr[ ISI_HEADER_OFFSET_TRANSID ]; + respMsgPtr[ ISI_HEADER_OFFSET_MESSAGEID ] = aResponseMessageIdentifier; + C_TRACE( ( _T( "DISINameService::SetIsiHeaderForResp 0x%x 0x%x 0x%x<" ), &aResponseMessage, &aRequestMessage, aResponseMessageIdentifier ) ); + } + +void DISINameService::SetIsiHeaderForCommonResp( + const TDesC8& aResponseMessage, + const TDesC8& aRequestMessage + ) + { + C_TRACE( ( _T( "DISINameService::SetIsiHeaderForCommonResp 0x%x 0x%x>" ), &aResponseMessage, &aRequestMessage ) ); + const TUint8* reqMsgPtr = aRequestMessage.Ptr(); + ASSERT_RESET_ALWAYS( reqMsgPtr, ( EISINameServiceNullPointer18 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + TUint8* respMsgPtr = const_cast( aResponseMessage.Ptr() ); + ASSERT_RESET_ALWAYS( respMsgPtr, ( EISINameServiceNullPointer19 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aResponseMessage.Length() > ISI_HEADER_OFFSET_MESSAGEID ), + ( EISINameServiceWrongLength11 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aRequestMessage.Length() > ISI_HEADER_OFFSET_TRANSID ), + ( EISINameServiceWrongLength12 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + respMsgPtr[ ISI_HEADER_OFFSET_MEDIA ] = ( reqMsgPtr[ ISI_HEADER_OFFSET_MEDIA ] ); + SET_RECEIVER_DEV( respMsgPtr, GET_SENDER_DEV( reqMsgPtr ) ); + SET_SENDER_DEV( respMsgPtr, PN_DEV_OWN ); + respMsgPtr[ ISI_HEADER_OFFSET_RESOURCEID ] = ( reqMsgPtr[ ISI_HEADER_OFFSET_RESOURCEID ] ); + SET_LENGTH( respMsgPtr, ( aResponseMessage.Length() - PN_HEADER_SIZE ) ); + SET_RECEIVER_OBJ( respMsgPtr, GET_SENDER_OBJ( reqMsgPtr ) ); + SET_SENDER_OBJ( respMsgPtr, GET_RECEIVER_OBJ( reqMsgPtr ) ); + respMsgPtr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_TRANSACTIONID ] = ( reqMsgPtr[ ISI_HEADER_OFFSET_TRANSID ] ); + respMsgPtr[ ISI_HEADER_SIZE + COMMON_MESSAGE_COMM_SERVICE_NOT_IDENTIFIED_RESP_OFFSET_MESSAGEID ] = COMMON_MESSAGE; + C_TRACE( ( _T( "DISINameService::SetIsiHeaderForCommonResp 0x%x 0x%x<" ), &aResponseMessage, &aRequestMessage ) ); + } + +void DISINameService::SetIsiHeaderForIndication( + const TDesC8& aIndicationToModify, + const TDesC8& aPnsNameRequest, + const TUint8 aIndicationMessageIdentifier + ) + { + C_TRACE( ( _T( "DISINameService::aIndicationToModify 0x%x 0x%x 0x%x>" ), &aIndicationToModify, &aPnsNameRequest, aIndicationMessageIdentifier ) ); + const TUint8* reqMsgPtr = aPnsNameRequest.Ptr(); + ASSERT_RESET_ALWAYS( reqMsgPtr, ( EISINameServiceNullPointer18 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + TUint8* indMsgPtr = const_cast( aIndicationToModify.Ptr() ); + ASSERT_RESET_ALWAYS( indMsgPtr, ( EISINameServiceNullPointer19 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aIndicationToModify.Length() > ISI_HEADER_OFFSET_MESSAGEID ), + ( EISINameServiceWrongLength11 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( aPnsNameRequest.Length() > ISI_HEADER_OFFSET_TRANSID ), + ( EISINameServiceWrongLength12 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + indMsgPtr[ ISI_HEADER_OFFSET_MEDIA ] = PN_MEDIA_ROUTING_REQ; + SET_RECEIVER_DEV( indMsgPtr, GET_SENDER_DEV( reqMsgPtr ) ); + SET_SENDER_DEV( indMsgPtr, PN_DEV_OWN ); + indMsgPtr[ ISI_HEADER_OFFSET_RESOURCEID ] = PN_NAMESERVICE; + SET_LENGTH( indMsgPtr, ( aIndicationToModify.Length() - PN_HEADER_SIZE ) ); + SET_RECEIVER_OBJ( indMsgPtr, PN_OBJ_EVENT_MULTICAST ); + SET_SENDER_OBJ( indMsgPtr, PN_OBJ_ROUTER ); + indMsgPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_UTID ] = 0x00; + indMsgPtr[ ISI_HEADER_SIZE + PNS_NAME_ADD_IND_OFFSET_SUBFUNCTION ]= aIndicationMessageIdentifier; + C_TRACE( ( _T( "DISINameService::aIndicationToModify 0x%x 0x%x 0x%x<" ), &aIndicationToModify, &aPnsNameRequest, aIndicationMessageIdentifier ) ); + } +DISINameServiceExtended::DISINameServiceExtended( + DISINameService* aNameService + ) + { + C_TRACE( ( _T( "DISINameServiceExtended::DISINameServiceExtended 0x%x>" ), iISINameService ) ); + iISINameService = aNameService; + ASSERT_RESET_ALWAYS( iISINameService, ( EISINameServiceExtendedNullPointer | EDISINameServiceTraceId << KClassIdentifierShift ) ); + AddModemResources(); + //AddPnDevDspMainResources(); + // iShNameAddIndSubscriptionState = ENotSubscribed; + + // + // flag: ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE + // + // + // - Extended Resource routing supported by Symbian SW Name Service (Design Change) + // - PN_COMMGR by default routed to RAPU, by device id 0x6c routed to Symbian SW PN_COMMGR (Design Change) + // - Internally in ISCE PN_COMMGR name is handled : [0] PN_COMMGR, [1] deviceidentifier, [2] don't care, [3] don't care only visible in NameRecords table + // - PN_NAMESERVICE by default routed to RAPU by device id 0x6c routed to Symbian SW PN_NAMESERVICE + // - Symbian SW wider name service subscribes PNS_NAME_ADD_INDs from RAPU through Symbian SW PN_APE_COMMGR (REQ, RESP) + // - Symbian SW Name Service contains: Symbian SW Resources added with PNS_NAME_ADD_REQ dev id PN_DEV_OWN (Phonet address 0x6c[own for all], TD MODEM Resources (Phonet address 0x6000), PN_DSP_MAIN, Symbian SW Resource stored in RAPU Name Service (dynamically added after PNS_NAME_ADD_IND received PhoNet address as got from indication), other messages are routed to RAPU (Design Change) + // - Communication Manager calls ::GetDeviceIdentifierByResouce to get appropriate device identifier to indication subscription + // + // worry later the usage of shared resource such as PN_COMMGR, PN_NAME_SERVICE etc.. others that shall pop up due to missing ISA system design, use rxdev from message vs. nametable entry to differentiate them + + C_TRACE( ( _T( "DISINameServiceExtended::DISINameServiceExtended 0x%x<" ), iISINameService ) ); + } + +DISINameServiceExtended::~DISINameServiceExtended( + // None + ) + { + C_TRACE( ( _T( "DISINameServiceExtended::~DISINameServiceExtended<>" ) ) ); + } +void DISINameServiceExtended::AddModemResources( + // None + ) + { + C_TRACE( ( _T( "DISINameServiceExtended::AddModemResources>" ) ) ); + TUint8 err( PN_NAME_OK ); + TUint8 flags = PN_NAME_NOCHG; + TUint16 phonetAddressModemRoutingReq = ( ( PN_DEV_MODEM << KDeviceIdentifierPhoNetAddressShift ) | PN_OBJ_ROUTING_REQ ); + + DNameRecords* nameRecords = iISINameService->GetNameRecordsF(); + + err = nameRecords->AddName( PN_SMS, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed1 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_SS, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed2 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_CSD, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed3 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_GPDS, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed4 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_GSS, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed5 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_UICC, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed6 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_AT_MODEM, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed7 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_MODEM_LCS, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed8 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_MODEM_TEST, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed9 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_MODEM_NVD, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed10 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_MODEM_MCE, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed11 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_MODEM_INFO, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed12 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_MODEM_NETWORK, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed13 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_MODEM_CALL, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed14 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_WCDMA_RF_TEST, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed15 | EDISINameServiceTraceId << KClassIdentifierShift ) ); // EISINameServiceNameCreateFailed15... + + err = nameRecords->AddName( PN_GSM_RF_TEST, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed16 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_RF_HAL, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed17 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + err = nameRecords->AddName( PN_COMMON_RF_TEST, phonetAddressModemRoutingReq, flags ); + ASSERT_RESET_ALWAYS( ( PN_NAME_OK == err ), ( EISINameServiceNameCreateFailed18 | EDISINameServiceTraceId << KClassIdentifierShift ) ); + + C_TRACE( ( _T( "DISINameServiceExtended::AddModemResources<" ) ) ); + } diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isinameservice_dll/src/namerecords.cpp --- a/connectivitylayer/isce/isinameservice_dll/src/namerecords.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isinameservice_dll/src/namerecords.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -19,146 +19,264 @@ #include "namerecords.h" #include #include "isinameservicetrace.h" // For C_TRACE, ASSERT_RESET.. and fault codes +#include "isihelpers.h" // For PN_DEV_OWN enum TISINameRecordsFaults { EISINameRecordsMemAllocFailure = 0x01, + EISINameRecordsNullPointer, + EISINameRecordsNullPointer2, + EISINameRecordsNullPointer3, + EISINameRecordsNullPointer4, + EISINameRecordsNotFoundEntry, }; +const TUint8 KAlwaysAssert( 0x00 ); +const TUint16 KOwnDeviceRouter( PN_DEV_OWN << 8 ); + DNameRecords::DNameRecords() - { - //nothing - C_TRACE( ( _T( "DNameRecords::DNameRecords <->" ) ) ); - } + { + //nothing + C_TRACE( ( _T( "DNameRecords::DNameRecords <>" ) ) ); + } DNameRecords::~DNameRecords() - { - C_TRACE( ( _T( "DNameRecords::~DNameRecords ->" ) ) ); - TInt i = 0; - while( i" ) ) ); + for( TUint32 i( 0 ); i < iNameTableArray.Count(); i++ ) + { + delete iNameTableArray[ i ]; + iNameTableArray.Remove( i ); + } + iNameTableArray.Reset(); + C_TRACE( ( _T( "DNameRecords::~DNameRecords<" ) ) ); + } -TUint8 DNameRecords::AddName( const TUint32 aName, - const TUint16 aPhonetAddress, - const TUint8 aFlags ) +TUint8 DNameRecords::AddName( + const TUint32 aName, + const TUint16 aPhonetAddress, + const TUint8 aFlags + ) { - C_TRACE( ( _T( "DNameRecords::AddName name:0x%x phonetAdd:%d flags: %d ->" ), aName, aPhonetAddress, aFlags ) ); + C_TRACE( ( _T( "DNameRecords::AddName name:0x%x phonetAdd:0x%04x flags: 0x%x>" ), aName, aPhonetAddress, aFlags ) ); + TUint8 error( PN_NAME_OK ); + switch( aFlags ) + { + case PN_NAME_UNDEF : + case PN_NAME_NOCHG : + { + error = AddNewName( aName, aPhonetAddress, aFlags ); + break; + } + default: + { + TRACE_ASSERT_ALWAYS( KAlwaysAssert ); + error = PN_NAME_UNKNOWN; + break; + } + } + C_TRACE( ( _T( "DNameRecords::AddName name:0x%x phonetAdd:0x%04x flags: 0x%x %d<" ), aName, aPhonetAddress, aFlags, error ) ); + return error; + } - TUint8 error = PN_NAME_OK ; - TUint i = 0; - TBool nameFound = EFalse; - - if( aFlags == PN_NAME_UNDEF || - aFlags == PN_NAME_NOCHG ) +TUint8 DNameRecords::RemoveName( + const TUint32 aName + ) + { + C_TRACE( ( _T( "DNameRecords::RemoveName name:0x%x>" ), aName ) ); + TUint8 error( PN_NAME_UNKNOWN ); + TNameTableEntry* nameEntry = FindMatchingNameTableEntry( aName ); + if( nameEntry ) { - while( iiName == aName) - { - nameFound = ETrue; - if( iNameTableArray[i]->iFlags != PN_NAME_UNDEF ) - { - error = PN_NAME_NOT_ALLOWED; - } - else - { - iNameTableArray[i]->iPhonetAddress = aPhonetAddress; - iNameTableArray[i]->iFlags = aFlags; - } - break; - } - i++; - }//while + if( nameEntry->iFlags == PN_NAME_UNDEF ) + { + RemoveUndefinedEntry( *nameEntry ); + error = PN_NAME_OK; + } + else + { + error = PN_NAME_NOT_ALLOWED; + TRACE_ASSERT_ALWAYS( KAlwaysAssert ); + } } - else - { - error = PN_NAME_UNKNOWN; - } - if( !nameFound ) + // No need for else, as name is unknown + TRACE_ASSERT_ALWAYS( PN_NAME_OK == error ); + C_TRACE( ( _T( "DNameRecords::RemoveName name:0x%x %d<" ), aName, error ) ); + return error; + } + +TInt DNameRecords::LookupPhonetAddress( + const TUint32 aName, + TUint16* aPhonetAddress + ) + { + C_TRACE( ( _T( "DNameRecords::LookupPhonetAddress name:0x%x>" ), aName ) ); + ASSERT_RESET_ALWAYS( aPhonetAddress, ( EISINameRecordsNullPointer2 | EDISINameRecordsTraceId << KClassIdentifierShift ) ); + TInt error( KErrNotFound ); + TNameTableEntry* nameEntry = FindMatchingNameTableEntry( aName ); + if( nameEntry ) { - TNameTable* table = new TNameTable( aName, aPhonetAddress, aFlags ); + *aPhonetAddress = nameEntry->iPhonetAddress; + error = KErrNone; + } + // No need for else, as name is not found + C_TRACE( ( _T( "DNameRecords::LookupPhonetAddress name:0x%x %d<" ), aName, error ) ); + return error; + } - ASSERT_RESET_ALWAYS( table, EISINameRecordsMemAllocFailure | EDISINameRecordsTraceId << KClassIdentifierShift ); - iNameTableArray.Append( table ); - +TInt DNameRecords::LookupNamePhonetAddressAndFlags( + const TUint32 aName, + TUint16* aPhonetAddress, + TUint8* aFlags + ) + { + C_TRACE( ( _T( "DNameRecords::LookupNamePhonetAddressAndFlags name:0x%x>" ), aName ) ); + ASSERT_RESET_ALWAYS( aPhonetAddress, ( EISINameRecordsNullPointer3 | EDISINameRecordsTraceId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( aFlags, ( EISINameRecordsNullPointer4 | EDISINameRecordsTraceId << KClassIdentifierShift ) ); + TInt error( KErrNotFound ); + TNameTableEntry* nameEntry = FindMatchingNameTableEntry( aName ); + if( nameEntry ) + { + *aPhonetAddress = nameEntry->iPhonetAddress; + *aFlags = nameEntry->iFlags; + error = KErrNone; } + // No need for else, as name is not found + C_TRACE( ( _T( "DNameRecords::LookupNamePhonetAddressAndFlags name:0x%x %d<" ), aName, error ) ); return error; } -TUint8 DNameRecords::RemoveName( const TUint32 aName ) - { - C_TRACE( ( _T( "DNameRecords::RemoveName name:0x%x ->" ), aName ) ); - TUint8 error = PN_NAME_UNKNOWN; - TInt i = 0; - while( i* aResultsArray + ) + { + C_TRACE( ( _T( "DNameRecords::NameQuery name:0x%x mask:0x%x &aResultsArray: 0x%x>" ), aName, aMask, &aResultsArray ) ); + FindMatchingNameTableEntriesWithMask( aName, aMask, aResultsArray ); + C_TRACE( ( _T( "DNameRecords::NameQuery name:0x%x mask:0x%x &aResultsArray: 0x%x<" ), aName, aMask, &aResultsArray ) ); + } + +// privates start + +TUint8 DNameRecords::AddNewName( + const TUint32 aName, + const TUint16 aPhonetAddress, + const TUint8 aFlags + ) + { + E_TRACE( ( _T( "DNameRecords::AddNewName 0x%x 0x%04x 0x%x>" ), aName, aPhonetAddress, aFlags ) ); + const TUint32 nameTableCount( iNameTableArray.Count() ); + TUint8 error( PN_NAME_OK ); + TNameTableEntry* nameEntry = FindMatchingNameTableEntry( aName ); + if( nameEntry ) { - if( iNameTableArray[i]->iName == aName) - { - error = PN_NAME_NOT_ALLOWED; - if( iNameTableArray[i]->iFlags == PN_NAME_UNDEF ) - { - delete iNameTableArray[i];; - iNameTableArray.Remove(i); - iNameTableArray.Compress(); - error = PN_NAME_OK; - } - break; - } - i++; - } //while + error = AddExistinNameToNameTableArray( nameEntry, aName, aPhonetAddress, aFlags ); + } + else + { + error = AddNewNameToNameTableArray( aName, aPhonetAddress, aFlags ); + } + E_TRACE( ( _T( "DNameRecords::AddNewName 0x%x 0x%04x 0x%x error %d<" ), aName, aPhonetAddress, aFlags, error ) ); + return error; + } +TUint8 DNameRecords::AddExistinNameToNameTableArray( + TNameTableEntry* aNameTableEntry, + const TUint32 aName, + const TUint16 aPhonetAddress, + const TUint8 aFlags + ) + { + E_TRACE( ( _T( "DNameRecords::AddExistinNameToNameTableArray 0x%x 0x%04x 0x%x exists 0x%x>" ), aName, aPhonetAddress, aFlags, aNameTableEntry ) ); + TUint8 error( PN_NAME_NOT_ALLOWED ); + ASSERT_RESET_ALWAYS( aNameTableEntry, ( EISINameRecordsNullPointer | EDISINameRecordsTraceId << KClassIdentifierShift ) ); + if( aNameTableEntry->iFlags != PN_NAME_NOCHG ) + { + aNameTableEntry->iPhonetAddress = aPhonetAddress; + aNameTableEntry->iFlags = aFlags; + error = PN_NAME_OK; + } + // No need for else, if not changeable doing nothing. + TRACE_ASSERT_ALWAYS( PN_NAME_OK == error ); + E_TRACE( ( _T( "DNameRecords::AddExistinNameToNameTableArray 0x%x 0x%04x 0x%x exists 0x%x error %d<" ), aName, aPhonetAddress, aFlags, aNameTableEntry, error ) ); return error; } -TInt32 DNameRecords::LookupPhonetAddress( const TUint32 aName, TUint16* aPhonetAddress ) - { - C_TRACE( ( _T( "DNameRecords::LookupPhonetAddress name:0x%x ->" ), aName ) ); - TInt32 error = KErrNotFound; - TInt i = 0; - - while( i" ), aName, aPhonetAddress, aFlags ) ); + TUint8 error( PN_NAME_NOT_ALLOWED ); + // This check is only needed here as these PhoNet addresses may never exist. + if( KOwnDeviceRouter != aPhonetAddress ) { - C_TRACE( ( _T( "DNameRecords::LookupPhonetAddress ind:0x%x " ), i ) ); - if( iNameTableArray[i]->iName == aName) - { - C_TRACE( ( _T( "DNameRecords::LookupPhonetAddress found phonet address: 0x%x" ), iNameTableArray[i]->iPhonetAddress ) ); - *aPhonetAddress = iNameTableArray[i]->iPhonetAddress; - error = KErrNone; - break; - } - i++; - }//while - + TNameTableEntry* table = new TNameTableEntry( aName, aPhonetAddress, aFlags ); + E_TRACE( ( _T( "DNameRecords::AddNewNameToNameTableArray 0x%x 0x%x 0x%x new 0x%x<>" ), aName, aPhonetAddress, aFlags, table ) ); + ASSERT_RESET_ALWAYS( table, ( EISINameRecordsMemAllocFailure | EDISINameRecordsTraceId << KClassIdentifierShift ) ); + iNameTableArray.Append( table ); + error = PN_NAME_OK; + } + // No need for else as not allowed. + TRACE_ASSERT_ALWAYS( PN_NAME_OK == error ); + E_TRACE( ( _T( "DNameRecords::AddNewNameToNameTableArray 0x%x 0x%04x 0x%x 0x%x<" ), aName, aPhonetAddress, aFlags, error ) ); return error; } -RArray * DNameRecords::GetNameTable() +TNameTableEntry* DNameRecords::FindMatchingNameTableEntry( + const TUint32 aName + ) { - C_TRACE( ( _T( "DNameRecords::GetNameTable ->" ) ) ); - return &iNameTableArray ; + E_TRACE( ( _T( "DNameRecords::FindMatchingNameTableEntry 0x%x>" ), aName ) ); + TNameTableEntry* tableEntry = NULL; + const TUint32 nameTableCount( iNameTableArray.Count() ); + for( TUint32 i( 0 ); i < nameTableCount; i++ ) + { + if( iNameTableArray[ i ]->iName == aName ) + { + tableEntry = iNameTableArray[ i ]; + break; + } + // No need for else, continue for + } + E_TRACE( ( _T( "DNameRecords::FindMatchingNameTableEntry 0x%x entry 0x%x<" ), aName, tableEntry ) ); + return tableEntry; } -TInt32 DNameRecords::NameQuery( const TUint32 aName, const TUint32 aMask, RArray *aResultsArray ) - { - C_TRACE( ( _T( "DNameRecords::AddName name:0x%x mask:%d &aResultsArray: 0x%x ->" ), aName, aMask, &aResultsArray ) ); - - TInt i = 0; - TInt32 count = 0;//KErrNotFound - while( i* aResultsArray + ) + { + E_TRACE( ( _T( "DNameRecords::FindMatchingNameTableEntriesWithMask 0x%x 0x%x 0x%x>" ), aName, aMask, aResultsArray ) ); + const TUint32 nameTableCount( iNameTableArray.Count() ); + for( TUint32 i( 0 ); i < nameTableCount; i++ ) { - if( aName == iNameTableArray[i]->iName || - (aName & aMask ) == ( iNameTableArray[i]->iName & aMask ) ) + TNameTableEntry* tableEntry = iNameTableArray[ i ]; + if( ( aName == tableEntry->iName ) || + ( ( aName & aMask ) == ( tableEntry->iName & aMask ) ) ) { - aResultsArray->Append( iNameTableArray[i] ); - count++; + E_TRACE( ( _T( "DNameRecords::FindMatchingNameTableEntriesWithMask 0x%x 0x%x found" ), aName, aMask ) ); + aResultsArray->Append( tableEntry ); } - i++; - }//while - return count; - } + // No need for else, if not found no actions. + } + E_TRACE( ( _T( "DNameRecords::FindMatchingNameTableEntriesWithMask 0x%x 0x%x 0x%x<" ), aName, aMask, aResultsArray ) ); + } +void DNameRecords::RemoveUndefinedEntry( + TNameTableEntry& aNameEntryToRemove + ) + { + E_TRACE( ( _T( "DNameRecords::RemoveUndefinedEntry 0x%x>" ), &aNameEntryToRemove ) ); + const TInt index = iNameTableArray.Find( &aNameEntryToRemove ); + ASSERT_RESET_ALWAYS( ( index != KErrNotFound ), ( EISINameRecordsNotFoundEntry | EDISINameRecordsTraceId << KClassIdentifierShift ) ); + delete iNameTableArray[ index ]; + iNameTableArray.Remove( index ); + iNameTableArray.Compress(); + E_TRACE( ( _T( "DNameRecords::RemoveUndefinedEntry 0x%x<" ), &aNameEntryToRemove ) ); + } diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/eabi/isirouteru.def --- a/connectivitylayer/isce/isirouter_dll/eabi/isirouteru.def Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/eabi/isirouteru.def Tue Oct 19 13:16:20 2010 +0300 @@ -1,5 +1,6 @@ EXPORTS _Z19CreateLogicalDevicev @ 1 NONAME _ZN6MISIIf8NewISIIfElRh @ 2 NONAME - _ZN18MISIObjectRouterIf7ConnectElRhP18MISIRouterObjectIf @ 3 NONAME + _ZN18MISIObjectRouterIf5GetIfEv @ 3 NONAME + _ZN13MISICommonPep6NewExcEP15MISICommonPepTx @ 4 NONAME diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/group/isirouter.mmp --- a/connectivitylayer/isce/isirouter_dll/group/isirouter.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/group/isirouter.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -19,7 +19,6 @@ #include #include "kernel/kern_ext.mmh" - TARGET isirouter.dll TARGETTYPE kext linkas isirouter.dll @@ -28,6 +27,7 @@ CAPABILITY ALL FEATUREVARIANT + EPOCALLOWDLLDATA SOURCEPATH ../src @@ -41,10 +41,15 @@ SOURCE isicltransceiver.cpp SOURCE isithreadcontainer.cpp +SOURCE isirouterservice.cpp +SOURCE isicommonpepkernel.cpp +SOURCE isiroutertrace.cpp + USERINCLUDE ../inc USERINCLUDE ../../ismpmultiplexer_dll/inc USERINCLUDE ../../memmanager_dll/inc +USERINCLUDE ../../isaaccessextension_dll/inc NON_FOUNDATION_ADAPT_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/kernel @@ -63,4 +68,7 @@ // flag to enable normal trace inside component MACRO COMPONENT_TRACE_FLAG +MACRO ISIMESSAGE_TRACE_FLAG +MACRO ISIMESSAGE_DUMP_TRACE_FLAG +MACRO ISCE_INTERNAL_WIDER_NAME_SERVICE_IN_USE diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/inc/isicltransceiver.h --- a/connectivitylayer/isce/isirouter_dll/inc/isicltransceiver.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/inc/isicltransceiver.h Tue Oct 19 13:16:20 2010 +0300 @@ -18,50 +18,113 @@ #ifndef __ISICLTRANSCEIVER_H__ #define __ISICLTRANSCEIVER_H__ -#include "misilinkrouterif.h" // For MISILinkRouterIf -#include "isiinternaldefs.h" // For KMaxNumOfObjId - +#include "misilinkrouterif.h" // For MISILinkRouterIf +#include "isiinternaldefs.h" // For KMaxNumOfObjId +#include "misirouterservicerouterif.h" // For MISIRouterServiceRouterIf class MISIRouterLinkIf; class DISIRouter; +class DIsiRouterService; +class DISIMsgQueue; -NONSHARABLE_CLASS( DISICLTransceiver ) : public DBase, public MISILinkRouterIf +NONSHARABLE_CLASS( DISICLTransceiver ) : public DBase, public MISILinkRouterIf, public MISIRouterServiceRouterIf { public: - DISICLTransceiver( DISIRouter* aPtr ); + DISICLTransceiver( DISIRouter& aRouter, TDfcQue* aThreadPtr ); ~DISICLTransceiver(); + // See comments from MISILinkRouterIf + TInt RouteISIMessage( TDes8& aMessage, TBool aDynamicSenderCheckNeeded = ETrue ); + + void ReceiveISIMessage( const TDesC8& aMessage, const TUint8 aTrxId ); + + // See comments from MISILinkRouterIf + void StateChanged(); + + // From MISIRouterServiceRouterIf + void GetDeviceConnectionStates( RArray& aDeviceIdentifierList, const TBool aConnectedDevice ); + + private: + + static void StateChangedDfc( TAny* aPtr ); + + static void RxQueueDfc( TAny* aPtr ); + TInt ValidateISIMessage( TDes8& aMessage ); - TInt SendCommIsaEntityNotReachableResp( TDes8& aMessage ); + void ReadStateChanges(); - TUint8 MapDeviceToMedia( const TUint8 aDevice ); + // Responsibility to deallocate the message is transferred. + TInt SendCommIsaEntityNotReachableResp( TDes8& aNotDeliveredMessage ); + + TBool DynamicDevice( const TUint8 aDevId ); + + void UpdateDynamicDeviceTable( const TUint8 aDynamicDevId, const TUint8 aStaticDevId ); + + void DynamicToStaticDevice( TUint8& aRxDev ); - //From MISILinkRouterIf - TInt RouteISIMessage( TDes8& aMessage ); + NONSHARABLE_CLASS( DISIDevice ) : public DBase + { + public: + + DISIDevice( const TUint8 aDeviceIdentifier, MISIRouterLinkIf* aLink ); + ~DISIDevice(); - private: - - //From objectapi - TInt Send( TDes8& aMessage, const TUint8 aObjId ); - - enum TISIMedias + MISIRouterLinkIf* GetLink(); + TUint8 GetDeviceIdentifier(); + TBool GetDeviceState(); + TBool GetDeviceOldState(); + void SetDeviceOldState( TBool aConnected ); + // Shall be called before accessing operations. + void LockDeviceFM(); + // Shall be called after accessing operations. + void FreeDeviceFM(); + + private: + + // Owned, synch internally + NFastMutex* iShDeviceMutex; + // Not owned, synch by above mutex. + MISIRouterLinkIf* iShLink; + // Synch by above mutex. + TUint8 iShDeviceIdentifier; + // Synch by above mutex. + TBool iShOldDeviceConnectedState; + + }; + + //private: + NONSHARABLE_CLASS( TDynamicDevice ) { - EISIMediaSharedMemory = 0x00, - EISIMediaTest, - EISIAmountOfMedias + public: + TDynamicDevice( const TUint8 aDynamicDevId, TUint8 aStaticDevId ){iDynamicDevId = aDynamicDevId; iStaticDevId = aStaticDevId;}; + TUint8 iDynamicDevId; + TUint8 iStaticDevId; }; - MISIRouterLinkIf** iLinksArray; - DISIRouter* iRouter; - - public: - - static DISICLTransceiver* iThisPtr; + // Additional coding convention iSh-prefix means a member variable shared between N threads. + // Owned, called in N thread context + RPointerArray iShDevices; + // Called in N thread context + DISIRouter& iShRouter; + // Owned, no need to synch only accessed from below DFC function. + DIsiRouterService* iRouterService; + // Owned, accessed from N threads no need to synch synch handled internally in TDfc class + TDfc* iShStateChangedDfc; + TDfc* iRxQueueDfc; + + RArray< TDynamicDevice* > iDynamicDeviceTable; + + DISIMsgQueue* iRxQueue; + + static DMutex* iDynamicDeviceTableMutex; + + TUint8 iDevPcLastSendTrxId; + TUint8 iDevPcLastActiveTrxId; }; #endif /* __ISICLTRANSCEIVER_H__ */ diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/inc/isihelpers.h --- a/connectivitylayer/isce/isirouter_dll/inc/isihelpers.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/inc/isihelpers.h Tue Oct 19 13:16:20 2010 +0300 @@ -24,15 +24,63 @@ #include // For SIZE_COMMON_MESSAGE_COMM_ISA_ENTITY_NOT_REACHABLE_RESP #include // For ISI_HEADER_SIZE + +#ifndef PN_DEV_OWN +#define PN_DEV_OWN 0 // PN_DEV_HOST +#endif // PN_DEV_OWN + +#ifndef PN_OBJ_ROUTING_REQ +#define PN_OBJ_ROUTING_REQ 0x00 +#endif // PN_OBJ_ROUTING_REQ + +#ifndef PN_MEDIA_ROUTING_REQ +#define PN_MEDIA_ROUTING_REQ 0x00 +#endif // PN_MEDIA_ROUTING_REQ + +#ifndef PN_OBJ_ROUTER +#define PN_OBJ_ROUTER PN_OBJ_ROUTING_REQ +#endif // PN_OBJ_ROUTER + + +#ifndef PN_DEV_MODEM +#define PN_DEV_MODEM 0x60 +#endif // PN_DEV_MODEM + +#ifndef PN_MEDIA_MODEM_HOST_IF +#define PN_MEDIA_MODEM_HOST_IF 0x26 // Media to/from PN_DEV_MODEM +#endif // PN_MEDIA_MODEM_HOST_IF + +#ifndef PN_DEV_PC +#define PN_DEV_PC 0x10 +#endif // PN_MEDIA_TEST + +// not real only for testing +#ifndef PN_DEV_DUMMYIST +// SET equla to PN_DEV_TEST 0x3c +#define PN_DEV_DUMMYIST 0x3c +#endif // PN_DEV_DUMMYIST + +#ifndef PN_MEDIA_TEST +#define PN_MEDIA_TEST 0xBB +#endif // PN_MEDIA_TEST +// not real + +// <- end + // MACROS #if defined ( __WINS__ ) #define MESSAGELENGTH_LSB 5 #define MESSAGELENGTH_MSB 4 -#else +#else // __WINS__ +#ifndef ISI_LENGTH_BIG_ENDIAN #define MESSAGELENGTH_LSB 4 #define MESSAGELENGTH_MSB 5 -#endif +#else //ISI_LENGTH_BIG_ENDIAN +#define MESSAGELENGTH_LSB 5 +#define MESSAGELENGTH_MSB 4 +#endif // ISI_LENGTH_BIG_ENDIAN +#endif // __WINS__ #define IS_DEV_HOST( dev ) ( ( dev & 0xF0 ) == 0 ) #define GET_RECEIVER_DEV( msg ) ( msg[ ISI_HEADER_OFFSET_RECEIVERDEVICE ] & 0xFC ) @@ -57,6 +105,60 @@ #define SET_LENGTH( msg,len ) msg[ MESSAGELENGTH_MSB ] = ( TUint8 )( ( len ) >> 8 );msg[ MESSAGELENGTH_LSB ] = ( TUint8 )( len ); #define GET_LENGTH( msg ) ( ( ( TUint16 )( ( msg[ MESSAGELENGTH_MSB ] ) << 8 ) ) | msg[ MESSAGELENGTH_LSB ] ) + +/* PUTB8 macro writes byte value to given address. + * This macro is used mainly by other PUTBXX macros. + */ +#define PUTB8(p,v) \ + {(*(TUint8 *)(p)) = ((TUint8)(v));} + + +/* PUTB16 macro writes 16-bit value in Big Endian format + * to given address. 16-bit value is written as two separate + * bytes, and so this macro can write 16-bit value to whatever + * address, regardless of the processor alignment restrictions + */ +#define PUTB16(p,v) \ + {PUTB8((p),(TUint16)(v)>>8); PUTB8((TUint8*)(p)+1,v);} + + +/* PUTB32 macro writes 32-bit value in Big Endian format + * to given address. 32-bit value is written as four separate + * bytes, and so this macro can write 32-bit value to whatever + * address, regardless of the processor alignment restrictions + */ +#define PUTB32(p,v) \ + {PUTB16((p),(TUint32)(v)>>16); PUTB16((TUint8*)(p)+2,(TUint32)(v));} + + +/** + * Big Endian to local endian type + */ + /* GETB8 macro returns byte value from given address. + * This macro is used mainly by other GETBXX macros. + */ +#define GETB8(p) \ + (*(TUint8 *)(p)) + + +/* GETB16 macro reads 16-bit value in Big Endian format + * from given address. 16-bit value is read as two separate + * bytes, and so this macro can read 16-bit value from whatever + * address, regardless of the processor alignment restrictions + */ +#define GETB16(p) \ + (((TUint16) GETB8(p)<<8) | (TUint16) GETB8((TUint8 *)(p)+1)) + + +/* GETB32 macro reads 32-bit value in Big Endian format + * from given address. 32-bit value is read as four separate + * bytes, and so this macro can read 32-bit value from whatever + * address, regardless of the processor alignment restrictions + */ +#define GETB32(p) \ + (((TUint32) GETB16(p)<<16) | (TUint32) GETB16((TUint8 *)(p)+2)) + + // FUNCTION PROTOTYPES // FORWARD DECLARATIONS diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/inc/isiinternaldefs.h --- a/connectivitylayer/isce/isirouter_dll/inc/isiinternaldefs.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/inc/isiinternaldefs.h Tue Oct 19 13:16:20 2010 +0300 @@ -39,10 +39,11 @@ _LIT( KISIDriverName, "ISIDriver" ); -const TUint8 KNotInitializedId( 0x00 ); +const TUint8 KNotInitializedId( 0xff ); const TInt32 KNotInitializedUID( 0x00 ); const TInt KNotInitializedStatus( 0xff ); const TInt KISILddRxQueueSize( 50 ); +const TInt KISIMainRxQueueSize( 200 ); const TInt KMaxISIMsgSize( 65536 ); const TInt KMaxAmountOfObjId( 256 ); const TInt KFirstAllowedObjId( 1 ); diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/inc/isikernelchannel.h --- a/connectivitylayer/isce/isirouter_dll/inc/isikernelchannel.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/inc/isikernelchannel.h Tue Oct 19 13:16:20 2010 +0300 @@ -23,18 +23,18 @@ #include // For TInt, TAny #include // For TDesC8 #include // For TMessageQue -#include "misirouterchannelif.h" // For MISIRouterChannelIf +#include "misirouterobjectif.h" // For MISIRouterObjectIf #include "isiinternaldefs.h" // For TISIAsyncRequest // Forward declarations class DISIMsgQueue; -class MISIChannelRouterIf; +class MISIObjectRouterIf; /* * Kernel side ISI channel. */ -NONSHARABLE_CLASS( DISIKernelChannel ) : public DBase, public MISIRouterChannelIf +NONSHARABLE_CLASS( DISIKernelChannel ) : public DBase, public MISIRouterObjectIf { public: @@ -57,19 +57,19 @@ */ TInt HandleRequest( TThreadMessage& aMsg ); - // From MISIRouterChannelIf start + // From MISIRouterObjectIf start /* - * See comments from MISIRouterChannelIf. + * See comments from MISIRouterObjectIf. */ - void ReceiveMsg( const TDesC8& aMessage ); + void Receive( const TDesC8& aMessage ); /* - * See comments from MISIRouterChannelIf. + * See comments from MISIRouterObjectIf. */ void EnqueChannelRequestCompleteDfc( TInt aRequest, TInt aStatusToComplete ); - // From MISIRouterChannelIf end + // From MISIRouterObjectIf end /* * iKernelChMsgQue callback function in p2p router @@ -154,7 +154,7 @@ // Only acccessed from ISI Router thread. TMessageQue iKernelChMsgQue; TDes8** iPtrPtrToRxBuf; - MISIChannelRouterIf* iRouterIf; + MISIObjectRouterIf* iRouterIf; // Owned TDfc* iEmptyRxDfc; TDfcQue* iMainThread; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/inc/isilink.h --- a/connectivitylayer/isce/isirouter_dll/inc/isilink.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/inc/isilink.h Tue Oct 19 13:16:20 2010 +0300 @@ -80,7 +80,13 @@ */ TBool Send( TDes8& aMsg ); // From MISIRouterLinkIf end + /* + * See comments from MISIRouterLinkIf. + */ + TBool StateConnected(){ return iTrxPresent;}; + TUint8 GetTrxId(); + private: // Not owned, can be called from 1...N thread, router responsible of it's own states guarding. diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/inc/isirouter.h --- a/connectivitylayer/isce/isirouter_dll/inc/isirouter.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/inc/isirouter.h Tue Oct 19 13:16:20 2010 +0300 @@ -22,12 +22,12 @@ #include "misilinkrouterif.h" // For MISILinkRouterIf -#include "misichannelrouterif.h" // For MISIChannelRouterIf +#include "misiobjectrouterif.h" // For MISIObjectRouterIf #include "isiinternaldefs.h" // For KMaxAmountOfObjId //#include "misiobjectrouterif.h" -class MISIRouterChannelIf; +class MISIRouterObjectIf; class MISIRouterObjectIf; class MISIRouterLinkIf; class DISICLTransceiver; @@ -36,7 +36,7 @@ /* * ISI router. */ -NONSHARABLE_CLASS( DISIRouter ) : public DBase, public MISIChannelRouterIf +NONSHARABLE_CLASS( DISIRouter ) : public DBase, public MISIObjectRouterIf { public: @@ -51,64 +51,55 @@ */ ~DISIRouter(); - /* - * See comments from MISILinkRouterIf - */ - //void Receive( TDes8& aMessage ); - //From CLTransceiver TBool Receive( TDes8& aMessage, const TUint8 aObjId ); /* - * See comments from MISIChannelRouterIf + * See comments from MISIObjectRouterIf */ TInt Send( TDes8& aMessage, const TUint8 aObjId ); /* - * See comments from MISIChannelRouterIf + * See comments from MISIObjectRouterIf */ void Disconnect( const TUint8 aObjId ); /* - * See comments from MISIChannelRouterIf + * See comments from MISIObjectRouterIf */ TDfcQue* GetDfcThread( const TISIDfcQThreadType aType ); void FreeDfcThread( TDfcQue* aThread ); /* - * See comments from MISIChannelRouterIf + * See comments from MISIObjectRouterIf */ - void Connect( const TInt32 aUID, TUint8& aObjId, MISIRouterChannelIf* aCallback ); + void Connect( const TInt32 aUID, TUint8& aObjId, MISIRouterObjectIf* aCallback ); /* - * Returns pointer to router it self, called only from MISIChannelRouterIf::GetIf + * Returns pointer to router it self, called only from MISIObjectRouterIf::GetIf * @return pointer to router. */ static DISIRouter* GetRouter(){ return iSelfPtr; }; - - + private: NONSHARABLE_CLASS( TISIClient ) { public: - TInt32 iUID; TUint8 iObjId; - MISIRouterChannelIf* iChannel; - }; - //private: + MISIRouterObjectIf* iChannel; + }; + NONSHARABLE_CLASS( TStaticId ) { public: - TStaticId( const TInt32 aUID, TUint8 aObjId ){iUID = aUID; iObjId = aObjId;}; - TInt32 iUID; TUint8 iObjId; }; - + private: /* @@ -116,36 +107,39 @@ * Called in own thread context not supervisors */ void Initialize(); - - void CheckUIDUniqueness( const TInt32 aUID ); - - TUint8 ReceiveStaticObjId( const TInt32 aUID ); - + + TBool CheckUIDUniqueness( const TInt32 aUID ); + + TUint8 ReserveStaticObjId( const TInt32 aUID ); + TUint8 ReserveNewDynamicObjId(); - + static void InitializeDfc( TAny* aPtr ); - - + public: + // Written only once no need to synch. - static DISIRouter* iSelfPtr; - MISIRouterObjectIf* iNameService; - MISIRouterObjectIf* iCommunicationManager; - - private: + static DISIRouter* iSelfPtr; + + DISICLTransceiver* GetDISICLTransceiver(){ return iShCLTransceiver;}; + + private: + // Owned, synchronized internally with fastmutexes. RArray< TStaticId* > iStaticObjIdTable; // Owned, synchronized internally with fastmutexes. - TISIClient* iClientTable[ KMaxAmountOfObjId ]; + TISIClient* iClientTable[ KMaxAmountOfObjId ];// switch this to objects // Guards class shared array, owned NFastMutex* iClientTableFastMutex; - // Owned + // Owned, executed only from one thread. TDfc* iInitializeDfc; + // Owned, executed only from one thread. TDfcQue* iInitThread; - DISICLTransceiver* iCLTransceiver; - DISIThreadContainer* iClientThreadContainer; - + // Owned, synch done inside the class. + DISICLTransceiver* iShCLTransceiver; + // Owned, synch done inside the class. + DISIThreadContainer* iShClientThreadContainer; }; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/inc/isiroutertrace.h --- a/connectivitylayer/isce/isirouter_dll/inc/isiroutertrace.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/inc/isiroutertrace.h Tue Oct 19 13:16:20 2010 +0300 @@ -34,6 +34,7 @@ EDISIKernelChannelId, EDISIThreadContainerTraceId, EDISICLTransceiverTraceId, + EDIsiRouterServiceTraceId, }; const TUint8 KClassIdentifierShift( 8 ); @@ -48,12 +49,22 @@ #ifdef _DEBUG #if defined COMPONENT_TRACE_FLAG - #define C_TRACE(a) __TRACE_PRINTF(a) + #define C_TRACE( a ) __TRACE_PRINTF( a ) #else #define C_TRACE(a) #endif // COMPONENT_TRACE_FLAG + #if defined ISIMESSAGE_TRACE_FLAG + /* + * Trace function introduction. + */ + void PrintIsiMessageTrace( TDes8& aMessage ); + #define ISIMESSAGE_TRACE( a ) PrintIsiMessageTrace( a ) + #else + #define ISIMESSAGE_TRACE( a ) + #endif // COMPONENT_TRACE_FLAG #else #define C_TRACE(a) + #define ISIMESSAGE_TRACE( a ) #endif // _DEBUG // Resets are made both in UDEB and UREL (traces only in udeb) diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/inc/isithreadcontainer.h --- a/connectivitylayer/isce/isirouter_dll/inc/isithreadcontainer.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/inc/isithreadcontainer.h Tue Oct 19 13:16:20 2010 +0300 @@ -18,10 +18,10 @@ #ifndef __ISITHREADCONTAINER_H__ #define __ISITHREADCONTAINER_H__ -#include "misichannelrouterif.h" // For MISIChannelRouterIf +#include "misiobjectrouterif.h" // For MISIObjectRouterIf -const TUint8 KAmountOfKernelThreads( 5 ); -const TUint8 KAmountOfUserThreads( 5 ); +const TUint8 KAmountOfKernelThreads( 1 ); +const TUint8 KAmountOfUserThreads( 1 ); NONSHARABLE_CLASS( DISIThreadContainer ) : public DBase { @@ -31,14 +31,14 @@ DISIThreadContainer(); ~DISIThreadContainer(); - TDfcQue* AllocateThread( const MISIChannelRouterIf::TISIDfcQThreadType aType ); + TDfcQue* AllocateThread( const MISIObjectRouterIf::TISIDfcQThreadType aType ); void DeallocateThread( TDfcQue* ); TDfcQue* ReserveKernelThread(); TDfcQue* ReserveUserThread(); private: - + // synch // Owned TDfcQue* iKClientDfcQueList[ KAmountOfKernelThreads ]; TDfcQue* iUClientDfcQueList[ KAmountOfUserThreads ]; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/inc/isiuserchannel.h --- a/connectivitylayer/isce/isirouter_dll/inc/isiuserchannel.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/inc/isiuserchannel.h Tue Oct 19 13:16:20 2010 +0300 @@ -22,17 +22,17 @@ // Includes #include // For DLogicalChannel -#include "misirouterchannelif.h" // For MISIRouterChannelIf +#include "misirouterobjectif.h" // For MISIRouterObjectIf #include "isiinternaldefs.h" // For TISIAsyncRequest // Forward declaration class DISIMsgQueue; -class MISIChannelRouterIf; +class MISIObjectRouterIf; /** * Provides channel for user side ISI API */ -NONSHARABLE_CLASS( DISIUserChannel ) : public DLogicalChannel, public MISIRouterChannelIf +NONSHARABLE_CLASS( DISIUserChannel ) : public DLogicalChannel, public MISIRouterObjectIf { public: @@ -74,19 +74,19 @@ ///// Functions from base class DLogicalChannel end - ///// Functions from MISIRouterChannelIf start + ///// Functions from MISIRouterObjectIf start /** - * See comments from MISIRouterChannelIf. + * See comments from MISIRouterObjectIf. */ void EnqueChannelRequestCompleteDfc( TInt aRequest, TInt aStatusToComplete ); /* - * See comments from MISIRouterChannelIf. + * See comments from MISIRouterObjectIf. */ - void ReceiveMsg( const TDesC8& aMessage ); + void Receive( const TDesC8& aMessage ); - ///// Functions from MISIRouterChannelIf end + ///// Functions from MISIRouterObjectIf end private: @@ -206,7 +206,7 @@ // Not owned, no need to guard open/close in one thread in construction and desctruction. DThread* iThread; // Not owned, no need to guard only written in one thread in construction and desctruction. - MISIChannelRouterIf* iRouterIf; + MISIObjectRouterIf* iRouterIf; // Pointers to client message buffer, not owned TAny* iReceiveBufPtr; // not owned diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/inc/misiif.h --- a/connectivitylayer/isce/isirouter_dll/inc/misiif.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/inc/misiif.h Tue Oct 19 13:16:20 2010 +0300 @@ -84,7 +84,7 @@ * Blocking: No * Panic mode: Kernel: Kern::Fault, User: User::Panic * SMP safe: Yes - * @param aUID, clients unique UID identifier. + * @param aUID, clients unique UID identifier. TODO: Symbian UID * @param aObjId, reference to write clients object id. * @return pointer to new interface. * @pre Called always in thread context (Kernel: in kernel thread context). diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/inc/misilinkrouterif.h --- a/connectivitylayer/isce/isirouter_dll/inc/misilinkrouterif.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/inc/misilinkrouterif.h Tue Oct 19 13:16:20 2010 +0300 @@ -31,12 +31,27 @@ public: /* + * Route ISI messages + * @param aMsg, message to be routed + * TODO: + * @return Error value + */ + virtual TInt RouteISIMessage( TDes8& aMsg, TBool aDynamicSenderCheckNeeded ) = 0; + + /* * Receive message from link. * Called without FM held. * @param aMsg, message to be received * @return Error value */ - virtual TInt RouteISIMessage( TDes8& aMsg ) = 0; + virtual void ReceiveISIMessage( const TDesC8& aMessage, const TUint8 aTrxId ) = 0; + + /* + * Called with FM held. + * NOTE! restrictions when used with FM held. + */ + virtual void StateChanged() = 0; + }; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/inc/misirouterlinkif.h --- a/connectivitylayer/isce/isirouter_dll/inc/misirouterlinkif.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/inc/misirouterlinkif.h Tue Oct 19 13:16:20 2010 +0300 @@ -51,6 +51,16 @@ */ virtual TBool Send( TDes8& aMsg ) = 0; + /* + * Ask state of the link. + * Called with FM held, no blocking nor trace etc.. + * @return ETrue if connected, EFalse if disconnected + */ + virtual TBool StateConnected() = 0; + + // add comments + virtual TUint8 GetTrxId() = 0; + }; #endif /* __ISIROUTERLINKIF_H__ */ diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/src/isicltransceiver.cpp --- a/connectivitylayer/isce/isirouter_dll/src/isicltransceiver.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/src/isicltransceiver.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -17,151 +17,449 @@ -#include // For Kern -#include "isirouter.h" // For DISIRouter -#include "isiroutertrace.h" // For C_TRACE, ASSERT_RESET.. and fault codes -#include "misirouterlinkif.h" // For MISIRouterLinkIf -#include "isihelpers.h" // For GET_SENDER_DEV... -#include "memapi.h" // For MemApi -#include // For ETrxTest... -#include "isicltransceiver.h" // For DISICLTransceiver -#include // For PN_NAMESERVICE... TODO:Remove this +#include // For Kern +#include // For PN_OBJ_ROUTING_REQ +#include // For ISI_HEADER_OFFSET_... +#include // For COMMON_ISA_... -#define PN_MEDIA_TEST 0xBB //not real -//#define PN_DEV_MODEM 0x12 -#define PN_DEV_DUMMYIST 0x13 -#define PN_DEV_OWN 0x6C - -// CONSTS -DISICLTransceiver* DISICLTransceiver::iThisPtr = NULL; - +#include "isirouter.h" // For DISIRouter +#include "isiroutertrace.h" // For C_TRACE, ASSERT_RESET.. and fault codes +#include "misirouterlinkif.h" // For MISIRouterLinkIf +#include "isihelpers.h" // For GET_SENDER_DEV... +#include "memapi.h" // For MemApi +#include // For ETrxTest... +#include "isicltransceiver.h" // For DISICLTransceiver +#include // For PN_NAMESERVICE... +#include "isirouterservice.h" // For DIsiRouterService +#include "isimsgqueue.h" // For DISIMsgQueue +#include "iscnokiadefinitions.h" // For EIscNokiaUsbPhonetLink +#ifdef USE_MEDIAAPI +#include // For PN_DEV_PC +#endif /* USE_MEDIAAPI */ // Faults enum TISICLTransceiverFaults { EISICLTransceiverMemAllocFailure = 0x01, EISICLTransceiverMemAllocFailure1, + EISICLTransceiverMemAllocFailure2, + EISICLTransceiverMemAllocFailure3, + EISICLTransceiverMemAllocFailure4, + EISICLTransceiverMemAllocFailure5, + EISICLTransceiverMemAllocFailure6, + EISICLTransceiverMemAllocFailure7, + EISICLTransceiverMemAllocFailure8, +#ifdef USE_MEDIAAPI + EISICLTransceiverMemAllocFailure9, + EISICLTransceiverMemAllocFailure10, +#endif /* USE_MEDIAAPI */ EISICLTransceiverNotSupportedMedia, EISICLTransceiverOverTheLimits, EISICLTransceiverNULLPtr, + EISICLTransceiverNULLPtr2, + EISICLTransceiverNULLPtr3, + EISICLTransceiverNULLPtr4, + EISICLTransceiverNULLPtr5, + EISICLTransceiverNULLPtr6, + EISICLTransceiverNULLPtr7, EISICLTransceiverNotSupportedDevice, + EISICLTransceiverDeviceConnection, + EISICLTransceiverCommIsaEntityNotReachableResp, + EISICLTransceiverNotThreadContext, + EISICLTransceiverMutexCreateFailed, + EISICLTransceiverMutexWaitFailed, + EISICLTransceiverMutexWaitFailed2, }; -DISICLTransceiver::DISICLTransceiver( DISIRouter* aPtr ) - : iRouter( aPtr ) +// Constants +const TInt KDfcPriority( 5 ); + +DMutex* DISICLTransceiver::iDynamicDeviceTableMutex = NULL; +_LIT8( KISICLTransceiverMutex, "ISICLTransceiverMutex" ); + +DISICLTransceiver::DISICLTransceiver( + DISIRouter& aRouter, + TDfcQue* aThreadPtr + ) + : iShRouter( aRouter ) { C_TRACE( ( _T( "DISICLTransceiver::DISICLTransceiver>" ) ) ); - iLinksArray = new MISIRouterLinkIf*[ EISIAmountOfMedias ]; - ASSERT_RESET_ALWAYS( iLinksArray, ( EISICLTransceiverMemAllocFailure | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); - // Initialize links - for( TInt i( 0 ); i < EISIAmountOfMedias; i++ ) - { - iLinksArray[ i ] = NULL; - } - //TODO add real media and trx when known - iLinksArray[ EISIMediaTest ] = MISIRouterLinkIf::CreateLinkF( this, PN_MEDIA_TEST, ETrxTest ); + ASSERT_RESET_ALWAYS( aThreadPtr, ( EISICLTransceiverNULLPtr7 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + iShStateChangedDfc = new TDfc( StateChangedDfc, this, aThreadPtr, KDfcPriority ); + ASSERT_RESET_ALWAYS( iShStateChangedDfc, ( EISICLTransceiverMemAllocFailure6 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + + iRxQueueDfc = new TDfc( RxQueueDfc, this, aThreadPtr, KDfcPriority ); + ASSERT_RESET_ALWAYS( iShStateChangedDfc, ( EISICLTransceiverMemAllocFailure8 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + + DISIDevice* dev = new DISIDevice( PN_DEV_MODEM, + MISIRouterLinkIf::CreateLinkF( this, PN_MEDIA_MODEM_HOST_IF, ETrxSharedMemory) + ); + ASSERT_RESET_ALWAYS( dev, ( EISICLTransceiverMemAllocFailure3 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + iShDevices.Append( dev ); +#ifdef USE_MEDIAAPI + DISIDevice* dev2 = new DISIDevice( PN_DEV_PC, // append to dynamic table if needed + MISIRouterLinkIf::CreateLinkF( this, PN_MEDIA_USB, ETrxUSB ) + ); + ASSERT_RESET_ALWAYS( dev2, ( EISICLTransceiverMemAllocFailure9 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + iShDevices.Append( dev2 ); + + DISIDevice* dev4 = new DISIDevice( PN_DEV_PC, // append to dynamic table if needed + MISIRouterLinkIf::CreateLinkF( this, PN_MEDIA_BT, ETrxBT ) + ); + ASSERT_RESET_ALWAYS( dev4, ( EISICLTransceiverMemAllocFailure10 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + iShDevices.Append( dev4 ); + #endif /* USE_MEDIAAPI */ + DISIDevice* dev3 = new DISIDevice( PN_DEV_DUMMYIST, + MISIRouterLinkIf::CreateLinkF( this, PN_MEDIA_TEST, ETrxTest ) + ); + ASSERT_RESET_ALWAYS( dev3, ( EISICLTransceiverMemAllocFailure5 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + iShDevices.Append( dev3 ); + + iRouterService = new DIsiRouterService( *this ); + ASSERT_RESET_ALWAYS( iRouterService, ( EISICLTransceiverMemAllocFailure2 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + + iRxQueue = new DISIMsgQueue( KISIMainRxQueueSize ); + ASSERT_RESET_ALWAYS( iRxQueue, ( EISICLTransceiverMemAllocFailure7 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + + TInt err( Kern::MutexCreate( iDynamicDeviceTableMutex, KISICLTransceiverMutex, KMutexOrdGeneral0 ) ); + ASSERT_RESET_ALWAYS( ( KErrNone == err ), ( EISICLTransceiverMutexCreateFailed | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); +#ifdef USE_MEDIAAPI + iDevPcLastSendTrxId = EAmountOfTrxs; //put a maxvalue + iDevPcLastActiveTrxId = EAmountOfTrxs; //put a maxvalue +#endif /* USE_MEDIAAPI */ C_TRACE( ( _T( "DISICLTransceiver::DISICLTransceiver<" ) ) ); } DISICLTransceiver::~DISICLTransceiver() { C_TRACE( ( _T( "DISICLTransceiver::~DISICLTransceiver>" ) ) ); - for( TUint8 i( 0 ); i < EISIAmountOfMedias; i++ ) + + iShDevices.ResetAndDestroy(); + + if ( iRouterService ) + { + delete iRouterService; + iRouterService = NULL; + } + + if ( iShStateChangedDfc ) + { + iShStateChangedDfc->Cancel(); + delete iShStateChangedDfc; + iShStateChangedDfc = NULL; + } + + if( iRxQueue ) { - MISIRouterLinkIf* tmp = iLinksArray[ i ]; - if( tmp ) + C_TRACE( ( _T( "DISICLTransceiver::ResetQueues 0x%x iRxQueue 0x%x" ), this, iRxQueue ) ); + while( iRxQueue->Count() ) { - tmp->Release(); - tmp = NULL; - iLinksArray[ i ] = NULL; + MemApi::DeallocBlock( iRxQueue->Get() ); } } - delete []iLinksArray; + + if( iRxQueueDfc ) + { + C_TRACE( ( _T( "DISIUserChannel::~DISIUserChannel 0x%x iRxQueueDfc 0x%x" ), this, iRxQueueDfc ) ); + iRxQueueDfc->Cancel(); + delete iRxQueueDfc; + iRxQueueDfc = NULL; + } + C_TRACE( ( _T( "DISICLTransceiver::~DISICLTransceiver<" ) ) ); + + } + +TInt DISICLTransceiver::SendCommIsaEntityNotReachableResp( + TDes8& aNotDeliveredMessage + ) + { + C_TRACE( ( _T( "DISICLTransceiver::SendCommIsaEntityNotReachableResp 0x%x>" ), &aNotDeliveredMessage ) ); + const TUint8* notDeliveredMsgPtr( aNotDeliveredMessage.Ptr() ); + TInt error = KErrAlreadyExists; + // Avoid COMM_ISA_ENTITY_NOT_REACHABLE_RESP loop. + if( ( notDeliveredMsgPtr[ ISI_HEADER_OFFSET_MESSAGEID ] == COMMON_MESSAGE ) && + ( ( notDeliveredMsgPtr[ ISI_HEADER_OFFSET_SUBMESSAGEID ] == COMM_ISA_ENTITY_NOT_REACHABLE_RESP ) || + ( notDeliveredMsgPtr[ ISI_HEADER_OFFSET_SUBMESSAGEID ] == COMM_SERVICE_NOT_IDENTIFIED_RESP ) ) ) + { + C_TRACE( ( _T( "DISICLTransceiver Not sending another CommIsaEntityNotReachableResp 0x%x 0x%x" ), &aNotDeliveredMessage, notDeliveredMsgPtr[ ISI_HEADER_OFFSET_SUBMESSAGEID ] ) ); + } + else + { + // Follows COMM specification: 000.031 + TUint8 length( ISI_HEADER_SIZE + SIZE_COMMON_MESSAGE_COMM_ISA_ENTITY_NOT_REACHABLE_RESP ); + TDes8& respMsg = MemApi::AllocBlock( length ); + ASSERT_RESET_ALWAYS( length > ISI_HEADER_OFFSET_MESSAGEID, ( EISICLTransceiverOverTheLimits | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + TUint8* respMsgPtr = const_cast( respMsg.Ptr() ); + // We start to append from transaction id. + respMsg.SetLength( ISI_HEADER_OFFSET_TRANSID ); + // Get the header until messageid from prev. message. + // Just turn receiver and sender device and object vice versa. + respMsgPtr[ ISI_HEADER_OFFSET_MEDIA ] = notDeliveredMsgPtr[ ISI_HEADER_OFFSET_MEDIA ]; + SET_RECEIVER_DEV( respMsgPtr, GET_SENDER_DEV( aNotDeliveredMessage ) ); + SET_SENDER_DEV ( respMsgPtr, GET_RECEIVER_DEV( aNotDeliveredMessage ) ); + respMsgPtr[ ISI_HEADER_OFFSET_RESOURCEID ] = notDeliveredMsgPtr[ ISI_HEADER_OFFSET_RESOURCEID ]; + SET_LENGTH( respMsgPtr, ( length - PN_HEADER_SIZE ) ); + SET_RECEIVER_OBJ( respMsgPtr, GET_SENDER_OBJ( aNotDeliveredMessage ) ); + SET_SENDER_OBJ( respMsgPtr, GET_RECEIVER_OBJ( aNotDeliveredMessage ) ); + // Set from undelivered message + respMsg.Append( notDeliveredMsgPtr[ ISI_HEADER_OFFSET_TRANSID ] ); + // Message Identifier + respMsg.Append( COMMON_MESSAGE ); + // Sub message Identifier. + respMsg.Append( COMM_ISA_ENTITY_NOT_REACHABLE_RESP ); + // Not Delivered Message from original message. + respMsg.Append( notDeliveredMsgPtr[ ISI_HEADER_OFFSET_MESSAGEID ] ); + // Status + respMsg.Append( COMM_ISA_ENTITY_NOT_AVAILABLE );// different status in a case of device not existing + // Filler + const TUint8 KFiller( 0x00 ); + respMsg.Append( KFiller ); + // Filler + respMsg.Append( KFiller ); + // Filler + respMsg.Append( KFiller ); + error = RouteISIMessage( respMsg, EFalse ); + // Programming error in this function if below assert is raised + ASSERT_RESET_ALWAYS( KErrNone == error, ( EISICLTransceiverCommIsaEntityNotReachableResp | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + } + MemApi::DeallocBlock( aNotDeliveredMessage ); + C_TRACE( ( _T( "DISICLTransceiver::SendCommIsaEntityNotReachableResp 0x%x<" ), &aNotDeliveredMessage ) ); + return error; + } -TInt DISICLTransceiver::SendCommIsaEntityNotReachableResp( TDes8& aMessage ) +// This is called in 1...N thread contextes +void DISICLTransceiver::ReceiveISIMessage( + const TDesC8& aMessage, + const TUint8 aTrxId + ) { - C_TRACE( ( _T( "DISICLTransceiver::SendCommIsaEntityNotReachableResp 0x%x>" ), &aMessage ) ); - const TUint8* msgTmpPtr( aMessage.Ptr() ); - TInt error = KErrAlreadyExists; + C_TRACE( ( _T( "DISICLTransceiver::ReceiveMsg 0x%x 0x%x 0x%x>" ), this, &aMessage, aTrxId ) ); + // Can only be called from thread context. + ASSERT_THREAD_CONTEXT_ALWAYS( ( EISICLTransceiverNotThreadContext | EDISIUserChannelTraceId << KClassIdentifierShift ) ); + + TUint8 txDevId = GET_SENDER_DEV( aMessage.Ptr() ); + if ( DynamicDevice( txDevId ) ) + { + TUint8 staticDevId(0); + const TInt count( iShDevices.Count() ); + TInt index(0); + TBool staticDeviceFound(EFalse); + MISIRouterLinkIf* Link = NULL; + while( !staticDeviceFound && ( index < count ) ) + { + C_TRACE( ( _T( "DISICLTransceiver::ReceiveMsg find static device for trx 0x%x index %d" ), aTrxId, index ) ); + DISIDevice* tmpDevice = iShDevices[ index ]; + ASSERT_RESET_ALWAYS( tmpDevice, ( EISICLTransceiverNULLPtr4 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + tmpDevice->LockDeviceFM(); + Link = tmpDevice->GetLink(); + if( Link->GetTrxId() == aTrxId ) + { + staticDevId = tmpDevice->GetDeviceIdentifier(); + tmpDevice->FreeDeviceFM(); + C_TRACE( ( _T( "DISICLTransceiver::ReceiveMsg static device 0x%x trx 0x%x" ), this, &aMessage, aTrxId ) ); + staticDeviceFound = ETrue; + } + else + { + tmpDevice->FreeDeviceFM(); + } + index++; + } +#ifdef USE_MEDIAAPI + if ( PN_DEV_PC == GET_SENDER_DEV( aMessage.Ptr() )) + { + C_TRACE( ( _T( "DISICLTransceiver::ReceiveMsg 0x%x 0x%x trx id = %d<" ), this, &aMessage, (Link->GetTrxId()) ) ); + iDevPcLastActiveTrxId = iDevPcLastSendTrxId; + iDevPcLastSendTrxId = Link->GetTrxId(); + } +#endif /* USE_MEDIAAPI */ + UpdateDynamicDeviceTable( txDevId, staticDevId ); + } + // else static device. No need to save trxId - // To avoid COMM_ISA_ENTITY_NOT_REACHABLE_RESP loop - if( msgTmpPtr[ ISI_HEADER_OFFSET_MESSAGEID ] != COMMON_MESSAGE && - msgTmpPtr[ ISI_HEADER_OFFSET_SUBMESSAGEID ] != COMM_ISA_ENTITY_NOT_REACHABLE_RESP ) + iRxQueue->Add( aMessage ); + iRxQueueDfc->Enque(); + C_TRACE( ( _T( "DISICLTransceiver::ReceiveMsg 0x%x 0x%x 0x%x<" ), this, &aMessage, aTrxId ) ); + } + +void DISICLTransceiver::RxQueueDfc( + TAny* aPtr // Pointer to this object. + ) + { + C_TRACE( ( _T( "DISICLTransceiver::RxQueueDfc ->" ) ) ); + + DISICLTransceiver& tmp = *reinterpret_cast( aPtr ); + if( tmp.iRxQueue->Count() > 0 ) + { + TDes8& msg( tmp.iRxQueue->Get() ); + + tmp.RouteISIMessage( msg, EFalse ); + // Check here too to avoid unnecessary dfc queuing. + if( tmp.iRxQueue->Count() > 0 ) + { + C_TRACE( ( _T( "DISICLTransceiver::RxQueueDfc enque RxQueueDfc" ) ) ); + tmp.iRxQueueDfc->Enque(); + } + } + C_TRACE( ( _T( "DISICLTransceiver::RxQueueDfc <-" ) ) ); + } + + +TInt DISICLTransceiver::RouteISIMessage( + TDes8& aMessage, + TBool aDynamicSenderCheckNeeded + ) + { + C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage 0x%x 0x%x> len %d" ), &aMessage, aDynamicSenderCheckNeeded, aMessage.Length() ) ); + const TUint8* msgPtr = aMessage.Ptr(); + ISIMESSAGE_TRACE( aMessage ); + TInt error( ValidateISIMessage( aMessage ) ); + if( KErrNone != error ) + { + TRACE_ASSERT_ALWAYS; + C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage invalid message 0x%x" ), &aMessage ) ); + MemApi::DeallocBlock( aMessage ); + } + else { - // Make channel opening request followinfg COMM specification: 000.026 - // Length is sixteen bytes. - TUint8 length( 16 ); - TDes8& tempPtr = MemApi::AllocBlock( ISI_HEADER_SIZE + SIZE_COMMON_MESSAGE_COMM_ISA_ENTITY_NOT_REACHABLE_RESP ); - ASSERT_RESET_ALWAYS( &tempPtr, ( EISICLTransceiverMemAllocFailure1 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); - ASSERT_RESET_ALWAYS( ISI_HEADER_SIZE + SIZE_COMMON_MESSAGE_COMM_ISA_ENTITY_NOT_REACHABLE_RESP > ISI_HEADER_OFFSET_MESSAGEID, ( EISICLTransceiverOverTheLimits | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); - TUint8* ptr = const_cast( tempPtr.Ptr() ); - // We start to append from transaction id. - tempPtr.SetLength( ISI_HEADER_OFFSET_TRANSID ); - // Get the header until messageid from prev. message. - // Just turn receiver and sender device and object vice versa. - ptr[ ISI_HEADER_OFFSET_MEDIA ] = msgTmpPtr[ ISI_HEADER_OFFSET_MEDIA ]; - SET_RECEIVER_DEV( ptr, GET_SENDER_DEV( aMessage ) ); - SET_SENDER_DEV ( ptr, GET_RECEIVER_DEV( aMessage ) ); - ptr[ ISI_HEADER_OFFSET_RESOURCEID ] = msgTmpPtr[ ISI_HEADER_OFFSET_RESOURCEID ]; - SET_LENGTH( ptr, length - PN_HEADER_SIZE ); - SET_RECEIVER_OBJ( ptr, GET_SENDER_OBJ( aMessage ) ); - SET_SENDER_OBJ( ptr, GET_RECEIVER_OBJ( aMessage ) ); - // Transactionid. Set to 0x01 since this is the first. - tempPtr.Append( msgTmpPtr[ ISI_HEADER_OFFSET_TRANSID ] ); - // Message ID - tempPtr.Append( ISI_HEADER_OFFSET_MESSAGEID ); - // Sub message ID. - tempPtr.Append( COMM_ISA_ENTITY_NOT_REACHABLE_RESP ); - // Not Delivered Message from original req. - tempPtr.Append( msgTmpPtr[ ISI_HEADER_OFFSET_MESSAGEID ] ); - // Status - COMM_ISA_ENTITY_NOT_AVAILABLE - tempPtr.Append( 0x00 ); - // Filler - tempPtr.Append( 0x00 ); - // Filler - tempPtr.Append( 0x00 ); - // Filler - tempPtr.Append( 0x00 ); - error = RouteISIMessage( tempPtr ); - } - else - { - C_TRACE( ( _T( "DISICLTransceiver Not sending another CommIsaEntityNotReachableResp" ) ) ); - } - C_TRACE( ( _T( "DISICLTransceiver::SendCommIsaEntityNotReachableResp 0x%x<" ), &aMessage ) ); + TBool sendOk( EFalse ); + if ( aDynamicSenderCheckNeeded )// Save dynamic device ids from PN_DEV_OWN + { + C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage from ISI Router" ) ) ); + TUint8 txDeviceIdentifier = GET_SENDER_DEV( aMessage ); + if ( DynamicDevice( txDeviceIdentifier ) ) + { + C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage from ISI Router Dynamic Dev" ) ) ); + UpdateDynamicDeviceTable( txDeviceIdentifier, PN_DEV_OWN ); +#ifndef USE_MEDIAAPI + ASSERT_RESET_ALWAYS( txDeviceIdentifier == PN_DEV_PC, 0xdeaddead );// only supported PN_DEV_PC with EIscNokiaUsbPhonetLink +#endif /* USE_MEDIAAPI */ + } + } + + TUint8 rxDeviceIdentifier = GET_RECEIVER_DEV( aMessage ); + C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage rxDeviceIdentifier 0x%x" ), rxDeviceIdentifier ) ); + + if ( DynamicDevice( rxDeviceIdentifier ) ) + { + DynamicToStaticDevice( rxDeviceIdentifier ); + C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage rxDeviceIdentifier after 0x%x" ), rxDeviceIdentifier ) ); + } + + + if( rxDeviceIdentifier == PN_DEV_OWN ) + { + C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage PN_DEV_OWN 0x%x" ), &aMessage ) ); + TUint16 objId(0xffff); +#ifndef USE_MEDIAAPI + if ( GET_RECEIVER_DEV( aMessage ) == PN_DEV_PC ) + { + C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage to PN_DEV_PC in PN_DEV_OWN" )) ); + objId = EIscNokiaUsbPhonetLink; + } + else + { + objId = GET_RECEIVER_OBJ( aMessage ); + } +#endif /* USE_MEDIAAPI */ +#ifdef USE_MEDIAAPI + objId = GET_RECEIVER_OBJ( aMessage ); +#endif /* USE_MEDIAAPI */ + sendOk = iShRouter.Receive( aMessage, objId ); + C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage PN_DEV_OWN 0x%x ok %d" ), &aMessage, sendOk ) ); + } + else + { + C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage Not PN_DEV_OWN 0x%x" ), &aMessage ) ); + MISIRouterLinkIf* link = NULL; + + + const TInt count( iShDevices.Count() ); + for( TInt index( 0 ); index < count; index++ ) + { + DISIDevice* tmpDevice = iShDevices[ index ]; + ASSERT_RESET_ALWAYS( tmpDevice, ( EISICLTransceiverNULLPtr4 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + tmpDevice->LockDeviceFM(); + if( tmpDevice->GetDeviceIdentifier() == rxDeviceIdentifier ) + { + link = tmpDevice->GetLink(); + tmpDevice->FreeDeviceFM(); +#ifndef USE_MEDIAAPI + sendOk = link->Send( aMessage ); + break; +#endif /* USE_MEDIAAPI */ +#ifdef USE_MEDIAAPI + if ( GET_RECEIVER_DEV( aMessage ) == PN_DEV_PC ) + { + C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage PN_DEV_PC %d, %d" ), link->GetTrxId(), iDevPcLastSendTrxId ) ); + if(iDevPcLastSendTrxId < EAmountOfTrxs) + { + if ( link->GetTrxId() == iDevPcLastSendTrxId ) + { + if (link->StateConnected()) + { + C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage PN_DEV_PC %d, Msg mediaid 0x%x" ), link->GetTrxId(), msgPtr[ ISI_HEADER_OFFSET_MEDIA ] ) ); + sendOk = link->Send( aMessage ); + break; + } + } + } + else + { + break; + } + } + else + { + sendOk = link->Send( aMessage ); + break; + } +#endif /* USE_MEDIAAPI */ + } + else + { + tmpDevice->FreeDeviceFM(); + } + } + C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage Not PN_DEV_OWN ok %d" ), &aMessage, sendOk ) ); + } + if( !sendOk ) + { + TRACE_ASSERT_ALWAYS; + error = SendCommIsaEntityNotReachableResp( aMessage ); + } + } + C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage 0x%x<" ), &aMessage ) ); return error; } -TInt DISICLTransceiver::RouteISIMessage( TDes8& aMessage ) +void DISICLTransceiver::GetDeviceConnectionStates( + RArray& aDeviceIdentifierList, + const TBool aConnectedDevice + ) { - C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage 0x%x>" ), &aMessage ) ); - TInt error( ValidateISIMessage( aMessage ) ); - TBool sendOk( EFalse ); - if(GET_RECEIVER_DEV( aMessage ) == PN_DEV_OWN ) - { - C_TRACE( ( _T( "DISIRouter msg to PN_DEV_APE" ) ) ); - sendOk = iRouter->Receive( aMessage, GET_RECEIVER_OBJ( aMessage ) ); - C_TRACE( ( _T( "DISIRouter router sendOk %d" ), sendOk ) ); - } - else + C_TRACE( ( _T( "DISICLTransceiver::GetDeviceConnectionStates 0x%x 0x%x>" ), &aDeviceIdentifierList, aConnectedDevice ) ); + + const TInt count( iShDevices.Count() ); + for( TInt index( 0 ); index < count; index++ ) { - C_TRACE( ( _T( "DISIRouter msg to other device" ) ) ); - TUint8 linkId = MapDeviceToMedia( GET_RECEIVER_DEV( aMessage ) ); - ASSERT_RESET_ALWAYS( linkId < EISIAmountOfMedias, ( EISICLTransceiverNotSupportedMedia | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); - MISIRouterLinkIf* link = iLinksArray[ linkId ]; - ASSERT_RESET_ALWAYS( link, ( EISICLTransceiverNULLPtr | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); - sendOk = link->Send( aMessage ); - C_TRACE( ( _T( "DISIRouter link sendOk %d" ), sendOk ) ); - } - if( !sendOk ) - { - SendCommIsaEntityNotReachableResp( aMessage ); - MemApi::DeallocBlock( aMessage ); + DISIDevice* tmpDevice = iShDevices[ index ]; + ASSERT_RESET_ALWAYS( tmpDevice, ( EISICLTransceiverNULLPtr3 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + tmpDevice->LockDeviceFM(); + if( tmpDevice->GetDeviceState() == aConnectedDevice ) + { + const TUint8 deviceIdentifier( tmpDevice->GetDeviceIdentifier() ); + tmpDevice->FreeDeviceFM(); + aDeviceIdentifierList.Append( deviceIdentifier ); + } + else + { + tmpDevice->FreeDeviceFM(); + } } - C_TRACE( ( _T( "DISICLTransceiver::RouteISIMessage 0x%x<" ), &aMessage ) ); - return error; + C_TRACE( ( _T( "DISICLTransceiver::GetDeviceConnectionStates 0x%x 0x%x<" ), &aDeviceIdentifierList, aConnectedDevice ) ); } // KErrBadDescriptor, if message length too small @@ -171,6 +469,7 @@ TDes8& aMessage ) { + C_TRACE( ( _T( "DISICLTransceiver::ValidateISIMessage 0x%x>" ), &aMessage ) ); const TUint16 descLength( aMessage.Length() ); TInt msgOk( KErrNone ); @@ -188,40 +487,217 @@ // If the ISI message length with PN_HEADER_SIZE is less or equal than ISI_HEADER_OFFSET_MESSAGEID. msgOk = ( ( msgOk == KErrNone && isiMsgLength <= ISI_HEADER_OFFSET_MESSAGEID ) ? KErrUnderflow : msgOk ); TRACE_ASSERT_INFO( msgOk == KErrNone, msgOk ); - TRACE_ASSERT_INFO( msgOk == KErrNone, msgOk ); TRACE_ASSERT_INFO( msgOk == KErrNone, isiMsgLength ); TRACE_ASSERT_INFO( msgOk == KErrNone, descLength ); - TRACE_ASSERT_INFO( msgOk == KErrNone, msgOk ); C_TRACE( ( _T( "DISICLTransceiver::ValidateISIMessage %d<" ), msgOk ) ); return msgOk; } -TUint8 DISICLTransceiver::MapDeviceToMedia( - const TUint8 aDevice +// NOTE!! Called with FM held. Not allowed to block or nothing. Not even print traces! +// Called in N Thread context +void DISICLTransceiver::StateChanged( + // None + ) + { + + iShStateChangedDfc->Enque(); + + } + +void DISICLTransceiver::StateChangedDfc( + TAny* aPtr + ) + { + C_TRACE( ( _T( "DISICLTransceiver::StateChangedDfc>" ) ) ); + DISICLTransceiver* self = reinterpret_cast( aPtr ); + ASSERT_RESET_ALWAYS( self, ( EISICLTransceiverNULLPtr5 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + self->ReadStateChanges(); + C_TRACE( ( _T( "DISICLTransceiver::StateChangedDfc<" ) ) ); + } + +void DISICLTransceiver::ReadStateChanges( + // None ) { - C_TRACE( ( _T( "DISICLTransceiver::MapDeviceToMedia aDevice %d>" ), aDevice ) ); - TUint8 media( KErrNone ); - switch( aDevice ) + + C_TRACE( ( _T( "DISICLTransceiver::ReadStateChanges>" ) ) ); + + const TInt count( iShDevices.Count() ); + for( TInt index( 0 ); index < count; index++ ) { - case PN_DEV_MODEM: + DISIDevice* tmpDevice = iShDevices[ index ]; + ASSERT_RESET_ALWAYS( tmpDevice, ( EISICLTransceiverNULLPtr6 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + tmpDevice->LockDeviceFM(); + const TBool connected = tmpDevice->GetDeviceState();// tee paremmaksi + +#ifdef USE_MEDIAAPI + MISIRouterLinkIf* link = NULL; + link = tmpDevice->GetLink(); +#endif /* USE_MEDIAAPI */ + if( connected != tmpDevice->GetDeviceOldState() ) { - media = EISIMediaSharedMemory; + tmpDevice->SetDeviceOldState( connected ); + const TUint8 deviceIdentifier = tmpDevice->GetDeviceIdentifier(); + tmpDevice->FreeDeviceFM(); +#ifdef USE_MEDIAAPI + C_TRACE( ( _T( "DISICLTransceiver::ReadStateChanges trxid 0x%x state changed>" ),link->GetTrxId() ) ); + if( (link->GetTrxId() == iDevPcLastSendTrxId) && (!connected) ) + { + C_TRACE( ( _T( "DISICLTransceiver::ReadStateChanges trxid 0x%x disconneted>" ),link->GetTrxId() ) ); + iDevPcLastSendTrxId = iDevPcLastActiveTrxId; + iDevPcLastActiveTrxId = EAmountOfTrxs; //put a maxvalue + } +#endif /* USE_MEDIAAPI */ + iRouterService->SendDeviceConnectionStateChangedInd( connected, deviceIdentifier ); + } + else + { + tmpDevice->FreeDeviceFM(); + } + } + C_TRACE( ( _T( "DISICLTransceiver::ReadStateChanges<" ) ) ); + } + +TBool DISICLTransceiver::DynamicDevice( const TUint8 aDevId ) + { + C_TRACE( ( _T( "DISICLTransceiver::DynamicDevice 0x%x>" ), aDevId ) ); + TBool dynamicDevice(EFalse); + switch( aDevId ) + { + case PN_DEV_MODEM: + case PN_DEV_DUMMYIST: + case PN_DEV_OWN: + { + //already set as EFalse break; } - case PN_DEV_DUMMYIST: - { - media = EISIMediaTest; - break; - } - // Not supported device default: { - ASSERT_RESET_ALWAYS( 0, ( EISICLTransceiverNotSupportedDevice | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + dynamicDevice = ETrue; break; } } - C_TRACE( ( _T( "DISICLTransceiver::MapDeviceToMedia media %d<" ), media ) ); - return media; + C_TRACE( ( _T( "DISICLTransceiver::DynamicDevice 0x%x<" ), dynamicDevice ) ); + return dynamicDevice; + } + +void DISICLTransceiver::UpdateDynamicDeviceTable( const TUint8 aDynamicDevId, const TUint8 aStaticDevId ) + { + C_TRACE( ( _T( "DISICLTransceiver::UpdateDynamicDeviceTable 0x%x 0x%x>" ), aDynamicDevId, aStaticDevId) ); + TBool deviceExist(EFalse); + TInt count(iDynamicDeviceTable.Count()); + TInt err( Kern::MutexWait( *iDynamicDeviceTableMutex ) ); + ASSERT_RESET_ALWAYS( ( err == KErrNone ), ( EISICLTransceiverMutexWaitFailed2 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + for( TUint8 i = 0; i < count; i++ ) + { + C_TRACE( ( _T( "DISICLTransceiver::UpdateDynamicDeviceTable find dynamic device %d" ), i) ); + if( iDynamicDeviceTable[ i ]->iDynamicDevId == aDynamicDevId ) + { + C_TRACE( ( _T( "DISICLTransceiver::UpdateDynamicDeviceTable dyn dev exist i = %d aDynamicDevId 0x%x staticDevId 0x%x previous 0x%x" ), i, iDynamicDeviceTable[ i ]->iDynamicDevId, aStaticDevId, iDynamicDeviceTable[ i ]->iStaticDevId ) ); + iDynamicDeviceTable[ i ]->iStaticDevId = aStaticDevId; + deviceExist = ETrue; + break; + } + } + + if ( !deviceExist ) + { + C_TRACE( ( _T( "DISICLTransceiver::UpdateDynamicDeviceTable new dynamic device added 0x%x 0x%x" ), aDynamicDevId, aStaticDevId ) ); + iDynamicDeviceTable.Append( new TDynamicDevice( aDynamicDevId, aStaticDevId ) ); + } + Kern::MutexSignal( *iDynamicDeviceTableMutex ); + C_TRACE( ( _T( "DISICLTransceiver::UpdateDynamicDeviceTable 0x%x 0x%x<" ), aDynamicDevId, aStaticDevId) ); } +void DISICLTransceiver::DynamicToStaticDevice( TUint8& aRxDev ) + { + C_TRACE( ( _T( "DISICLTransceiver::DynamicToStaticDevice aRxDev>" ), &aRxDev ) ); + TInt err( Kern::MutexWait( *iDynamicDeviceTableMutex ) ); + ASSERT_RESET_ALWAYS( ( err == KErrNone ), ( EISICLTransceiverMutexWaitFailed | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + for( TUint8 i = 0; i < iDynamicDeviceTable.Count(); i++ ) + { + if( iDynamicDeviceTable[ i ]->iDynamicDevId == aRxDev ) + { + C_TRACE( ( _T( "DISICLTransceiver::DynamicToStaticDevice dyn dev exist i = %d iDynamicDevId 0x%x iStaticDevId 0x%x" ), i, iDynamicDeviceTable[ i ]->iDynamicDevId, iDynamicDeviceTable[ i ]->iStaticDevId) ); + aRxDev = iDynamicDeviceTable[ i ]->iStaticDevId; + break; + } + } + Kern::MutexSignal( *iDynamicDeviceTableMutex ); + C_TRACE( ( _T( "DISICLTransceiver::DynamicToStaticDevice aRxDev<" ), &aRxDev ) ); + } + + +DISICLTransceiver::DISIDevice::DISIDevice( + const TUint8 aDeviceIdentifier, + MISIRouterLinkIf* aLink + ) + { + C_TRACE( ( _T( "DISICLTransceiver::DISIDevice::DISIDevice 0x%x 0x%x 0x%x>" ), aDeviceIdentifier, aLink ) ); + iShDeviceIdentifier = aDeviceIdentifier; + iShOldDeviceConnectedState = EFalse; + ASSERT_RESET_ALWAYS( aLink, ( EISICLTransceiverNULLPtr2 | EDISICLTransceiverTraceId << KClassIdentifierShift ) ); + iShLink = aLink; + iShDeviceMutex = new NFastMutex(); + ASSERT_RESET_ALWAYS( iShDeviceMutex, EISICLTransceiverNULLPtr6 | EDISICLTransceiverTraceId << KClassIdentifierShift ); + C_TRACE( ( _T( "DISICLTransceiver::DISIDevice::DISIDevice<" ) ) ); + } + +DISICLTransceiver::DISIDevice::~DISIDevice() + { + C_TRACE( ( _T( "DISICLTransceiver::DISIDevice::~DISIDevice>" ) ) ); + iShLink->Release(); + iShLink = NULL; + // If not exists faulted already. + delete iShDeviceMutex; + iShDeviceMutex = NULL; + C_TRACE( ( _T( "DISICLTransceiver::DISIDevice::~DISIDevice<" ) ) ); + } + +MISIRouterLinkIf* DISICLTransceiver::DISIDevice::GetLink() + { +// C_TRACE( ( _T( "DISICLTransceiver::DISIDevice::GetLink<> 0x%x" ), iShLink ) ); + return iShLink; + } + +TUint8 DISICLTransceiver::DISIDevice::GetDeviceIdentifier() + { +// C_TRACE( ( _T( "DISICLTransceiver::DISIDevice::GetDeviceIdentifier<> 0x%x" ), iShDeviceIdentifier ) ); + return iShDeviceIdentifier; + } + +TBool DISICLTransceiver::DISIDevice::GetDeviceState() + { +// C_TRACE( ( _T( "DISICLTransceiver::DISIDevice::GetDeviceState<>" ) ) ); + return iShLink->StateConnected(); + } + +TBool DISICLTransceiver::DISIDevice::GetDeviceOldState() + { +// C_TRACE( ( _T( "DISICLTransceiver::DISIDevice::GetDeviceOldState<> 0x%x" ), iShOldDeviceConnectedState ) ); + return iShOldDeviceConnectedState; + } + +void DISICLTransceiver::DISIDevice::SetDeviceOldState( + TBool aConnected + ) + { +// C_TRACE( ( _T( "DISICLTransceiver::DISIDevice::SetDeviceOldState<> 0x%x 0x%x" ), iShOldDeviceConnectedState, aConnected ) ); + iShOldDeviceConnectedState = aConnected; + } + +void DISICLTransceiver::DISIDevice::LockDeviceFM( + // None + ) + { + C_TRACE( ( _T( "DISICLTransceiver::DISIDevice::LockDeviceFM<>" ) ) ); + NKern::FMWait( iShDeviceMutex ); + } + +void DISICLTransceiver::DISIDevice::FreeDeviceFM( + // None + ) + { + NKern::FMSignal( iShDeviceMutex ); + C_TRACE( ( _T( "DISICLTransceiver::DISIDevice::FreeDeviceFM<>" ) ) ); + } diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/src/isiif.cpp --- a/connectivitylayer/isce/isirouter_dll/src/isiif.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/src/isiif.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -70,7 +70,7 @@ ASSERT_THREAD_CONTEXT_ALWAYS( ( EISIIfNotThreadContext | EDISIIfTraceId << KClassIdentifierShift ) ); iKernelChannel = new DISIKernelChannel( aObjId ); ASSERT_RESET_ALWAYS( iKernelChannel, ( EISIIfMemAllocFailure2 | EDISIIfTraceId << KClassIdentifierShift ) ); - TAny* params[ KTwoParams ]; //TODO should probably take process identifier into this to identify binary + TAny* params[ KTwoParams ]; // should probably take process identifier into this to identify binary params[ KFirstParam ] = reinterpret_cast( aUID ); params[ KSecondParam ] = reinterpret_cast( &aObjId ); // Get's the current thread's thread message. @@ -89,13 +89,15 @@ TThreadMessage& m = Kern::Message(); m.iValue = EISIDisconnect; m.iArg[ KFirstParam ] = NULL; - // Other asserts in kernel channel. - ASSERT_RESET_ALWAYS( ( KErrNone == iKernelChannel->HandleRequest( m ) ), ( EISIIfWrongResponseToRequest | EDISIIfTraceId << KClassIdentifierShift ) ); + if( iKernelChannel ) { + // Other asserts in kernel channel. + ASSERT_RESET_ALWAYS( ( KErrNone == iKernelChannel->HandleRequest( m ) ), ( EISIIfWrongResponseToRequest | EDISIIfTraceId << KClassIdentifierShift ) ); delete iKernelChannel; iKernelChannel = NULL; } + C_TRACE( ( _T( "DISIIf::~DISIIf 0x%x<" ), this ) ); } @@ -119,7 +121,7 @@ void DISIIf::DeallocateMsgBlock( TDes8& aMsgBlock ) { - C_TRACE( ( _T( "DISIIf::DeallocateMsgBlock 0x%x s %d>" ), this, &aMsgBlock ) ); + C_TRACE( ( _T( "DISIIf::DeallocateMsgBlock 0x%x s 0x%x>" ), this, &aMsgBlock ) ); TAny* params[ KOneParam ]; params[ KFirstParam ] = reinterpret_cast( &aMsgBlock ); // Get's the current thread's thread message. @@ -127,12 +129,12 @@ m.iValue = EISIDeallocateBlock; m.iArg[ KFirstParam ] = params; ASSERT_RESET_ALWAYS( ( KErrNone == iKernelChannel->HandleRequest( m ) ), ( EISIIfWrongResponseToRequest4 | EDISIIfTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T( "DISIIf::DeallocateMsgBlock 0x%x s %d<" ), this, &aMsgBlock ) ); + C_TRACE( ( _T( "DISIIf::DeallocateMsgBlock 0x%x s 0x%x<" ), this, &aMsgBlock ) ); } void DISIIf::Receive( TRequestStatus& aRxStatus, TDes8*& aRxMsg, const TDfc& aRxCompletedDfc ) { - C_TRACE( ( _T( "DISIIf::Receive 0x%x s %d b 0x%x d 0x%x>" ), this, &aRxStatus, &aRxMsg, &aRxCompletedDfc ) ); + C_TRACE( ( _T( "DISIIf::Receive 0x%x %d 0x%x 0x%x>" ), this, &aRxStatus, &aRxMsg, &aRxCompletedDfc ) ); ASSERT_RESET_ALWAYS( !aRxMsg, ( EISIIfNotNullPtr | EDISIIfTraceId << KClassIdentifierShift ) ); aRxStatus = KRequestPending; TAny* params[ KThreeParams ]; @@ -144,7 +146,7 @@ m.iValue = EISIAsyncReceive; m.iArg[ KFirstParam ] = params; ASSERT_RESET_ALWAYS( ( KErrNone == iKernelChannel->HandleRequest( m ) ), ( EISIIfWrongResponseToRequest5 | EDISIIfTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T( "DISIIf::Receive 0x%x s %d b 0x%x d 0x%x<" ), this, &aRxStatus, &aRxMsg, &aRxCompletedDfc ) ); + C_TRACE( ( _T( "DISIIf::Receive 0x%x %d 0x%x 0x%x<" ), this, &aRxStatus, &aRxMsg, &aRxCompletedDfc ) ); } void DISIIf::ReceiveCancel() { @@ -168,7 +170,7 @@ { C_TRACE( ( _T( "DISIIf::Send 0x%x m 0x%x>" ), this, &aTxMsg ) ); TAny* params[ KOneParam ]; - params[ KFirstParam ] = reinterpret_cast( const_cast( &aTxMsg )); //TODO need const? + params[ KFirstParam ] = reinterpret_cast( const_cast( &aTxMsg )); // need const? // Get's the current thread's thread message. TThreadMessage& m = Kern::Message(); m.iValue = EISISend; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/src/isikernelchannel.cpp --- a/connectivitylayer/isce/isirouter_dll/src/isikernelchannel.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/src/isikernelchannel.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -22,7 +22,7 @@ #include // For TDfc #include "isikernelchannel.h" // For DISIKernelChannel #include "isiroutertrace.h" // For C_TRACE, ASSERT_RESET.. and fault codes -#include "misichannelrouterif.h" // For MISIChannelRouterIf +#include "misiobjectrouterif.h" // For MISIObjectRouterIf #include "memapi.h" // For MemApi #include "isimsgqueue.h" // For DISIMsgQueue @@ -67,16 +67,18 @@ DISIKernelChannel::DISIKernelChannel( const TUint16& aObjId ) : iKernelChMsgQue( MsgQDfc, this, NULL, KISIKernelChannelMsgQueDfcPrio ) + , iObjId(KNotInitializedId) + , iUID( KNotInitializedUID ) { C_TRACE( ( _T( "DISIKernelChannel::DISIKernelChannel 0x%x>" ), this ) ); - iRouterIf = MISIChannelRouterIf::GetIf(); + iRouterIf = MISIObjectRouterIf::GetIf(); ASSERT_RESET_ALWAYS( iRouterIf, ( EISIKernelChannelMemAllocFailure | EDISIKernelChannelId << KClassIdentifierShift ) ); iRequests = new DISIKernelAsyncRequests( EISILastAsyncRequest ); iRx = new DISIMsgQueue( KISILddRxQueueSize ); - iCompletionThread = iRouterIf->GetDfcThread( MISIChannelRouterIf::EISIUserRequestCompletionThread ); + iCompletionThread = iRouterIf->GetDfcThread( MISIObjectRouterIf::EISIUserRequestCompletionThread ); iEmptyRxDfc = new TDfc( EmptyRxDfc, this, iCompletionThread, KISIKernelEmptyRxQueuePrio ); ASSERT_RESET_ALWAYS( ( iEmptyRxDfc && iRequests && iRx ), ( EISIKernelChannelMemAllocFailure1 | EDISIKernelChannelId << KClassIdentifierShift ) ); - iMainThread = iRouterIf->GetDfcThread( MISIChannelRouterIf::EISIKernelMainThread ); + iMainThread = iRouterIf->GetDfcThread( MISIObjectRouterIf::EISIKernelMainThread ); iKernelChMsgQue.SetDfcQ( iMainThread ); iKernelChMsgQue.Receive(); C_TRACE( ( _T( "DISIKernelChannel::DISIKernelChannel 0x%x<" ), this ) ); @@ -97,9 +99,12 @@ iRx = NULL; C_TRACE( ( _T( "DISIKernelChannel::~DISIKernelChannel iEmptyRxDfc 0x%x" ), iEmptyRxDfc ) ); // Only modified in constructor, if not created already reseted. - iEmptyRxDfc->Cancel(); - delete iEmptyRxDfc; - iEmptyRxDfc = NULL; + if ( iEmptyRxDfc ) + { + iEmptyRxDfc->Cancel(); + delete iEmptyRxDfc; + iEmptyRxDfc = NULL; + } C_TRACE( ( _T( "DISIKernelChannel::~DISIKernelChannel iRequests 0x%x" ), iEmptyRxDfc ) ); iPtrPtrToRxBuf = NULL; iRouterIf = NULL; @@ -271,95 +276,20 @@ } // Called in 1...N transceivers thread context -void DISIKernelChannel::ReceiveMsg( +void DISIKernelChannel::Receive( const TDesC8& aMessage ) { - C_TRACE( ( _T( "DISIKernelChannel::ReceiveMsg 0x%x 0x%x 0x%x>" ), this, &aMessage, iObjId ) ); + C_TRACE( ( _T( "DISIKernelChannel::Receive 0x%x 0x%x 0x%x>" ), this, &aMessage, iObjId ) ); ASSERT_THREAD_CONTEXT_ALWAYS( ( EISIKernelChannelNotThreadContext1 | EDISIKernelChannelId << KClassIdentifierShift ) ); iRx->Add( aMessage ); iEmptyRxDfc->Enque(); - C_TRACE( ( _T( "DISIKernelChannel::ReceiveMsg 0x%x 0x%x 0x%x<" ), this, &aMessage, iObjId ) ); + C_TRACE( ( _T( "DISIKernelChannel::Receive 0x%x 0x%x 0x%x<" ), this, &aMessage, iObjId ) ); } // From MISIRouterChannelIf end -DISIKernelChannel::DISIKernelAsyncRequests::DISIKernelAsyncRequests( - const TInt aSize - ) - { - C_TRACE( ( _T( "DISIKernelAsyncRequests::DISIKernelAsyncRequests size %d>" ), aSize ) ); - iRequestLock = new NFastMutex(); - iDfcFunctionList = new TDfc*[ aSize ]; - iRequestStatusList = new TRequestStatus*[ aSize ]; - C_TRACE( ( _T( "DISIKernelAsyncRequests::DISIKernelAsyncRequests<" ) ) ); - } - -DISIKernelChannel::DISIKernelAsyncRequests::~DISIKernelAsyncRequests() - { - C_TRACE( ( _T( "DISIKernelAsyncRequests::~DISIKernelAsyncRequests>" ) ) ); - // Delete space reserved for the array not the contents of the array, so mem behind pointers that are not owned are not deleted. - delete iDfcFunctionList; - delete iRequestStatusList; - // Deletes lock - delete iRequestLock; - C_TRACE( ( _T( "DISIKernelAsyncRequests::~DISIKernelAsyncRequests<" ) ) ); - } - -void DISIKernelChannel::DISIKernelAsyncRequests::SetPending( - const TUint aRequest, - TDfc* aDfc, - TRequestStatus* aStatus - ) - { - C_TRACE( ( _T( "DISIKernelAsyncRequests::SetPending %d 0x%x 0x%x>" ), aRequest, aDfc, aStatus ) ); - ASSERT_RESET_ALWAYS( aDfc, ( EISIKernelChannelNullParam5 | EDISIKernelChannelId << KClassIdentifierShift ) ); - ASSERT_RESET_ALWAYS( aStatus, ( EISIKernelChannelNullParam6 | EDISIKernelChannelId << KClassIdentifierShift ) ); - ASSERT_RESET_ALWAYS( ( EISILastAsyncRequest > aRequest && EISIAsyncReceive <= aRequest ), ( EISIKernelChannelOverTheLimits2 | EDISIKernelChannelId << KClassIdentifierShift ) ); - // Note asserts must be done before holding the lock. - NKern::FMWait( iRequestLock ); - iDfcFunctionList[ aRequest ] = aDfc; - iRequestStatusList[ aRequest ] = aStatus; - *iRequestStatusList[ aRequest ] = KRequestPending; - NKern::FMSignal( iRequestLock ); - C_TRACE( ( _T( "DISIKernelAsyncRequests::SetPending %d 0x%x 0x%x<" ), aRequest, aDfc, aStatus ) ); - } - -TBool DISIKernelChannel::DISIKernelAsyncRequests::IsPending( - const TUint aRequest - ) - { - C_TRACE( ( _T( "DISIKernelAsyncRequests::IsPending %d>" ), aRequest ) ); - ASSERT_RESET_ALWAYS( ( EISILastAsyncRequest > aRequest && EISIAsyncReceive <= aRequest ), ( EISIKernelChannelOverTheLimits3 | EDISIKernelChannelId << KClassIdentifierShift ) ); - TBool ret( EFalse ); - NKern::FMWait( iRequestLock ); - ret = ( iDfcFunctionList[ aRequest ] && iRequestStatusList[ aRequest ] ) ? ETrue : EFalse; - NKern::FMSignal( iRequestLock ); - C_TRACE( ( _T( "DISIKernelAsyncRequests::IsPending %d %d<" ), aRequest, ret ) ); - return ret; - } - -void DISIKernelChannel::DISIKernelAsyncRequests::Complete( - const TUint aRequest, - const TInt aStatusToComplete - ) - { - C_TRACE( ( _T( "DISIKernelAsyncRequests::Complete %d>" ), aRequest ) ); - // Check that request is legal. - ASSERT_RESET_ALWAYS( ( EISILastAsyncRequest > aRequest && EISIAsyncReceive <= aRequest ), ( EISIKernelChannelOverTheLimits4 | EDISIKernelChannelId << KClassIdentifierShift ) ); - NKern::FMWait( iRequestLock ); - TDfc* completeDfc = iDfcFunctionList[ aRequest ]; - if( ( completeDfc && iRequestStatusList[ aRequest ] ) ) - { - // Writing straight to clients pointer. There is a risk that malfunctioning client can mess up it's own pointer, if used out side of rx dfc, but what can you do.. - *iRequestStatusList[ aRequest ] = aStatusToComplete; - ASSERT_RESET_ALWAYS( !completeDfc->Queued(), ( EISIKernelChannelDfcAlreadyQueued | EDISIKernelChannelId << KClassIdentifierShift ) ); - completeDfc->Enque(); - iDfcFunctionList[ aRequest ] = NULL; - } - NKern::FMSignal( iRequestLock ); - C_TRACE( ( _T( "DISIKernelAsyncRequests::Complete %d<" ), aRequest ) ); - } +// Internal start void DISIKernelChannel::EmptyRxDfc( TAny* aPtr // self @@ -367,7 +297,7 @@ { C_TRACE( ( _T( "DISIKernelChannel::EmptyRxDfc>" ) ) ); DISIKernelChannel& chTmp = *reinterpret_cast( aPtr ); - C_TRACE( ( _T( "DISIKernelChannel::EmptyRxDfc 0x%x 0x%x>" ), &chTmp, chTmp.iObjId ) ); + C_TRACE( ( _T( "DISIKernelChannel::EmptyRxDfc 0x%x 0x%x" ), &chTmp, chTmp.iObjId ) ); if( chTmp.iRequests->IsPending( EISIAsyncReceive ) && chTmp.iRx->Count() > 0 ) { C_TRACE( ( _T( "DISIKernelChannel::EmptyRxDfc 0x%x writing to kernel client" ), &chTmp ) ); @@ -432,7 +362,7 @@ { C_TRACE( ( _T( "DISIKernelChannel::HandleSyncRequest EISIConnect 0x%x" ), this ) ); iUID = tablePtr[ KFirstParam ]; - TUint8* objIdPtr = reinterpret_cast( tablePtr[ KSecondParam ] ); //TODO vasta tempobjid + TUint8* objIdPtr = reinterpret_cast( tablePtr[ KSecondParam ] ); C_TRACE( ( _T( "DISIKernelChannel::HandleDfcRequest EISINokiaKernelOpen 0x%x" ), this ) ); iRouterIf->Connect( iUID, iObjId, this ); *objIdPtr = iObjId; @@ -516,7 +446,7 @@ ) { C_TRACE( ( _T( "DISIKernelChannel::ResetQueues 0x%x 0x%x>" ), this, iObjId ) ); - // TODO: assert router ext thread context + // assert router ext thread context if( iRx ) { C_TRACE( ( _T( "DISIKernelChannel::ResetQueues 0x%x iRx 0x%x" ), this, iRx ) ); @@ -528,5 +458,84 @@ C_TRACE( ( _T( "DISIKernelChannel::ResetQueues 0x%x 0x%x<" ), this, iObjId ) ); } +DISIKernelChannel::DISIKernelAsyncRequests::DISIKernelAsyncRequests( + const TInt aSize + ) + { + C_TRACE( ( _T( "DISIKernelAsyncRequests::DISIKernelAsyncRequests size %d>" ), aSize ) ); + iRequestLock = new NFastMutex(); + iDfcFunctionList = new TDfc*[ aSize ]; + iRequestStatusList = new TRequestStatus*[ aSize ]; + C_TRACE( ( _T( "DISIKernelAsyncRequests::DISIKernelAsyncRequests<" ) ) ); + } + +DISIKernelChannel::DISIKernelAsyncRequests::~DISIKernelAsyncRequests() + { + C_TRACE( ( _T( "DISIKernelAsyncRequests::~DISIKernelAsyncRequests>" ) ) ); + // Delete space reserved for the array not the contents of the array, so mem behind pointers that are not owned are not deleted. + delete iDfcFunctionList; + delete iRequestStatusList; + // Deletes lock + delete iRequestLock; + C_TRACE( ( _T( "DISIKernelAsyncRequests::~DISIKernelAsyncRequests<" ) ) ); + } + +void DISIKernelChannel::DISIKernelAsyncRequests::SetPending( + const TUint aRequest, + TDfc* aDfc, + TRequestStatus* aStatus + ) + { + C_TRACE( ( _T( "DISIKernelAsyncRequests::SetPending %d 0x%x 0x%x>" ), aRequest, aDfc, aStatus ) ); + ASSERT_RESET_ALWAYS( aDfc, ( EISIKernelChannelNullParam5 | EDISIKernelChannelId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( aStatus, ( EISIKernelChannelNullParam6 | EDISIKernelChannelId << KClassIdentifierShift ) ); + ASSERT_RESET_ALWAYS( ( EISILastAsyncRequest > aRequest && EISIAsyncReceive <= aRequest ), ( EISIKernelChannelOverTheLimits2 | EDISIKernelChannelId << KClassIdentifierShift ) ); + // Note asserts must be done before holding the lock. + NKern::FMWait( iRequestLock ); + iDfcFunctionList[ aRequest ] = aDfc; + iRequestStatusList[ aRequest ] = aStatus; + *iRequestStatusList[ aRequest ] = KRequestPending; + NKern::FMSignal( iRequestLock ); + C_TRACE( ( _T( "DISIKernelAsyncRequests::SetPending %d 0x%x 0x%x<" ), aRequest, aDfc, aStatus ) ); + } + +TBool DISIKernelChannel::DISIKernelAsyncRequests::IsPending( + const TUint aRequest + ) + { + C_TRACE( ( _T( "DISIKernelAsyncRequests::IsPending %d>" ), aRequest ) ); + ASSERT_RESET_ALWAYS( ( EISILastAsyncRequest > aRequest && EISIAsyncReceive <= aRequest ), ( EISIKernelChannelOverTheLimits3 | EDISIKernelChannelId << KClassIdentifierShift ) ); + TBool ret( EFalse ); + NKern::FMWait( iRequestLock ); + ret = ( iDfcFunctionList[ aRequest ] && iRequestStatusList[ aRequest ] ) ? ETrue : EFalse; + NKern::FMSignal( iRequestLock ); + C_TRACE( ( _T( "DISIKernelAsyncRequests::IsPending %d %d<" ), aRequest, ret ) ); + return ret; + } + +void DISIKernelChannel::DISIKernelAsyncRequests::Complete( + const TUint aRequest, + const TInt aStatusToComplete + ) + { + C_TRACE( ( _T( "DISIKernelAsyncRequests::Complete %d>" ), aRequest ) ); + // Check that request is legal. + ASSERT_RESET_ALWAYS( ( EISILastAsyncRequest > aRequest && EISIAsyncReceive <= aRequest ), ( EISIKernelChannelOverTheLimits4 | EDISIKernelChannelId << KClassIdentifierShift ) ); + NKern::FMWait( iRequestLock ); + TDfc* completeDfc = iDfcFunctionList[ aRequest ]; + if( ( completeDfc && iRequestStatusList[ aRequest ] ) ) + { + // Writing straight to clients pointer. There is a risk that malfunctioning client can mess up it's own pointer, if used out side of rx dfc, but what can you do.. + *iRequestStatusList[ aRequest ] = aStatusToComplete; + ASSERT_RESET_ALWAYS( !completeDfc->Queued(), ( EISIKernelChannelDfcAlreadyQueued | EDISIKernelChannelId << KClassIdentifierShift ) ); + completeDfc->Enque(); + iDfcFunctionList[ aRequest ] = NULL; + } + NKern::FMSignal( iRequestLock ); + C_TRACE( ( _T( "DISIKernelAsyncRequests::Complete %d<" ), aRequest ) ); + } + +// Internal end + // End of file. diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/src/isilink.cpp --- a/connectivitylayer/isce/isirouter_dll/src/isilink.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/src/isilink.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -17,13 +17,13 @@ #include // For Kern +#include // // For ISI_HEADER_OFFSET_MEDIA + #include "isilink.h" // For DISILink #include "iscedefs.h" // For EMuxISI... #include "mlinkmuxif.h" // For MLinkMuxIf #include "isiroutertrace.h" // For C_TRACE, ASSERT_RESET.. and fault codes #include "misilinkrouterif.h" // For MISILinkRouterIf -#include "isihelpers.h" // For ISI_HEADER_OFFSET_MEDIA - // Faults enum TISILinkFaults @@ -44,11 +44,11 @@ const TUint8 aTrxId ) { - C_TRACE( ( _T( "MISIRouterLinkIf::CreateLinkF 0x%x %d %d>" ), aRouter, aMediaId, aTrxId ) ); + C_TRACE( ( _T( "MISIRouterLinkIf::CreateLinkF 0x%x 0x%x 0x%x>" ), aRouter, aMediaId, aTrxId ) ); ASSERT_RESET_ALWAYS( aRouter, ( EISILinkNullPtr | EDISILinkTraceId << KClassIdentifierShift ) ); DISILink* link = new DISILink( aRouter, aMediaId, aTrxId ); ASSERT_RESET_ALWAYS( link, ( EISILinkMemAllocFailed | EDISILinkTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T( "MISIRouterLinkIf::CreateLinkF 0x%x %d %d created 0x%x<" ), aRouter, aMediaId, aTrxId, link ) ); + C_TRACE( ( _T( "MISIRouterLinkIf::CreateLinkF 0x%x 0x%x 0x%x created 0x%x<" ), aRouter, aMediaId, aTrxId, link ) ); return link; } @@ -58,7 +58,7 @@ iTrxPresent( EFalse ) { C_TRACE( ( _T( "DISILink::DISILink 0x%x>" ), this ) ); - iMediaId = 0; // TODO change to PN_MEDIA_NOT_USED when bridge supports this + iMediaId = 0; C_TRACE( ( _T( "DISILink::DISILink 0x%x<" ), this ) ); } @@ -70,11 +70,11 @@ iMediaId( aMediaId ), iTrxId( aTrxId ) { - C_TRACE( ( _T( "DISILink::DISILink 0x%x mediaid %d trxid %d>" ), this, aMediaId, aTrxId ) ); + C_TRACE( ( _T( "DISILink::DISILink 0x%x mediaid 0x%x trxid 0x%x>" ), this, aMediaId, aTrxId ) ); // ISI Media iMux = MLinkMuxIf::Register( this, aTrxId, EMuxISI ); ASSERT_RESET_ALWAYS( aRouter, ( EISILinkRegisterFailed | EDISILinkTraceId << KClassIdentifierShift ) ); - C_TRACE( ( _T( "DISILink::DISILink 0x%x mediaid %d trxid %d<" ), this, iMediaId, iTrxId ) ); + C_TRACE( ( _T( "DISILink::DISILink 0x%x mediaid 0x%x trxid 0x%x<" ), this, iMediaId, iTrxId ) ); } DISILink::~DISILink() @@ -93,7 +93,7 @@ C_TRACE( ( _T( "DISILink::Receive 0x%x 0x%x>" ), this, &aMsg ) ); ASSERT_RESET_ALWAYS( iMux, ( EISILinkInitFailed | EDISILinkTraceId << KClassIdentifierShift ) ); ASSERT_RESET_ALWAYS( aMsg.Ptr()[ ISI_HEADER_OFFSET_MEDIA ] == iMediaId, ( EISILinkWrongMedia | aMsg.Ptr()[ 0 ] << KMediaIdShift | EDISILinkTraceId << KClassIdentifierShift ) ); - iRouter->RouteISIMessage( aMsg ); + iRouter->ReceiveISIMessage( aMsg, iTrxId ); C_TRACE( ( _T( "DISILink::Receive 0x%x 0x%x<" ), this, &aMsg ) ); } @@ -107,6 +107,7 @@ // No traces allowed due to not allowed to block. ASSERT_RESET_ALWAYS( ( iTrxPresent != aPresent ), ( EISILinkTrxPresenceSyncFailed | EDISILinkTraceId << KClassIdentifierShift ) ); iTrxPresent = aPresent; + iRouter->StateChanged(); } // From MMuxLinkIf end @@ -124,7 +125,7 @@ TDes8& aMsg ) { - C_TRACE( ( _T( "DISILink::Send 0x%x 0x%x>" ), this, &aMsg ) ); + C_TRACE( ( _T( "DISILink::Send 0x%x 0x%x iMediaId 0x%x >" ), this, &aMsg, iMediaId ) ); ASSERT_RESET_ALWAYS( iMux, ( EISILinkInitFailed2 | EDISILinkTraceId << KClassIdentifierShift ) ); if( iTrxPresent ) { @@ -132,10 +133,18 @@ msgPtr[ ISI_HEADER_OFFSET_MEDIA ] = iMediaId; // Send with default prio. iMux->Send( aMsg, EMuxISI ); - C_TRACE( ( _T( "DISILink::Send ok 0x%x %d 0x%x<" ), this, iTrxPresent, &aMsg) ); + C_TRACE( ( _T( "DISILink::Send ok 0x%x 0x%x 0x%x<" ), this, iTrxPresent, &aMsg) ); return ETrue; } - C_TRACE( ( _T( "DISILink::Send failed 0x%x %d 0x%x<" ), this, iTrxPresent, &aMsg) ); + // No need for else, by default false + C_TRACE( ( _T( "DISILink::Send failed 0x%x 0x%x 0x%x<" ), this, iTrxPresent, &aMsg) ); return EFalse; } + +TUint8 DISILink::GetTrxId() + { + //C_TRACE( ( _T( "DISILink::GetTrxId return %d <>" ), this, iTrxId ) ); + return iTrxId; + + } // From MISIRouterLinkIf end diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/src/isimsgqueue.cpp --- a/connectivitylayer/isce/isirouter_dll/src/isimsgqueue.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/src/isimsgqueue.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -66,6 +66,7 @@ C_TRACE( ( _T( "DISIMsgQueue::~DISIMsgQueue 0x%x %d>" ), this, iShCount ) ); ASSERT_RESET_ALWAYS( iShCount == 0, ( EISIMsgQueueNotEmpty | EDISIMsgQueueTraceId << KClassIdentifierShift ) ); // NOTE! This does not deallocate the blocks from the allocated memory just the pointers! + // Take each individual pointer from the array and free delete them. for( TInt i( 0 ); i < iSize; ++i ) { TDes8* temp = iShRingBuffer[ i ]; @@ -79,8 +80,9 @@ if( iShRingBuffer ) { C_TRACE( ( _T( "DISIMsgQueue::~DISIMsgQueue iShRingBuffer 0x%x iShRingBuffer[0] 0x%x" ), iShRingBuffer, iShRingBuffer[0] ) ); + // Delete the space reserved for the array. Marks it as non-used do not set to NULL. delete [] iShRingBuffer; - iShRingBuffer = NULL; +// iShRingBuffer = NULL; } iSize = 0; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/src/isirouter.cpp --- a/connectivitylayer/isce/isirouter_dll/src/isirouter.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/src/isirouter.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -17,20 +17,24 @@ #include // For Kern +#include // For PN_OBJ_ROUTING_REQ +#include // For ISI_HEADER_OFFSET_... #include "isirouter.h" // For DISIRouter #include "isiroutertrace.h" // For C_TRACE, ASSERT_RESET.. and fault codes #include "isidevice.h" // For DLogicalDevice #include "isihelpers.h" // For SET_SENDER_DEV... -#include "misirouterchannelif.h" // For MISIRouterChannelIf +//#include "misirouterobjectif.h" // For MISIRouterObjectIf #include "isithreadcontainer.h" // For DISIThreadContainer #include "isicltransceiver.h" // For DISICLTransceiver #include "misirouterobjectif.h" -#define PN_DEV_OWN 0x6C //TODO take from real location in future - -const TInt KDfcPriority( 5 ); const TUint32 KCommunicationManagerUID( 0x2002B3D0 ); const TUint32 KNameServiceUID( 0x2002A5A1 ); +const TUint32 KIsiShRouterServiceUID( 0x20026FE7 ); +const TUint32 KIsiShPipeHandlerUID( 0x2002E6E2 ); + +#define ROUTER_OBJECT_IDENTIFIER 0xFA // Only internally agreed inside isi router +#define PIPEHANDLER_OBJECT_IDENTIFIER 0xFB // Only internally agreed inside isi router DISIRouter* DISIRouter::iSelfPtr = NULL; @@ -45,62 +49,99 @@ EISIRouterNULLPtr, EISIRouterNULLPtr1, EISIRouterNULLPtr2, + EISIRouterNULLPtr3, EISIRouterNULLThreadPointer, + EISIRouterRouterServiceNULLPtr, + EISiShPipeHandlerNULLPtr, + EISIRouterCommunicationManagerNULLPtr, + EISIRouterNameServiceNULLPtr, + EISIWrongObjectApiClient, }; +const TInt KDfcPriority( 5 ); +// #define WITHOUT_WRAPPERS_IN_USE // to be defined on when wrappers are not used anymore +#ifndef WITHOUT_WRAPPERS_IN_USE +#include // Only allowed to include when wrappers are used +const TUint16 KFirstUserChannel( EIscNokiaUpdateApplication ); +const TUint16 KLastKernelChannel( EIscNokiaLastKernelChannel ); +#endif void DISIRouter::Connect( const TInt32 aUID, TUint8& aObjId, - MISIRouterChannelIf* aCallback + MISIRouterObjectIf* aCallback ) { - C_TRACE( ( _T( "DISIRouter::Connect %d 0x%x 0x%x>" ), aUID, aObjId, aCallback ) ); + C_TRACE( ( _T( "DISIRouter::Connect 0x%x 0x%x 0x%x 0x%x>" ), aUID, aObjId, aCallback, this ) ); ASSERT_RESET_ALWAYS( aCallback, ( EISIRouterNULLPtr | EDISIRouterTraceId << KClassIdentifierShift ) ); TISIClient* tmp = new TISIClient(); ASSERT_RESET_ALWAYS( tmp, ( EISIRouterMemAllocFailure | EDISIRouterTraceId << KClassIdentifierShift ) ); - tmp->iUID = aUID; + tmp->iUID = aUID; tmp->iChannel = aCallback; - - TUint8 staticObjId = ReceiveStaticObjId( aUID ); + TUint8 staticObjId = ReserveStaticObjId( aUID ); NKern::FMWait( iClientTableFastMutex ); - CheckUIDUniqueness( aUID ); - if( !staticObjId ) + TBool reserved = CheckUIDUniqueness( aUID ); +#ifndef WITHOUT_WRAPPERS_IN_USE + if( reserved ) { - tmp->iObjId = ReserveNewDynamicObjId(); - ASSERT_RESET_ALWAYS( tmp->iObjId, ( EISIRouterNULLObjId | EDISIRouterTraceId << KClassIdentifierShift ) ); + NKern::FMSignal( iClientTableFastMutex ); + aObjId = 0xEE; } else { - tmp->iObjId = staticObjId; +#endif //WITHOUT_WRAPPERS_IN_USE + if( KNotInitializedId == staticObjId ) + { + tmp->iObjId = ReserveNewDynamicObjId(); + ASSERT_RESET_ALWAYS( tmp->iObjId, ( EISIRouterNULLObjId | EDISIRouterTraceId << KClassIdentifierShift ) ); + } + else + { + tmp->iObjId = staticObjId;// check that dynamic allocation don't return statically reserved object identifiers + } + iClientTable[ tmp->iObjId ] = tmp; + NKern::FMSignal( iClientTableFastMutex ); + aObjId = tmp->iObjId; +#ifndef WITHOUT_WRAPPERS_IN_USE } - iClientTable[ tmp->iObjId ] = tmp; - NKern::FMSignal( iClientTableFastMutex ); - aObjId = tmp->iObjId; - C_TRACE( ( _T( "DISIRouter::Connect %d 0x%x 0x%x<" ), aUID, aObjId, aCallback ) ); +#endif + C_TRACE( ( _T( "DISIRouter::Connect 0x%x 0x%x 0x%x<" ), aUID, aObjId, aCallback ) ); } -void DISIRouter::CheckUIDUniqueness( const TInt32 aUID ) +TBool DISIRouter::CheckUIDUniqueness( const TInt32 aUID ) { + TBool ret(EFalse); // No tracing with mutex - for( TInt i( KFirstAllowedObjId ); i < KMaxAmountOfObjId; i++ ) + for( TInt i( 0 ); i < KMaxAmountOfObjId; i++ ) { - if( iClientTable[ i ] && ( iClientTable[ i ]->iUID == aUID ) ) - { - ASSERT_RESET_ALWAYS( 0, ( EISIRouterNotUniqueUID | EDISIRouterTraceId << KClassIdentifierShift ) ); - } + if( iClientTable[ i ] && ( iClientTable[ i ]->iUID == aUID ) ) + { +#ifndef WITHOUT_WRAPPERS_IN_USE + if( aUID <= KLastKernelChannel ) + { + ret = ETrue; + } + else + { +#endif //WITHOUT_WRAPPERS_IN_USE + ASSERT_RESET_ALWAYS( 0, ( EISIRouterNotUniqueUID | EDISIRouterTraceId << KClassIdentifierShift ) ); +#ifndef WITHOUT_WRAPPERS_IN_USE + } +#endif //WITHOUT_WRAPPERS_IN_USE + } } + return ret; } -TUint8 DISIRouter::ReceiveStaticObjId( const TInt32 aUID ) +TUint8 DISIRouter::ReserveStaticObjId( const TInt32 aUID ) { - C_TRACE( ( _T( "DISIRouter::ReceiveStaticObjId 0x%x 0x%x>" ), aUID ) ); + C_TRACE( ( _T( "DISIRouter::ReserveStaticObjId 0x%x 0x%x>" ), aUID ) ); for( TUint8 i = 0; i < iStaticObjIdTable.Count(); i++ ) { if( iStaticObjIdTable[ i ]->iUID == aUID ) { - C_TRACE( ( _T( "DISIRouter::ReceiveStaticObjId 0x%x 0x%x 0x%x<" ), aUID, iStaticObjIdTable[i]->iUID, iStaticObjIdTable[i]->iObjId ) ); + C_TRACE( ( _T( "DISIRouter::ReserveStaticObjId 0x%x 0x%x 0x%x<" ), aUID, iStaticObjIdTable[i]->iUID, iStaticObjIdTable[i]->iObjId ) ); return iStaticObjIdTable[i]->iObjId; } } @@ -110,26 +151,32 @@ TUint8 DISIRouter::ReserveNewDynamicObjId() { // No tracing with mutex - for( TInt i( KFirstAllowedObjId ); i < KMaxAmountOfObjId; i++ ) +#ifdef WITHOUT_WRAPPERS_IN_USE + TUint8 firstAllowedObjId = KFirstAllowedObjId; +#else + TUint8 firstAllowedObjId = KLastKernelChannel; +#endif + + for( TInt i(firstAllowedObjId); i < KMaxAmountOfObjId; i++ ) { - if( !iClientTable[ i ] ) - { - TBool reserved( EFalse ); - for( TUint8 j = 0; j < iStaticObjIdTable.Count(); j++ ) - { - if( j == iStaticObjIdTable[ j ]->iObjId ) - { - reserved = ETrue; - break; - } - } - if( !reserved ) - { - return i; - } - } + if( !iClientTable[ i ] ) + { + TBool reserved( EFalse ); + for( TUint8 j = 0; j < iStaticObjIdTable.Count(); j++ ) + { + if( j == iStaticObjIdTable[ j ]->iObjId ) + { + reserved = ETrue; + break; + } + } + if( !reserved ) + { + return i; + } + } } - return KNotInitializedId; + return KNotInitializedId; } void DISIRouter::Disconnect( @@ -139,10 +186,11 @@ C_TRACE( ( _T( "DISIRouter::Disconnect 0x%x>" ), aObjId ) ); TISIClient* tmp = iClientTable[ aObjId ]; NKern::FMWait( iClientTableFastMutex ); - iClientTable[ aObjId ] = NULL; + iClientTable[ aObjId ] = NULL; NKern::FMSignal( iClientTableFastMutex ); //Must exist delete tmp; + tmp = NULL; C_TRACE( ( _T( "DISIRouter::Disconnect 0x%x<" ), aObjId ) ); } @@ -151,21 +199,19 @@ ) { C_TRACE( ( _T( "DISIRouter::GetDfcThread<>" ) ) ); - Kern::Printf( "ISIRouter::GetDfcThread" ); - return iClientThreadContainer->AllocateThread( aType ); + return iShClientThreadContainer->AllocateThread( aType ); } void DISIRouter::FreeDfcThread( TDfcQue* aThread ) { C_TRACE( ( _T( "DISIRouter::FreeDfcThread 0x%x>" ), aThread ) ); - Kern::Printf( "ISIRouter::FreeDfcThread" ); - iClientThreadContainer->DeallocateThread( aThread ); + iShClientThreadContainer->DeallocateThread( aThread ); C_TRACE( ( _T( "DISIRouter::FreeDfcThread 0x%x<" ), aThread ) ); } -MISIChannelRouterIf* MISIChannelRouterIf::GetIf() +EXPORT_C MISIObjectRouterIf* MISIObjectRouterIf::GetIf() { - C_TRACE( ( _T( "MISIChannelRouterIf::GetIf<>" ) ) ); + C_TRACE( ( _T( "MISIObjectRouterIf::GetIf<>" ) ) ); return DISIRouter::GetRouter(); } @@ -174,9 +220,9 @@ ) { C_TRACE( ( _T( "DISIRouter::DISIRouter>" ) ) ); - iClientThreadContainer = new DISIThreadContainer(); - ASSERT_RESET_ALWAYS( iClientThreadContainer, ( EISIRouterMemAllocFailure1 | EDISIRouterTraceId << KClassIdentifierShift ) ); - iInitThread = iClientThreadContainer->AllocateThread( MISIChannelRouterIf::EISIKernelMainThread ); + iShClientThreadContainer = new DISIThreadContainer(); + ASSERT_RESET_ALWAYS( iShClientThreadContainer, ( EISIRouterMemAllocFailure1 | EDISIRouterTraceId << KClassIdentifierShift ) ); + iInitThread = iShClientThreadContainer->AllocateThread( MISIObjectRouterIf::EISIKernelMainThread ); ASSERT_RESET_ALWAYS( iInitThread, ( EISIRouterNULLThreadPointer | EDISIRouterTraceId << KClassIdentifierShift ) ); iInitializeDfc = new TDfc( InitializeDfc, this, iInitThread, KDfcPriority ); ASSERT_RESET_ALWAYS( iInitializeDfc, ( EISIRouterMemAllocFailure2 | EDISIRouterTraceId << KClassIdentifierShift ) ); @@ -198,23 +244,52 @@ // None ) { - C_TRACE( ( _T( "DISIRouter::Initialize>" ) ) ); - - iCLTransceiver = new DISICLTransceiver( this ); - ASSERT_RESET_ALWAYS( iCLTransceiver, ( EISIRouterNULLPtr1 | EDISIRouterTraceId << KClassIdentifierShift ) ); //TODO error codes + C_TRACE( ( _T( "DISIRouter::Initialize> this: 0x%x" ), this ) ); + iSelfPtr = this; iClientTableFastMutex = new NFastMutex(); ASSERT_RESET_ALWAYS( iClientTableFastMutex, ( EISIRouterNULLPtr2 | EDISIRouterTraceId << KClassIdentifierShift ) ); - for( TInt i( 0 ); i < KMaxAmountOfObjId; i++) { iClientTable[ i ] = NULL; } + // comment improve hex or des + // nameservice, communication manager, routerservice... // UID ObjId - iStaticObjIdTable.Append( new TStaticId( 123, 15 ) ); //NokiaTSY etc... - iStaticObjIdTable.Append( new TStaticId( 200, 34 ) ); + iStaticObjIdTable.Append( new TStaticId( 123, 0x70 ) ); // for testing ISI API + iStaticObjIdTable.Append( new TStaticId( 200, 0x71 ) ); // for testing ISI API + iStaticObjIdTable.Append( new TStaticId( 201, 0x72 ) ); // for testing ISI API + iStaticObjIdTable.Append( new TStaticId( 202, 0x73 ) ); // for testing ISI API + // +#ifndef WITHOUT_WRAPPERS_IN_USE + // Map all the kernel channels as they used to be + for( TInt id( KFirstUserChannel ); id < KLastKernelChannel; id++ ) + { + if ( ( id != KNotInitializedId ) && + ( id != PN_OBJ_EVENT_MULTICAST ) && + ( id != PN_OBJ_EVENT_MULTICAST ) && + ( id != ROUTER_OBJECT_IDENTIFIER ) && + ( id != PIPEHANDLER_OBJECT_IDENTIFIER ) ) + { + iStaticObjIdTable.Append( new TStaticId( id, id ) ); + } + else + { + iStaticObjIdTable.Append( new TStaticId( id, 0xEE ) ); + } + } + // Map all the kernel channels as they used to be +#endif // WITHOUT_WRAPPERS_IN_USE + // ? vaikutus iShClientThreadContainer->DeallocateThread( iInitThread ); + + iStaticObjIdTable.Append( new TStaticId( 0xD11BADA1, KNotInitializedId ) );// Make sure no one can get KNotInitializedId obj id + iStaticObjIdTable.Append( new TStaticId( KCommunicationManagerUID, PN_OBJ_EVENT_MULTICAST ) ); + iStaticObjIdTable.Append( new TStaticId( KNameServiceUID, PN_OBJ_ROUTING_REQ ) ); + iStaticObjIdTable.Append( new TStaticId( KIsiShRouterServiceUID, ROUTER_OBJECT_IDENTIFIER ) ); + iStaticObjIdTable.Append( new TStaticId( KIsiShPipeHandlerUID, PIPEHANDLER_OBJECT_IDENTIFIER ) ); - iSelfPtr = this; - iClientThreadContainer->DeallocateThread( iInitThread ); + iShCLTransceiver = new DISICLTransceiver( *this, iInitThread ); + ASSERT_RESET_ALWAYS( iShCLTransceiver, ( EISIRouterNULLPtr1 | EDISIRouterTraceId << KClassIdentifierShift ) ); + C_TRACE( ( _T( "DISIRouter::Initialize<" ) ) ); } @@ -238,14 +313,13 @@ iClientTable[ i ] = NULL; } } - // All must exist - iInitializeDfc->Cancel(); + // All must exist otherways reseted. delete iInitializeDfc; iInitializeDfc = NULL; - delete iClientThreadContainer; - iClientThreadContainer = NULL; - delete iCLTransceiver; - iCLTransceiver = NULL; + delete iShClientThreadContainer; + iShClientThreadContainer = NULL; + delete iShCLTransceiver; + iShCLTransceiver = NULL; delete iClientTableFastMutex; iClientTableFastMutex = NULL; C_TRACE( ( _T( "DISIRouter::~DISIRouter<" ) ) ); @@ -257,17 +331,24 @@ ) { C_TRACE( ( _T( "DISIRouter::Send 0x%x 0x%x>" ), &aMessage, aObjId ) ); - Kern::Printf( "ISIRouter::Send" ); - if( ( aObjId != PN_OBJ_ROUTING_REQ ) - && ( aObjId != PN_OBJ_EVENT_MULTICAST ) ) + if( ( ( aObjId == EIscNokiaUsbPhonetLink ) && ( GET_SENDER_DEV( aMessage.Ptr() ) == PN_DEV_PC ) ) || + ( aObjId == PN_OBJ_ROUTING_REQ ) || + ( aObjId == PN_OBJ_EVENT_MULTICAST ) || + ( aObjId == ROUTER_OBJECT_IDENTIFIER ) || + ( aObjId == PIPEHANDLER_OBJECT_IDENTIFIER ) ) { - TUint8* messageBlockPtr( const_cast( aMessage.Ptr() ) ); + // No need to update sender dev and obj id + C_TRACE( ( _T( "DISIRouter::Send message tx address not needed to updata 0x%x 0x%x>" ), aObjId, GET_SENDER_DEV( aMessage.Ptr() ) ) ); + } + else + { + TUint8* messageBlockPtr( const_cast( aMessage.Ptr() ) ); SET_SENDER_DEV( messageBlockPtr, PN_DEV_OWN ); SET_SENDER_OBJ( messageBlockPtr, aObjId ); } - TInt error = iCLTransceiver->RouteISIMessage( aMessage ); - C_TRACE( ( _T( "DISIRouter::Send 0x%x %d 0x%x<" ), &aMessage, aObjId ) ); + TInt error = iShCLTransceiver->RouteISIMessage( aMessage ); + C_TRACE( ( _T( "DISIRouter::Send 0x%x 0x%x<" ), &aMessage, aObjId ) ); return error; } @@ -276,91 +357,42 @@ C_TRACE( ( _T( "DISIRouter::Receive 0x%x 0x%x>" ), &aMessage, aObjId ) ); TBool error( EFalse ); TUint8* messageBlockPtr( const_cast( aMessage.Ptr() ) ); - switch( GET_RECEIVER_OBJ( aMessage ) ) + + NKern::FMWait( iClientTableFastMutex ); + if( iClientTable[ aObjId ] ) { - case PN_OBJ_ROUTING_REQ: - { - C_TRACE( ( _T( "DISIRouter msg to PN_OBJ_ROUTING_REQ: nameservice" ) ) ); - //route with resource and nameservice - iNameService->Receive( aMessage ); - C_TRACE( ( _T( "DRouter::HandleIsiMessage to NAMESERVICE<" ) ) ); - error = ETrue; - break; - } - case PN_OBJ_EVENT_MULTICAST: - { - C_TRACE( ( _T( "DISIRouter msg to PN_OBJ_EVENT_MULTICAST: communication manager" ) ) ); - iCommunicationManager->Receive( aMessage ); - C_TRACE( ( _T( "DRouter::HandleIsiMessage to Communication Manager<" ) ) ); - error = ETrue; - break; - } - default: - { //default regular channel - NKern::FMWait( iClientTableFastMutex ); - if( iClientTable[ aObjId ] ) - { - NKern::FMSignal( iClientTableFastMutex ); - ( iClientTable[ aObjId ]->iChannel )->ReceiveMsg( aMessage ); //may not be safe, consider receive/delete sync - C_TRACE( ( _T( "DISIRouter::Receive ok 0x%x 0x%x>" ), &aMessage, aObjId ) ); - error = ETrue; - } - else - { - NKern::FMSignal( iClientTableFastMutex ); - C_TRACE( ( _T( "DISIRouter::Receive failed 0x%x 0x%x<" ), &aMessage, aObjId ) ); - error = EFalse; - } - break; - } - } - return error; + NKern::FMSignal( iClientTableFastMutex ); + ( iClientTable[ aObjId ]->iChannel )->Receive( aMessage ); //may not be safe, consider receive/delete sync + C_TRACE( ( _T( "DISIRouter::Receive ok 0x%x 0x%x" ), &aMessage, aObjId ) ); + error = ETrue; + } + else + { + NKern::FMSignal( iClientTableFastMutex ); + C_TRACE( ( _T( "DISIRouter::Receive failed 0x%x 0x%x" ), &aMessage, aObjId ) ); + error = EFalse; + } + + C_TRACE( ( _T( "DISIRouter::Receive 0x%x 0x%x %d<" ), &aMessage, aObjId, error ) ); + return error; } DECLARE_STANDARD_EXTENSION() { - Kern::Printf( "ISI Router extension>" ); + Kern::Printf( "ISI Router kext>" ); // Create a container extension DISIRouter* extension = new DISIRouter(); TRACE_ASSERT( extension ); - Kern::Printf( "ISI Router extension<" ); + Kern::Printf( "ISI Router kext 0x%x<", extension ); return extension ? KErrNone : KErrNoMemory; } DECLARE_EXTENSION_LDD() { - Kern::Printf( "ISI Router ldd>" ); + Kern::Printf( "ISI Router kextldd>" ); DLogicalDevice* device = new DISIDevice; TRACE_ASSERT( device ); - Kern::Printf( "ISI Router ldd 0x%x<", device ); - return( device ); + Kern::Printf( "ISI Router kextldd 0x%x<", device ); + return device; } - -//From objectapi -EXPORT_C MISIObjectRouterIf* MISIObjectRouterIf::Connect( const TInt32 aUID, TUint8& aObjId, MISIRouterObjectIf* aCallback ) - { - C_TRACE( ( _T( "MISIObjectRouterIf::Connect %d 0x%x 0x%x>" ), aUID, aObjId, aCallback ) ); - - Kern::Printf( "ISIRouter::Connect" ); - if( aUID == KNameServiceUID ) - { - C_TRACE( ( _T( "MISIObjectRouterIf was nameservice" ) ) ); - DISIRouter::iSelfPtr->iNameService = aCallback; - aObjId = PN_OBJ_ROUTING_REQ; // 0x00 - } - else if( aUID == KCommunicationManagerUID ) - { - C_TRACE( ( _T( "MISIObjectRouterIf was communicationmanager" ) ) ); - DISIRouter::iSelfPtr->iCommunicationManager = aCallback; - aObjId = PN_OBJ_EVENT_MULTICAST; // 0x20 - } - else - { - C_TRACE( ( _T( "MISIObjectRouterIf unknown object api client" ) ) ); - } - MISIObjectRouterIf* tmp = DISIRouter::iSelfPtr; - C_TRACE( ( _T( "MISIObjectRouterIf::Connect %d 0x%x 0x%x<" ), aUID, aObjId, aCallback ) ); - return tmp; - } - diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/src/isithreadcontainer.cpp --- a/connectivitylayer/isce/isirouter_dll/src/isithreadcontainer.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/src/isithreadcontainer.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -99,20 +99,20 @@ C_TRACE( ( _T( "DISIThreadContainer::~DISIThreadContainer<" ) ) ); } -TDfcQue* DISIThreadContainer::AllocateThread( const MISIChannelRouterIf::TISIDfcQThreadType aType ) +TDfcQue* DISIThreadContainer::AllocateThread( const MISIObjectRouterIf::TISIDfcQThreadType aType ) { C_TRACE( ( _T( "DISIThreadContainer::AllocateThread %d>" ), aType ) ); TDfcQue* tmpPtr( NULL ); switch( aType ) { - case MISIChannelRouterIf::EISIKernelMainThread: - case MISIChannelRouterIf::EISIKernelRequestCompletionThread: + case MISIObjectRouterIf::EISIKernelMainThread: + case MISIObjectRouterIf::EISIKernelRequestCompletionThread: { tmpPtr = ReserveKernelThread(); break; } - case MISIChannelRouterIf::EISIUserMainThread: - case MISIChannelRouterIf::EISIUserRequestCompletionThread: + case MISIObjectRouterIf::EISIUserMainThread: + case MISIObjectRouterIf::EISIUserRequestCompletionThread: { tmpPtr = ReserveUserThread(); break; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/isirouter_dll/src/isiuserchannel.cpp --- a/connectivitylayer/isce/isirouter_dll/src/isiuserchannel.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/isirouter_dll/src/isiuserchannel.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -20,7 +20,7 @@ #include // For DMutex #include "isiuserchannel.h" // For DISIUserChanneel #include "isiroutertrace.h" // For C_TRACE, ASSERT_RESET.. and fault codes -#include "misichannelrouterif.h" // For MISIChannelRouterIf +#include "misiobjectrouterif.h" // For MISIObjectRouterIf #include "memapi.h" // For MemApi #include "isimsgqueue.h" // For DISIMsgQueue @@ -79,9 +79,9 @@ iUID( KNotInitializedUID ) { C_TRACE( ( _T( "DISIUserChannel::DISIUserChannel>" ) ) ); - iRouterIf = MISIChannelRouterIf::GetIf(); + iRouterIf = MISIObjectRouterIf::GetIf(); ASSERT_RESET_ALWAYS( iRouterIf, ( EISIUserChannelMemAllocFail | EDISIUserChannelTraceId << KClassIdentifierShift ) ); - iCompletionThread = iRouterIf->GetDfcThread( MISIChannelRouterIf::EISIUserRequestCompletionThread ); + iCompletionThread = iRouterIf->GetDfcThread( MISIObjectRouterIf::EISIUserRequestCompletionThread ); iEmptyRxQueueDfc = new TDfc( EmptyRxQueueDfc, this, iCompletionThread, KISILddEmptyRxQueuePriori ); ASSERT_RESET_ALWAYS( iEmptyRxQueueDfc, ( EISIUserChannelMemAllocFail2 | EDISIUserChannelTraceId << KClassIdentifierShift ) ); iCompleteChannelRequestDfc = new TDfc( CompleteChannelRequestDfc, this, iCompletionThread, KISILddCompleteRequestPriori ); @@ -147,7 +147,7 @@ iRx = new DISIMsgQueue( KISILddRxQueueSize ); ASSERT_RESET_ALWAYS( iRx, ( EISIUserChannelMemAllocFail1 | EDISIUserChannelTraceId << KClassIdentifierShift ) ); // Other DFC functions handling user<>kernel copying done in ldd DFC. Ldd DFC function priority is 1. - iMainThread = iRouterIf->GetDfcThread( MISIChannelRouterIf::EISIUserMainThread ); + iMainThread = iRouterIf->GetDfcThread( MISIObjectRouterIf::EISIUserMainThread ); SetDfcQ( iMainThread ); iMsgQ.Receive(); DObject* thread = reinterpret_cast( iThread ); @@ -296,7 +296,7 @@ TDes8& sendBlock = MemApi::AllocBlock( msgLength ); ASSERT_RESET_ALWAYS( KErrNone == Kern::ThreadDesRead( iThread, firstParam, sendBlock, 0, KChunkShiftBy0 ), ( EISIUserChannelDesReadFailed | EDISIUserChannelTraceId << KClassIdentifierShift ) ); TRACE_ASSERT_INFO( sendBlock.Length() == msgLength, iObjId << KObjIdShift ); - C_TRACE( ( _T( "DISIUserChannel::HandleAsyncRequest EISISend 0x%x 0x%x" ), this, &sendBlock ) ); + C_TRACE( ( _T( "DISIUserChannel::HandleSyncRequest EISISend 0x%x 0x%x" ), this, &sendBlock ) ); error = iRouterIf->Send( sendBlock, iObjId ); } else @@ -429,16 +429,16 @@ } // This is called in 1...N thread contextes -void DISIUserChannel::ReceiveMsg( +void DISIUserChannel::Receive( const TDesC8& aMessage ) { - C_TRACE( ( _T( "DISIUserChannel::ReceiveMsg 0x%x 0x%x 0x%x>" ), this, &aMessage, iObjId ) ); + C_TRACE( ( _T( "DISIUserChannel::Receive 0x%x 0x%x 0x%x>" ), this, &aMessage, iObjId ) ); // Can only be called from thread context. ASSERT_THREAD_CONTEXT_ALWAYS( ( EISIUserChannelfNotThreadContext3 | EDISIUserChannelTraceId << KClassIdentifierShift ) ); iRx->Add( aMessage ); iEmptyRxQueueDfc->Enque(); - C_TRACE( ( _T( "DISIUserChannel::ReceiveMsg 0x%x 0x%x 0x%x<" ), this, &aMessage, iObjId ) ); + C_TRACE( ( _T( "DISIUserChannel::Receive 0x%x 0x%x 0x%x<" ), this, &aMessage, iObjId ) ); } DISIUserChannel::DISIUserAsyncRequests::DISIUserAsyncRequests( @@ -562,7 +562,7 @@ { C_TRACE( ( _T( "DISIUserChannel::EnqueChannelRequestCompleteDfc 0x%x %d %d 0x%x>" ), this, aRequest, aStatusToComplete, iObjId ) ); ASSERT_THREAD_CONTEXT_ALWAYS( ( EISIUserChannelfNotThreadContext | EDISIUserChannelTraceId << KClassIdentifierShift ) ); - //TODO check the error code + iRequests->iRequestCompletedList.Append( aRequest ); iRequests->iRequestCompletionValueList[ aRequest ] = aStatusToComplete; iCompleteChannelRequestDfc->Enque(); diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/ismpmultiplexer_dll/group/ismpmultiplexer.mmp --- a/connectivitylayer/isce/ismpmultiplexer_dll/group/ismpmultiplexer.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/ismpmultiplexer_dll/group/ismpmultiplexer.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -21,7 +21,6 @@ #include #include "kernel/kern_ext.mmh" - TARGET ismpmultiplexer.dll TARGETTYPE kext linkas ismpmultiplexer.dll @@ -41,7 +40,7 @@ USERINCLUDE ../inc USERINCLUDE ../../memmanager_dll/inc -// TODO OST TRACE USERINCLUDE ../traces +// OST TRACE USERINCLUDE ../traces OS_LAYER_SYSTEMINCLUDE NON_FOUNDATION_ADAPT_LAYER_SYSTEMINCLUDE diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/ismpmultiplexer_dll/inc/iscedefs.h --- a/connectivitylayer/isce/ismpmultiplexer_dll/inc/iscedefs.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/ismpmultiplexer_dll/inc/iscedefs.h Tue Oct 19 13:16:20 2010 +0300 @@ -20,9 +20,9 @@ #ifndef __ISCEDEFS_H__ #define __ISCEDEFS_H__ -// TODO: static configuration needs works -// TODO: Separate protocol spesific parts from generic ones. -// TODO: check dependenciest of. h files (definitions etc..) +// static configuration needs works +// Separate protocol spesific parts from generic ones. +// check dependenciest of. h files (definitions etc..) // L2 Multiplexing protocol identifiers. // Follow MeXe protocol diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/ismpmultiplexer_dll/inc/multiplexertrace.h --- a/connectivitylayer/isce/ismpmultiplexer_dll/inc/multiplexertrace.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/ismpmultiplexer_dll/inc/multiplexertrace.h Tue Oct 19 13:16:20 2010 +0300 @@ -59,7 +59,7 @@ #define ASSERT_THREAD_CONTEXT_ALWAYS( a )ASSERT_RESET_ALWAYS( NKern::CurrentContext() == NKern::EThread, a ); // IST API asserts -#define ISTAPI_ASSERT_KERNEL_THREAD_CONTEXT_ALWAYS NKern::CurrentContext() == NKern::EThread /* TODO Kernel thread context && ( Kern::CurrentThread().iThreadType!=EThreadUser || Kern::CurrentThread().iNThread.iCsCount > 0 )*/ +#define ISTAPI_ASSERT_KERNEL_THREAD_CONTEXT_ALWAYS NKern::CurrentContext() == NKern::EThread /* Kernel thread context && ( Kern::CurrentThread().iThreadType!=EThreadUser || Kern::CurrentThread().iNThread.iCsCount > 0 )*/ #endif // __MUX_TRACE_H__ diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/ismpmultiplexer_dll/inc/trxdefs.h --- a/connectivitylayer/isce/ismpmultiplexer_dll/inc/trxdefs.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/ismpmultiplexer_dll/inc/trxdefs.h Tue Oct 19 13:16:20 2010 +0300 @@ -37,6 +37,8 @@ ETrxPartnerOS, ETrxTest, // Only for testing purposes ETrxTest2, // Only for testing purposes + ETrxUSB, + ETrxBT, EAmountOfTrxs, // Not used by transceivers }; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/ismpmultiplexer_dll/src/multiplexer.cpp --- a/connectivitylayer/isce/ismpmultiplexer_dll/src/multiplexer.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/ismpmultiplexer_dll/src/multiplexer.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -75,8 +75,12 @@ temp = NULL; iShMultiplexers[ i ] = NULL; } - // No need to check, either we have it or we had reboted. - iShMultiplexersMutex->Close( NULL ); + + if ( iShMultiplexersMutex ) + { + iShMultiplexersMutex->Close( NULL ); + } + C_TRACE( ( _T( "DMultiplexer::~DMultiplexer<" ) ) ); } diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/ismpmultiplexer_dll/src/mux.cpp --- a/connectivitylayer/isce/ismpmultiplexer_dll/src/mux.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/ismpmultiplexer_dll/src/mux.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -207,12 +207,12 @@ { C_TRACE( ( _T( "DMux::Receive this 0x%x id %d msg 0x%x aMuxId 0x%x>" ), this, iShTrxId, &aMsg, aMuxPacket ) ); - const TUint8 protocolId = static_cast( aMuxPacket >> 24 ); // TODO macro - Kern::Printf( "protocolId=0x%x", protocolId );// TODO TBR (ToBeRemoved) + const TUint8 protocolId = static_cast( aMuxPacket >> 24 ); + C_TRACE( ( _T( "DMux::Receive this 0x%x id %d msg 0x%x aMuxId 0x%x protocolId 0x%x" ), this, iShTrxId, &aMsg, aMuxPacket, protocolId ) ); __ASSERT_NO_FAST_MUTEX; MUX_ASSERT_FAULT_MACRO( ( protocolId < EMuxAmountOfProtocols ), MTrxMuxIf::EInvalidMuxingHeader ); MUX_ASSERT_FAULT_MACRO( ( ISTAPI_ASSERT_KERNEL_THREAD_CONTEXT_ALWAYS ), MTrxMuxIf::ENotKernelThreadContext ); - // TODO ( aMsg.Length() != protocollenght) + // ( aMsg.Length() != protocollenght) NKern::FMWait( iFastMutex ); MMuxLinkIf* link = iShLinks[ protocolId ]; NKern::FMSignal( iFastMutex ); @@ -253,8 +253,8 @@ { C_TRACE( ( _T( "DMux::Send this 0x%x id %d msg 0x%x aLinkId 0x%x priority %d <>" ), this, iShTrxId, &aMsg, aLinkId, aPriority ) ); - TUint32 muxId = static_cast( aMsg.Length() | aLinkId << 24 ); // TODO macro - Kern::Printf( "muxId=0x%x", muxId );//TODO TBR + TUint32 muxId = static_cast( aMsg.Length() | aLinkId << 24 ); + C_TRACE( ( _T( "DMux::Send this 0x%x id %d msg 0x%x aLinkId 0x%x priority %d muxId 0x%x<>" ), this, iShTrxId, &aMsg, aLinkId, aPriority, muxId ) ); ASSERT_RESET_ALWAYS( ( iShTrx ), ( EMuxNullPtr2 | EDMuxTraceId << KClassIdentifierShift ) ); iShTrx->Transmit( aMsg, (MMuxTrxIf::TDataTransmitPriority) aPriority, muxId ); @@ -271,7 +271,7 @@ ) { - // TODO: Change status so that it can not be happen send from up and status change from down simultaneously + // Change status so that it can not be happen send from up and status change from down simultaneously for( TInt i( 0 ); i < EMuxAmountOfProtocols; i++ ) { MMuxLinkIf* link = iShLinks[ i ]; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/memmanager_dll/src/memmanager.cpp --- a/connectivitylayer/isce/memmanager_dll/src/memmanager.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/memmanager_dll/src/memmanager.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -124,7 +124,7 @@ C_TRACE( ( _T( "DMemManager::PoolAllocateDfc aPtr 0x%x>" ), aPtr ) ); DMemManager& tmp = *reinterpret_cast( aPtr ); - TRACE_ASSERT_ALWAYS;// See below TODO comment, needs a fix + TRACE_ASSERT_ALWAYS; NKern::FMWait( tmp.iFastMutex ); @@ -149,7 +149,7 @@ C_TRACE( ( _T( "DMemManager::PoolDeleteDfc aPtr 0x%x>" ), aPtr ) ); DMemManager& tmp = *reinterpret_cast( aPtr ); - TRACE_ASSERT_ALWAYS; // See below TODO comment, needs a fix + TRACE_ASSERT_ALWAYS; NKern::FMWait( tmp.iFastMutex ); ASSERT_RESET_ALWAYS( ( tmp.iPoolDeleteQueue.Count() > 0 ), ( EInvalidQueueCount | EDMemmanagerTraceId << KClassIdentifierShift ) ); @@ -258,7 +258,7 @@ */ TPtr8* DMemManager::DMemPool::Alloc( const TUint16 aSize ) { -// TODO : not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Alloc>" ) ) ); +// not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Alloc>" ) ) ); ASSERT_RESET_ALWAYS( (iMemoryArea || iFreeMemBlock), ( EMemBlockAllocationFailed | EDMemmanagerTraceId << KClassIdentifierShift ) ); @@ -282,7 +282,7 @@ iBlockUsage++; -// TODO : not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Alloc<" ) ) ); +// not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Alloc<" ) ) ); return iAllocatedMemBlock->iMemPtr; } @@ -292,7 +292,7 @@ */ TBool DMemManager::DMemPool::Free( const TUint8* aBlockAddress ) { -// TODO : not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Free>" ) ) ); +// not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Free>" ) ) ); struct sUnit *pCurUnit = (struct sUnit *)(aBlockAddress - sizeof(struct sUnit) ); @@ -314,7 +314,7 @@ iFreeMemBlock->iMemPtr->Zero(); iBlockUsage--; -// TODO : not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Free<" ) ) ); +// not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Free<" ) ) ); //If empty & ready to be deleted return ( iCopyPoolInUse && iBlockUsage == 0 ) ? ETrue : EFalse; @@ -366,7 +366,8 @@ __ASSERT_NO_FAST_MUTEX; ASSERT_THREAD_CONTEXT_ALWAYS( ( EDeallocNotThreadContext | EDMemmanagerTraceId << KClassIdentifierShift ) ); - + aBlock.FillZ( aBlock.MaxLength() ); + aBlock.SetLength(0); TBool removePool = EFalse; NKern::FMWait( DMemManager::iThisptr->iFastMutex ); diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/p2papi_dll/group/p2papi.mmp --- a/connectivitylayer/isce/p2papi_dll/group/p2papi.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/p2papi_dll/group/p2papi.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -37,7 +37,7 @@ USERINCLUDE ../inc USERINCLUDE ../../p2prouter_dll/inc -//TODO OST Traces USERINCLUDE ../traces +// OST Traces USERINCLUDE ../traces SYSTEMINCLUDE /epoc32/include NON_FOUNDATION_ADAPT_LAYER_SYSTEMINCLUDE diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/p2papi_dll/src/p2pif.cpp --- a/connectivitylayer/isce/p2papi_dll/src/p2pif.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/p2papi_dll/src/p2pif.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -107,9 +107,13 @@ ASSERT_PANIC_ALWAYS( ( KErrNone == loadStatus || KErrAlreadyExists == loadStatus), EP2PApiDriverLoadFailed ); TInt error( KErrInUse ); C_TRACE( ( _T( "RP2PIf::Open ldd" ) ) ); - TBuf8 info; + HBufC8* buffer = NULL; + TRAPD( err, buffer = HBufC8::NewL( KInfoLength ) ); + ASSERT_PANIC_ALWAYS( err == KErrNone, KErrNoMemory ); + + TPtr8 info = buffer->Des(); info.Append( aP2PProtocolId ); - // TODO: check wrong usage of driver load differently than from here + // check wrong usage of driver load differently than from here // KErrPermissionDenied( no capabilities) , KErrNotSupported (Wrong protocol id), KErrGeneral (DThread::Open), // KErrAlreadyExists same object had opened the interface with some other protocolid error = DoCreate( KP2PDriverName, @@ -118,6 +122,7 @@ NULL, &info, aType ); + delete buffer; if( KErrNone != error ) { C_TRACE( ( _T( "RP2PIf::Open 0x%x failed 0x%x error %d" ), this, aP2PProtocolId, error ) ); diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/p2prouter_dll/group/p2prouter.mmp --- a/connectivitylayer/isce/p2prouter_dll/group/p2prouter.mmp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/p2prouter_dll/group/p2prouter.mmp Tue Oct 19 13:16:20 2010 +0300 @@ -44,10 +44,10 @@ SOURCE p2pkernelchannel.cpp USERINCLUDE ../inc -// TODO: PATH DEFINITIONS +// PATH DEFINITIONS USERINCLUDE ../../ismpmultiplexer_dll/inc USERINCLUDE ../../memmanager_dll/inc -// TODO OST Trace USERINCLUDE ../traces +// OST Trace USERINCLUDE ../traces OS_LAYER_SYSTEMINCLUDE NON_FOUNDATION_ADAPT_LAYER_SYSTEMINCLUDE diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/p2prouter_dll/inc/p2pif.h --- a/connectivitylayer/isce/p2prouter_dll/inc/p2pif.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/p2prouter_dll/inc/p2pif.h Tue Oct 19 13:16:20 2010 +0300 @@ -105,7 +105,7 @@ // From MP2PIf end -// TODO other system presence + private: diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/p2prouter_dll/inc/p2prouter.h --- a/connectivitylayer/isce/p2prouter_dll/inc/p2prouter.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/p2prouter_dll/inc/p2prouter.h Tue Oct 19 13:16:20 2010 +0300 @@ -77,7 +77,7 @@ /* * See comments from MP2PChRouterIf */ - void Open( const TUint8 aProtocolId, MP2PRouterChIf* aCallback ); + void Connect( const TUint8 aProtocolId, MP2PRouterChIf* aCallback ); /* * See comments from MP2PChRouterIf @@ -116,6 +116,7 @@ public: MP2PRouterChIf* iChannel; MP2PRouterChIf* iWaitingChannel; + TBool iTrxConnectionStatus; }; // Guards class shared state of this class, owned diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/p2prouter_dll/inc/p2prouterchannelifs.h --- a/connectivitylayer/isce/p2prouter_dll/inc/p2prouterchannelifs.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/p2prouter_dll/inc/p2prouterchannelifs.h Tue Oct 19 13:16:20 2010 +0300 @@ -104,7 +104,7 @@ * @param aProtocolId, channels unique P2P identifier * @param aCallback, pointer to channel interface */ - virtual void Open( const TUint8 aProtocolId, MP2PRouterChIf* aCallback ) = 0; + virtual void Connect( const TUint8 aProtocolId, MP2PRouterChIf* aCallback ) = 0; /* * Sends a message to router. diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/p2prouter_dll/inc/p2puserchannel.h --- a/connectivitylayer/isce/p2prouter_dll/inc/p2puserchannel.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/p2prouter_dll/inc/p2puserchannel.h Tue Oct 19 13:16:20 2010 +0300 @@ -249,7 +249,7 @@ TUint8 iSize; // Guards internal states of this class. NFastMutex* iQueueMutex; - // Ring buffer must be as big as we have request. TODO: is there a danger to get more request..? + // Ring buffer must be as big as we have request. is there a danger to get more request..? TP2PReq iShReqRingBuffer[ EP2PLastAsyncRequest ]; // Active / Deactive requests are kept in list to make finding easier. TRequestStatus* iShReqList[ EP2PLastAsyncRequest ]; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/p2prouter_dll/src/p2pif.cpp --- a/connectivitylayer/isce/p2prouter_dll/src/p2pif.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/p2prouter_dll/src/p2pif.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -27,7 +27,7 @@ const TInt KFirstParam( 0 ); const TInt KSecondParam( 1 ); const TInt KThirdParam( 2 ); -const TInt KOneParam( 2 ); +const TInt KOneParam( 1 ); const TInt KTwoParams( 2 ); const TInt KThreeParams( 3 ); diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/p2prouter_dll/src/p2pkernelchannel.cpp --- a/connectivitylayer/isce/p2prouter_dll/src/p2pkernelchannel.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/p2prouter_dll/src/p2pkernelchannel.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -67,7 +67,7 @@ EP2PKernelChannelRxBufferNotReleased, }; -// TODO: Create a common Kernel channel FW (P2P, ISI, etc..) after APIs are locked +// Create a common Kernel channel FW (P2P, ISI, etc..) after APIs are locked DP2PKernelChannel::DP2PKernelChannel( // None @@ -106,7 +106,10 @@ iRx = NULL; C_TRACE( ( _T( "DP2PKernelChannel::~DP2PKernelChannel iEmptyRxDfc 0x%x" ), iEmptyRxDfc ) ); // Only modified in constructor, if not created already reseted. - iEmptyRxDfc->Cancel(); + if (iEmptyRxDfc) + { + iEmptyRxDfc->Cancel(); + } delete iEmptyRxDfc; iEmptyRxDfc = NULL; iPtrPtrToRxBuf = NULL; @@ -127,7 +130,7 @@ { C_TRACE( ( _T( "DP2PKernelChannel::HandleRequest 0x%x 0x%x 0x%x>" ), this, iP2PProtocolId, aMsg.iValue ) ); - // TODO : similar__NK_ASSERT_UNLOCKED; + __ASSERT_CRITICAL; // From kern_priv.h published partner __ASSERT_NO_FAST_MUTEX; // From nk_priv.h published partner. ASSERT_THREAD_CONTEXT_ALWAYS( ( EP2PKernelChannelNotThreadContext | EDP2PKernelChannelId << KClassIdentifierShift ) ); @@ -198,7 +201,7 @@ C_TRACE( ( _T( "DP2PKernelChannel::EnqueChannelRequestCompleteDfc 0x%x 0x%x %d %d 0x%x>" ), this, iP2PProtocolId, aRequest, aStatusToComplete ) ); ASSERT_THREAD_CONTEXT_ALWAYS( ( EP2PKernelChannelNotThreadContext2 | EDP2PKernelChannelId << KClassIdentifierShift ) ); - // TODO: assert router ext thread context + // assert router ext thread context if( aRequest == EP2PAsyncOpen ) { iP2PProtocolId = ( KErrNone == aStatusToComplete || KErrInUse == aStatusToComplete ) ? ~iP2PProtocolId : EP2PAmountOfProtocols; @@ -348,7 +351,7 @@ iP2PProtocolId = tablePtr[ KThirdParam ]; iP2PProtocolId = ~iP2PProtocolId; C_TRACE( ( _T( "DP2PKernelChannel::HandleDfcRequest EP2PNokiaKernelOpen 0x%x 0x%x 0x%x" ), this, iP2PProtocolId, ~iP2PProtocolId ) ); - iRouterIf->Open( ~iP2PProtocolId, this ); + iRouterIf->Connect( ~iP2PProtocolId, this ); break; } case EP2PAsyncReceive: @@ -532,7 +535,7 @@ { C_TRACE( ( _T( "DP2PKernelChannel::ResetQueues 0x%x 0x%x>" ), this, iP2PProtocolId ) ); - // TODO: assert router ext thread context + // assert router ext thread context if( iRx ) { C_TRACE( ( _T( "DP2PKernelChannel::ResetQueues 0x%x 0x%x iRx 0x%x" ), this, iP2PProtocolId, iRx ) ); diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/p2prouter_dll/src/p2plink.cpp --- a/connectivitylayer/isce/p2prouter_dll/src/p2plink.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/p2prouter_dll/src/p2plink.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -120,7 +120,7 @@ // No traces allowed due to not allowed to block. // Negation sets variable to be over EAmountOfTrxs if it is not present. - iShTrxId = ~iShTrxId;// TODO: check this atomicity and synch if needed + iShTrxId = ~iShTrxId;// check this atomicity and synch if needed iRouter->NotifyTrxPresenceEnqueDfc( aPresent ); } @@ -157,7 +157,7 @@ C_TRACE( ( _T( "DP2PLink::Send 0x%x 0x%x map %d <>" ), this, &aMsg, iProtocolId ) ); ASSERT_RESET_ALWAYS( iMux, ( EP2PInitFailed2 | EDP2PLinkTraceId << KClassIdentifierShift ) ); // Send with default prio. - iMux->Send( aMsg, iProtocolId ); // TODO: send priorities + iMux->Send( aMsg, iProtocolId ); // send priorities } diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/p2prouter_dll/src/p2prouter.cpp --- a/connectivitylayer/isce/p2prouter_dll/src/p2prouter.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/p2prouter_dll/src/p2prouter.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -91,21 +91,36 @@ for( TInt i( 0 ); i < EP2PAmountOfProtocols; i++ ) { MP2PRouterLinkIf* temp = iLinksArray[ i ]; - temp->Release(); - temp = NULL; + if ( temp ) + { + temp->Release(); + temp = NULL; + } iLinksArray[ i ] = NULL; } delete []iLinksArray; delete []iP2PDfcQueList; - iInitDfc->Cancel(); - delete iInitDfc; - iInitDfc = NULL; - iTrxPrecentDfc->Cancel(); - delete iTrxPrecentDfc; - iTrxPrecentDfc = NULL; - iTrxNotPrecentDfc->Cancel(); - delete iTrxNotPrecentDfc; - iTrxNotPrecentDfc = NULL; + + if ( iInitDfc ) + { + iInitDfc->Cancel();//what about this + delete iInitDfc; + iInitDfc = NULL; + } + + if ( iTrxPrecentDfc ) + { + iTrxPrecentDfc->Cancel();//what about this + delete iTrxPrecentDfc; + iTrxPrecentDfc = NULL; + } + + if ( iTrxNotPrecentDfc ) + { + iTrxNotPrecentDfc->Cancel();//what about this + delete iTrxNotPrecentDfc; + iTrxNotPrecentDfc = NULL; + } C_TRACE( ( _T( "DP2PRouter::~DP2PRouter<" ) ) ); } @@ -161,20 +176,20 @@ // From MP2PLinkRouterIf end // From MP2PChRouterIf start -void DP2PRouter::Open( +void DP2PRouter::Connect( const TUint8 aProtocolId, MP2PRouterChIf* aCallback ) { - C_TRACE( ( _T( "DP2PRouter::Open %d>" ), aProtocolId ) ); - // TODO : assert to check always called in p2p extension thread context + C_TRACE( ( _T( "DP2PRouter::Connect %d>" ), aProtocolId ) ); + // assert to check always called in p2p extension thread context ASSERT_RESET_ALWAYS( aCallback, EP2PRouterNullParam ); ASSERT_RESET_ALWAYS( aProtocolId < EP2PAmountOfProtocols, ( EP2PRouterWrongParam2 | EDP2PRouterTraceId << KClassIdentifierShift ) ); ASSERT_RESET_ALWAYS( iLinksArray[ aProtocolId ], ( EP2PRouterWrongParam3 | EDP2PRouterTraceId << KClassIdentifierShift ) ); if( iLinksArray[ aProtocolId ]->TrxPresent() ) { - C_TRACE( ( _T( "DP2PRouter::Open ok %d" ), aProtocolId ) ); + C_TRACE( ( _T( "DP2PRouter::Connect ok %d" ), aProtocolId ) ); NKern::FMWait( iShChannelTableFastMutex ); // Channel with the same protocol id is already opened or waiting to complete the opening. if( iShChannelTable[ aProtocolId ].iChannel || iShChannelTable[ aProtocolId ].iWaitingChannel ) @@ -182,7 +197,7 @@ NKern::FMSignal( iShChannelTableFastMutex ); // If another channel tries to open already open channel. TRACE_WARNING( iShChannelTable[ aProtocolId ].iChannel == aCallback, (TUint8)aProtocolId ); - aCallback->EnqueChannelRequestCompleteDfc( EP2PAsyncOpen, KErrInUse );//TODO: synch user and kernel APIs return values + aCallback->EnqueChannelRequestCompleteDfc( EP2PAsyncOpen, KErrInUse );// synch user and kernel APIs return values } else { @@ -193,13 +208,13 @@ } else { - C_TRACE( ( _T( "DP2PRouter::Open pending %d" ), aProtocolId ) ); + C_TRACE( ( _T( "DP2PRouter::Connect pending %d" ), aProtocolId ) ); ASSERT_RESET_ALWAYS( !iShChannelTable[ aProtocolId ].iWaitingChannel, EP2PRouterWrongRequest ); NKern::FMWait( iShChannelTableFastMutex ); iShChannelTable[ aProtocolId ].iWaitingChannel = aCallback; NKern::FMSignal( iShChannelTableFastMutex ); } - C_TRACE( ( _T( "DP2PRouter::Open %d<" ), aProtocolId ) ); + C_TRACE( ( _T( "DP2PRouter::Connect %d<" ), aProtocolId ) ); } @@ -209,7 +224,7 @@ { C_TRACE( ( _T( "DP2PRouter::Close %d>" ), aProtocolId ) ); - // TODO : assert to check always called in p2p extension thread context + // assert to check always called in p2p extension thread context ASSERT_RESET_ALWAYS( aProtocolId < EP2PAmountOfProtocols, ( EP2PRouterWrongParam4 | EDP2PRouterTraceId << KClassIdentifierShift ) ); NKern::FMWait( iShChannelTableFastMutex ); if( iShChannelTable[ aProtocolId ].iChannel || iShChannelTable[ aProtocolId ].iWaitingChannel ) @@ -263,7 +278,7 @@ { C_TRACE( ( _T( "DP2PRouter::Send 0x%x>" ), &aMessage ) ); - // TODO : assert to check always called in p2p extension thread context + // assert to check always called in p2p extension thread context // Inside link array limits, if not programmer error. ASSERT_RESET_ALWAYS( aProtocolId < EP2PAmountOfProtocols, ( EP2PRouterWrongParam7 | EDP2PRouterTraceId << KClassIdentifierShift ) ); MP2PRouterLinkIf* link = iLinksArray[ aProtocolId ]; @@ -306,8 +321,9 @@ { iShChannelTable[ i ].iChannel = NULL; iShChannelTable[ i ].iWaitingChannel = NULL; + iShChannelTable[ i ].iTrxConnectionStatus = EFalse; } - // TODO:do more clever way to create links. + // do more clever way to create links. // Configuration of links. iLinksArray[ EP2PRpc ] = MP2PRouterLinkIf::CreateLinkF( this, EP2PRpc, ETrxSharedMemory ); iLinksArray[ EP2PTest ] = MP2PRouterLinkIf::CreateLinkF( this, EP2PTest, ETrxTest ); @@ -345,21 +361,29 @@ { TUint8 protocolId( i ); C_TRACE( ( _T( "DP2PRouter::TrxPrecentDfc Trx present id=0x%x" ), protocolId ) ); - NKern::FMWait( self.iShChannelTableFastMutex ); - MP2PRouterChIf* waitingChannel = self.iShChannelTable[ protocolId ].iWaitingChannel; - if( waitingChannel ) + if ( !self.iShChannelTable[ protocolId ].iTrxConnectionStatus && + self.ConnectionExist( protocolId ) ) { - self.iShChannelTable[ protocolId ].iChannel = waitingChannel; - NKern::FMSignal( self.iShChannelTableFastMutex ); - C_TRACE( ( _T( "DP2PRouter::TrxPrecentDfc channel open waiting %d>" ), protocolId ) ); - waitingChannel->EnqueChannelRequestCompleteDfc( EP2PAsyncOpen, KErrNone ); + // Trx status changed + C_TRACE( ( _T( "DP2PRouter::TrxPrecentDfc Trx 0x%x present" ), protocolId ) ); + self.iShChannelTable[ protocolId ].iTrxConnectionStatus = ETrue; + NKern::FMWait( self.iShChannelTableFastMutex ); + MP2PRouterChIf* waitingChannel = self.iShChannelTable[ protocolId ].iWaitingChannel; + if( waitingChannel ) + { + self.iShChannelTable[ protocolId ].iChannel = waitingChannel; + NKern::FMSignal( self.iShChannelTableFastMutex ); + C_TRACE( ( _T( "DP2PRouter::TrxPrecentDfc channel open waiting %d>" ), protocolId ) ); + waitingChannel->EnqueChannelRequestCompleteDfc( EP2PAsyncOpen, KErrNone ); + } + else + { + // No need to inform presence, when connection is lost it is closed too and must be opened again. + NKern::FMSignal( self.iShChannelTableFastMutex ); + C_TRACE( ( _T( "DP2PRouter::TrxPrecentDfc nothing waiting %d>" ), protocolId ) ); + } } - else - { - // No need to inform presence, when connection is lost it is closed too and must be opened again. - NKern::FMSignal( self.iShChannelTableFastMutex ); - C_TRACE( ( _T( "DP2PRouter::TrxPrecentDfc nothing waiting %d>" ), protocolId ) ); - } + // No else: If trx status not changed no need to react } C_TRACE( ( _T( "DP2PRouter::TrxPrecentDfc<" )) ); @@ -376,21 +400,27 @@ for( TUint8 i( 0 ); i < EP2PAmountOfProtocols; i++ ) { TUint8 protocolId( i ); - C_TRACE( ( _T( "DP2PRouter::TrxNotPrecentDfc Trx lost id=0x%x" ), protocolId ) ); - // Notifying channel that connection is lost and discard any received messages. - NKern::FMWait( self.iShChannelTableFastMutex ); - MP2PRouterChIf* channel = self.iShChannelTable[ protocolId ].iChannel; - if( channel ) - { - NKern::FMSignal( self.iShChannelTableFastMutex ); - C_TRACE( ( _T( "DP2PRouter::TrxNotPrecentDfc Trx lost channel found for id=0x%x" ), protocolId ) ); - channel->ConnectionLost(); + if ( self.iShChannelTable[ protocolId ].iTrxConnectionStatus && + !self.ConnectionExist( protocolId ) ) + { + C_TRACE( ( _T( "DP2PRouter::TrxNotPrecentDfc Trx lost id=0x%x" ), protocolId ) ); + self.iShChannelTable[ protocolId ].iTrxConnectionStatus = EFalse; + // Notifying channel that connection is lost and discard any received messages. + NKern::FMWait( self.iShChannelTableFastMutex ); + MP2PRouterChIf* channel = self.iShChannelTable[ protocolId ].iChannel; + if( channel ) + { + NKern::FMSignal( self.iShChannelTableFastMutex ); + C_TRACE( ( _T( "DP2PRouter::TrxNotPrecentDfc Trx lost channel found for id=0x%x" ), protocolId ) ); + channel->ConnectionLost(); + } + else + { + NKern::FMSignal( self.iShChannelTableFastMutex ); + C_TRACE( ( _T( "DP2PRouter::TrxNotPrecentDfc Trx lost no channel found for id=0x%x" ), protocolId ) ); + } } - else - { - NKern::FMSignal( self.iShChannelTableFastMutex ); - C_TRACE( ( _T( "DP2PRouter::TrxNotPrecentDfc Trx lost no channel found for id=0x%x" ), protocolId ) ); - } + // No else: If trx status not changed no need to react } C_TRACE( ( _T( "DP2PRouter::TrxNotPrecentDfc<" )) ); diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/p2prouter_dll/src/p2puserchannel.cpp --- a/connectivitylayer/isce/p2prouter_dll/src/p2puserchannel.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/p2prouter_dll/src/p2puserchannel.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -27,9 +27,11 @@ enum TP2PUserChannelFaults { - EP2PUserChannelMemAllocFail = 0x00, + EP2PUserChannelMemAllocFail = 0x01, EP2PUserChannelMemAllocFail1, EP2PUserChannelMemAllocFail2, + EP2PUserChannelMemAllocFail3, + EP2PUserChannelMemAllocFail4, EP2PUserChannelWrongRequest, EP2PUserChannelWrongRequest1, EP2PUserChannelWrongRequest2, @@ -69,6 +71,7 @@ EP2PUserChannelReqQueueOutOfSync7, EP2PUserChannelReqQueueOverTheLimits, EP2PUserChannelReqQueueOverTheLimits2, + EP2PUserChannelReqQueueOverTheLimits3, EP2PUserChannelReqQueueWrongRequest, EP2PUserChannelReqQueueWrongRequest2, EP2PUserChannelReqQueueMemoryAllocFailure, @@ -188,9 +191,17 @@ if( !Kern::CurrentThreadHasCapability( ECapabilityCommDD, __PLATSEC_DIAGNOSTIC_STRING( "Check by: P2PRouter" ) ) ) return KErrPermissionDenied; TRACE_ASSERT_INFO( anInfo, EP2PUserChannelProtocolIdNotSpecified ); // Check for channel number inside anInfo. - TRACE_ASSERT_INFO( anInfo->Length() > 0, ( EP2PUserChannelOverTheArrayLimits | EDP2PUserChannelTraceId << KClassIdentifierShift ) ); - if( !anInfo || anInfo->Length() == 0 ) return KErrNotSupported; - TUint8 protocolId = static_cast( ( *anInfo )[ 0 ] ); + TUint8* buffer = reinterpret_cast( Kern::Alloc( 1 ) ); + + + TPtr8* bufferPtr = new TPtr8( buffer, 1 ); + ASSERT_RESET_ALWAYS( bufferPtr && buffer, EP2PUserChannelMemAllocFail3 | EDP2PUserChannelTraceId << KClassIdentifierShift ); + + ASSERT_RESET_ALWAYS( KErrNone == Kern::ThreadDesRead( iThread, anInfo, *bufferPtr, 0, KChunkShiftBy0 ), EP2PUserChannelMemAllocFail4 | EDP2PUserChannelTraceId << KClassIdentifierShift ); + ASSERT_RESET_ALWAYS( bufferPtr->Length() > 0 , EP2PUserChannelReqQueueOverTheLimits3 | EDP2PUserChannelTraceId << KClassIdentifierShift); + + TUint8 protocolId = static_cast( ( *bufferPtr )[ 0 ] ); + TRACE_ASSERT_INFO( ( protocolId < EP2PAmountOfProtocols ), ( EP2PUserChannelWrongParam | EDP2PUserChannelTraceId << KClassIdentifierShift ) ); if( protocolId >= EP2PAmountOfProtocols ) return KErrNotSupported; TInt err( Kern::MutexWait( *iShP2PProtocolIdMutex ) ); @@ -447,7 +458,7 @@ C_TRACE( ( _T( "DP2PUserChannel::CompleteChReqDfc>" ) ) ); // Make sure that user side is accessed only by ldd DFCThread. ASSERT_THREAD_CONTEXT_ALWAYS( ( EP2PIUserChannelfNotThreadContext2 | EDP2PUserChannelTraceId << KClassIdentifierShift ) ); - //TODO ASSERT_DFCTHREAD_INLDD(); + // ASSERT_DFCTHREAD_INLDD(); DP2PUserChannel* chPtr = reinterpret_cast( aPtr ); C_TRACE( ( _T( "DP2PUserChannel::CompleteChReqDfc 0x%x 0x%x" ), chPtr, chPtr->iShP2PProtocolId ) ); TP2PReq requ = chPtr->iP2PReqQueue->Get(); @@ -478,7 +489,7 @@ ) { -// TODO ASSERT_DFCTHREAD_INLDD(); +// ASSERT_DFCTHREAD_INLDD(); DP2PUserChannel& chTmp = *reinterpret_cast( aPtr ); C_TRACE( ( _T( "DP2PUserChannel::EmptyRxQueueDfc 0x%x 0x%x>" ), &chTmp, chTmp.iShP2PProtocolId ) ); if( ( chTmp.iP2PReqQueue->GetReq( EP2PAsyncReceive ) ) && ( chTmp.iRx->Count() > 0 ) ) @@ -554,7 +565,7 @@ { C_TRACE( ( _T( "DP2PUserChannel::HandleAsyncRequest 0x%x 0x%x EP2PAsyncOpen" ), this, iShP2PProtocolId ) ); // Set open to pending to router, router completes it when the interconnection to other point is ready. - iRouterIf->Open( ~iShP2PProtocolId, this ); + iRouterIf->Connect( ~iShP2PProtocolId, this ); break; } case EP2PAsyncReceive: diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isce/rom/isce.iby --- a/connectivitylayer/isce/rom/isce.iby Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isce/rom/isce.iby Tue Oct 19 13:16:20 2010 +0300 @@ -16,32 +16,29 @@ */ -//#define INTERNAL_FLAG_ISI_ROUTER_IN_USE // see communicationmanager too -// TODO KEXT start order with one .iby if possible (no coreos..ibys) +// KEXT start order with one .iby if possible (no coreos..ibys) #ifndef __ISCE_IBY__ #define __ISCE_IBY__ -extension[VARID]=KERNEL_DIR\DEBUG_DIR\memmanager.dll \Sys\Bin\memmanager.dll -extension[VARID]=KERNEL_DIR\DEBUG_DIR\ismpmultiplexer.dll \Sys\Bin\ismpmultiplexer.dll -extension[VARID]=KERNEL_DIR\DEBUG_DIR\p2prouter.dll \Sys\Bin\p2prouter.dll -file=ABI_DIR\DEBUG_DIR\p2papi.dll SHARED_LIB_DIR\p2papi.dll +extension[VARID]=KERNEL_DIR\BUILD_DIR\memmanager.dll \Sys\Bin\memmanager.dll +extension[VARID]=KERNEL_DIR\BUILD_DIR\ismpmultiplexer.dll \Sys\Bin\ismpmultiplexer.dll +extension[VARID]=KERNEL_DIR\BUILD_DIR\p2prouter.dll \Sys\Bin\p2prouter.dll +file=ABI_DIR\BUILD_DIR\p2papi.dll SHARED_LIB_DIR\p2papi.dll #define ISAACCESSDRIVER_IBY // To prevent problems with old IAD -#ifdef INTERNAL_FLAG_ISI_ROUTER_IN_USE -extension[VARID]=KERNEL_DIR\DEBUG_DIR\isirouter.dll \Sys\Bin\isirouter.dll -file=ABI_DIR\DEBUG_DIR\isiapi.dll SHARED_LIB_DIR\isiapi.dll -extension[VARID]=KERNEL_DIR\DEBUG_DIR\isinameservice_isirouter.dll \Sys\Bin\isinameservice_isirouter.dll -extension[VARID]=KERNEL_DIR\DEBUG_DIR\isicommunicationmanager_isirouter.dll \Sys\Bin\isicommunicationmanager_isirouter.dll +extension[VARID]=KERNEL_DIR\BUILD_DIR\isirouter.dll \Sys\Bin\isirouter.dll +file=ABI_DIR\BUILD_DIR\isiapi.dll SHARED_LIB_DIR\isiapi.dll +extension[VARID]=KERNEL_DIR\BUILD_DIR\isinameservice.dll \Sys\Bin\isinameservice.dll +extension[VARID]=KERNEL_DIR\BUILD_DIR\isicommunicationmanager.dll \Sys\Bin\isicommunicationmanager.dll -#endif // INTERNAL_FLAG_ISI_ROUTER_IN_USE +extension[VARID]=KERNEL_DIR\BUILD_DIR\isipipehandler.dll \Sys\Bin\isipipehandler.dll -file=ABI_DIR\DEBUG_DIR\iscapi.dll SHARED_LIB_DIR\iscapi.dll -device[VARID]=KERNEL_DIR\DEBUG_DIR\isaaccessldd.ldd SHARED_LIB_DIR\isaaccessldd.ldd -extension[VARID]=KERNEL_DIR\DEBUG_DIR\isaaccessextension.dll \Sys\Bin\isaaccessextension.dll -extension[VARID]=KERNEL_DIR\DEBUG_DIR\isinameservice.dll \Sys\Bin\isinameservice.dll -extension[VARID]=KERNEL_DIR\DEBUG_DIR\isicommunicationmanager.dll \Sys\Bin\isicommunicationmanager.dll +file=ABI_DIR\BUILD_DIR\iscapi.dll SHARED_LIB_DIR\iscapi.dll +device[VARID]=KERNEL_DIR\BUILD_DIR\isaaccessldd.ldd SHARED_LIB_DIR\isaaccessldd.ldd +extension[VARID]=KERNEL_DIR\BUILD_DIR\isaaccessextension.dll \Sys\Bin\isaaccessextension.dll + #endif // __ISCE_IBY__ diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isimessage/group/bld.inf --- a/connectivitylayer/isimessage/group/bld.inf Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isimessage/group/bld.inf Tue Oct 19 13:16:20 2010 +0300 @@ -18,7 +18,6 @@ #include -#include "../ftcommonif/group/bld.inf" PRJ_PLATFORMS @@ -55,8 +54,8 @@ ../symbianisamacroif/include/wgmodem25/net_modemisi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(wgmodem25/net_modemisi.h) ../symbianisamacroif/include/wgmodem25/nvdisi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(wgmodem25/nvdisi.h) ../symbianisamacroif/include/wgmodem25/phonetisi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(wgmodem25/phonetisi.h) -../symbianisamacroif/include/wgmodem25/pipeisi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(wgmodem25/pipeisi.h) -../symbianisamacroif/include/wgmodem25/pipe_sharedisi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(wgmodem25/pipe_sharedisi.h) +//../symbianisamacroif/include/wgmodem25/pipeisi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(wgmodem25/pipeisi.h) +//../symbianisamacroif/include/wgmodem25/pipe_sharedisi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(wgmodem25/pipe_sharedisi.h) ../symbianisamacroif/include/wgmodem25/pn_const.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(wgmodem25/pn_const.h) ../symbianisamacroif/include/wgmodem25/pn_eventmodem_extisi.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(wgmodem25/pn_eventmodem_extisi.h) ../symbianisamacroif/include/wgmodem25/product_profile_definitions.h NON_FOUNDATION_ADAPT_LAYER_EXPORT_PATH(wgmodem25/product_profile_definitions.h) diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/call_modemisi.h --- a/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/call_modemisi.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/call_modemisi.h Tue Oct 19 13:16:20 2010 +0300 @@ -14,7 +14,7 @@ * * Description: * Name : PN_MODEM_CALL [ 0xC9 ] Resource Modem Call Server -* Version : 002.002 +* Version : 002.004 * * Documentation: www.wirelessmodemapi.com * @@ -25,7 +25,7 @@ #define _SYMBIAN_ISI_CALL_MODEMISI_H_ #define MODEM_CALL_SERVER_ISI_VERSION_Z 2 -#define MODEM_CALL_SERVER_ISI_VERSION_Y 2 +#define MODEM_CALL_SERVER_ISI_VERSION_Y 5 //CONSTANTS @@ -36,6 +36,8 @@ #define CALL_MODEM_NO_LINK_ID 0x00 #define CALL_MODEM_DTMF_DEFAULT 0x00 #define CALL_MODEM_DTMF_NO_DELAY 0x01 +#define CALL_MODEM_NULL 0x00 +#define CALL_MODEM_STATUS_SWAP_INITIATED 0x10 //TABLES @@ -188,7 +190,6 @@ #define CALL_MODEM_STATUS_HOLD 0x0C #define CALL_MODEM_STATUS_RETRIEVE_INITIATED 0x0D #define CALL_MODEM_STATUS_RECONNECT_PENDING 0x0E -#define CALL_MODEM_STATUS_SWAP_INITIATED 0x10 //BitmaskTables for CALL_MODEM_PRESENT_INFO #define CALL_MODEM_PRESENT 0x00 @@ -1215,6 +1216,19 @@ #define SIZE_CALL_MODEM_SB_REQ_INFO 4 +//Definition for CALL_MODEM_SB_EMERG_NUMBER_MOD_INFO +#define CALL_MODEM_SB_EMERG_NUMBER_MOD_INFO 0x4C +#define CALL_MODEM_SB_EMERG_NUMBER_MOD_INFO_OFFSET_SUBBLOCKID 0 //size 1 byte(s) +#define CALL_MODEM_SB_EMERG_NUMBER_MOD_INFO_OFFSET_SUBBLOCKLEN 1 //size 1 byte(s) +#define CALL_MODEM_SB_EMERG_NUMBER_MOD_INFO_OFFSET_LINKID 2 //size 1 byte(s) +#define CALL_MODEM_SB_EMERG_NUMBER_MOD_INFO_OFFSET_SERVCATEGORY 3 //size 1 byte(s) +#define CALL_MODEM_SB_EMERG_NUMBER_MOD_INFO_OFFSET_MCCDIGIT1 4 //size 1 byte(s) +#define CALL_MODEM_SB_EMERG_NUMBER_MOD_INFO_OFFSET_MCCDIGIT2 5 //size 1 byte(s) +#define CALL_MODEM_SB_EMERG_NUMBER_MOD_INFO_OFFSET_MCCDIGIT3 6 //size 1 byte(s) +#define CALL_MODEM_SB_EMERG_NUMBER_MOD_INFO_OFFSET_MCCRANGE 7 //size 1 byte(s) +#define SIZE_CALL_MODEM_SB_EMERG_NUMBER_MOD_INFO 8 + + //MESSAGES diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/gpds_sharedisi.h --- a/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/gpds_sharedisi.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/gpds_sharedisi.h Tue Oct 19 13:16:20 2010 +0300 @@ -24,7 +24,7 @@ #define _SYMBIAN_ISI_GPDS_SHAREDISI_H_ #define GPDS_SHARED_SUBBLOCK_DESCRIPTIONS_ISI_VERSION_Z 19 -#define GPDS_SHARED_SUBBLOCK_DESCRIPTIONS_ISI_VERSION_Y 1 +#define GPDS_SHARED_SUBBLOCK_DESCRIPTIONS_ISI_VERSION_Y 3 //CONSTANTS diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/gpdsisi.h --- a/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/gpdsisi.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/gpdsisi.h Tue Oct 19 13:16:20 2010 +0300 @@ -24,7 +24,7 @@ #define _SYMBIAN_ISI_GPDSISI_H_ #define GENERAL_PACKET_DATA_SERVER_ISI_VERSION_Z 19 -#define GENERAL_PACKET_DATA_SERVER_ISI_VERSION_Y 1 +#define GENERAL_PACKET_DATA_SERVER_ISI_VERSION_Y 3 //CONSTANTS @@ -40,6 +40,7 @@ #define GPDS_ANY_SIZE 0x01 #define GPDS_CID_VOID 0xFF #define GPDS_CID_ALL 0xFE +#define GPDS_DISABLE 0x00 //TABLES @@ -267,6 +268,7 @@ #define GPDS_AOL_CTX_HPLMN_ACTIVE 0x01 #define GPDS_AOL_CTX_VPLMN_ACTIVE 0x02 #define GPDS_AOL_CTX_ACTIVE 0x03 +#define GPDS_AOL_CTX_DEFAULT 0xFF //ConstantTable for GPDS_RESOURCE_CONTROL_RESULT #define GPDS_ALLOWED 0x01 @@ -290,6 +292,13 @@ //BitmaskTables for GPDS_RESOURCE_IDS_CONF_REQ #define GPDS_RES_ID_CONF_CC_FOR_GPRS 0x01 +//ConstantTable for GPDS_DATA_COUNTER_SETTINGS +#define GPDS_DATA_COUNTER_SETTING_DEFAULT 0x00 +#define GPDS_DATA_COUNTER_SETTING_TIME 0x01 +#define GPDS_DATA_COUNTER_SETTING_TRANSFER 0x02 +#define GPDS_DATA_COUNTER_SETTING_BOTH 0x03 + + //ConstantTable for FtdTable #define FTD_SB_GPDS_ATT_AND_PDP 0x10 #define FTD_SB_GPDS_NSAPI_1 0x11 @@ -1053,6 +1062,18 @@ #define SIZE_GPDS_RESOURCE_CONF_REQUIRED 4 +//Definition for GPDS_DATA_COUNTER_INFO +#define GPDS_DATA_COUNTER_INFO 0xA8 +#define GPDS_DATA_COUNTER_INFO_OFFSET_ID 0 //size 1 byte(s) +#define GPDS_DATA_COUNTER_INFO_OFFSET_LENGTH 1 //size 1 byte(s) +#define GPDS_DATA_COUNTER_INFO_OFFSET_CID 2 //size 1 byte(s) +#define GPDS_DATA_COUNTER_INFO_OFFSET_FILLERBYTE1 3 //size 1 byte(s) +#define GPDS_DATA_COUNTER_INFO_OFFSET_RXCOUNT 4 //size 8 byte(s) +#define GPDS_DATA_COUNTER_INFO_OFFSET_TXCOUNT 12 //size 8 byte(s) +#define SIZE_GPDS_DATA_COUNTER_INFO 20 +//NOTE: Definition contains array(s) or sequence(s). SIZE_ and offsets following array or sequence might be defined incorrectly. + + //MESSAGES @@ -1599,4 +1620,43 @@ #define GPDS_RESOURCE_CONF_IND_OFFSET_SUBBLOCKS 3 //size 1 byte(s) #define SIZE_GPDS_RESOURCE_CONF_IND 4 + +//Definition for GPDS_DATA_COUNTER_REQ +#define GPDS_DATA_COUNTER_REQ 0x58 +#define GPDS_DATA_COUNTER_REQ_OFFSET_TRANSID 0 //size 1 byte(s) +#define GPDS_DATA_COUNTER_REQ_OFFSET_MESSAGEID 1 //size 1 byte(s) +#define GPDS_DATA_COUNTER_REQ_OFFSET_CONFSTATUS 2 //size 1 byte(s) +#define GPDS_DATA_COUNTER_REQ_OFFSET_FILLERBYTE1 3 //size 1 byte(s) +#define GPDS_DATA_COUNTER_REQ_OFFSET_UPDATEINTERVALTIME 4 //size 4 byte(s) +#define GPDS_DATA_COUNTER_REQ_OFFSET_UPDATEINTERVALDATACOUNT 8 //size 4 byte(s) +#define SIZE_GPDS_DATA_COUNTER_REQ 12 + + +//Definition for GPDS_DATA_COUNTER_RESP +#define GPDS_DATA_COUNTER_RESP 0x59 +#define GPDS_DATA_COUNTER_RESP_OFFSET_TRANSID 0 //size 1 byte(s) +#define GPDS_DATA_COUNTER_RESP_OFFSET_MESSAGEID 1 //size 1 byte(s) +#define GPDS_DATA_COUNTER_RESP_OFFSET_FILLERBYTE1 2 //size 2 byte(s) +#define GPDS_DATA_COUNTER_RESP_OFFSET_TOTALRXCOUNT 4 //size 8 byte(s) +#define GPDS_DATA_COUNTER_RESP_OFFSET_TOTALTXCOUNT 12 //size 8 byte(s) +#define GPDS_DATA_COUNTER_RESP_OFFSET_FILLERBYTE2 20 //size 2 byte(s) +#define GPDS_DATA_COUNTER_RESP_OFFSET_FILLERBYTE3 22 //size 1 byte(s) +#define GPDS_DATA_COUNTER_RESP_OFFSET_SUBBLOCKCOUNT 23 //size 1 byte(s) +#define SIZE_GPDS_DATA_COUNTER_RESP 24 +//NOTE: Definition contains array(s) or sequence(s). SIZE_ and offsets following array or sequence might be defined incorrectly. + + +//Definition for GPDS_DATA_COUNTER_IND +#define GPDS_DATA_COUNTER_IND 0x5A +#define GPDS_DATA_COUNTER_IND_OFFSET_TRANSID 0 //size 1 byte(s) +#define GPDS_DATA_COUNTER_IND_OFFSET_MESSAGEID 1 //size 1 byte(s) +#define GPDS_DATA_COUNTER_IND_OFFSET_FILLERBYTE1 2 //size 2 byte(s) +#define GPDS_DATA_COUNTER_IND_OFFSET_TOTALRXCOUNT 4 //size 8 byte(s) +#define GPDS_DATA_COUNTER_IND_OFFSET_TOTALTXCOUNT 12 //size 8 byte(s) +#define GPDS_DATA_COUNTER_IND_OFFSET_FILLERBYTE2 20 //size 2 byte(s) +#define GPDS_DATA_COUNTER_IND_OFFSET_FILLERBYTE3 22 //size 1 byte(s) +#define GPDS_DATA_COUNTER_IND_OFFSET_SUBBLOCKCOUNT 23 //size 1 byte(s) +#define SIZE_GPDS_DATA_COUNTER_IND 24 +//NOTE: Definition contains array(s) or sequence(s). SIZE_ and offsets following array or sequence might be defined incorrectly. + #endif \ No newline at end of file diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/gssisi.h --- a/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/gssisi.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/gssisi.h Tue Oct 19 13:16:20 2010 +0300 @@ -13,7 +13,7 @@ * * Description: * Name : PN_GSS [ 0x32 ] Resource GSM Stack Server -* Version : 008.002 +* Version : 008.005 * * Documentation: www.wirelessmodemapi.com * @@ -23,16 +23,12 @@ #ifndef _SYMBIAN_ISI_GSSISI_H_ #define _SYMBIAN_ISI_GSSISI_H_ -#define GSM_STACK_SERVER_ISI_VERSION_Z 8 -#define GSM_STACK_SERVER_ISI_VERSION_Y 2 +#define GSM_STACK_SERVER_ISI_VERSION_Z 9 +#define GSM_STACK_SERVER_ISI_VERSION_Y 0 //CONSTANTS #define GSS_FILL 0x00 -#define GSS_FTD_FIRST_SUB_BLOCK 0x3200 -#define GSS_FTD_FIRST_WORD_SUB_BLOCK 0x3400 -#define GSS_FTD_FIRST_DWORD_SUB_BLOCK 0x3600 -#define GSS_FTD_FIRST_STRING_SUB_BLOCK 0x3800 #define GSS_GENERAL_ISI_DATA_HDR_LEN 0x02 #define GSS_DATA_IND_LENGTH 0x04 #define GSS_SUBBLOCK_HEADER_LENGTH 0x04 @@ -42,344 +38,12 @@ #define GSS_SGW_IP_ADDRESS_LENGTH 0x10 #define GSS_UNC_IP_ADDRESS_LENGTH 0x10 #define GSS_SRV_NO_FQDN 0x00 +#define GSS_ENV_INFO_STATUS_UNKNOWN 0x00 #define GSS_ANY_SIZE 0x01 //TABLES -//ConstantTable for FtdTable -#define FTD_SB_RX_LEVEL 0x3200 -#define FTD_SB_TIME_SLOT 0x3201 -#define FTD_SB_TIMING_ADV 0x3202 -#define FTD_SB_RX_QUALITY 0x3203 -#define FTD_SB_RADIO_LINK_TIMEOUT 0x3204 -#define FTD_SB_MAX_RAND_ACC_TRA 0x3205 -#define FTD_SB_BSIC 0x3206 -#define FTD_SB_LAST_CALL_REL_REAS 0x3207 -#define FTD_SB_CELL_RESEL_OFFSET 0x3208 -#define FTD_SB_TEMP_OFFSET 0x3209 -#define FTD_SB_HOPP_CH 0x320A -#define FTD_SB_MOB_ALLOC_INDEX 0x320B -#define FTD_SB_HSN 0x320C -#define FTD_SB_RX_LEVEL_1_NEIGH 0x320D -#define FTD_SB_RX_LEVEL_2_NEIGH 0x320E -#define FTD_SB_RX_LEVEL_3_NEIGH 0x320F -#define FTD_SB_RX_LEVEL_4_NEIGH 0x3210 -#define FTD_SB_RX_LEVEL_5_NEIGH 0x3211 -#define FTD_SB_RX_LEVEL_6_NEIGH 0x3212 -#define FTD_SB_RX_LEVEL_7_NEIGH 0x3213 -#define FTD_SB_RX_LEVEL_8_NEIGH 0x3214 -#define FTD_SB_T3212 0x3215 -#define FTD_SB_T3212_TIMEOUT 0x3216 -#define FTD_SB_PRP 0x3217 -#define FTD_SB_LAST_NORMAL_LOC_UP_REASON 0x3218 -#define FTD_SB_LAST_IMSI_ATT_FAIL_REASON 0x3219 -#define FTD_SB_RESET_HANDOVERS 0x321A -#define FTD_SB_RESET_TEST_COUNTERS 0x321B -#define FTD_SB_LAST_MO_SMS_FAIL 0x321C -#define FTD_SB_LAST_MT_SMS_FAIL 0x321D -#define FTD_SB_DTX_STATUS_CHANGE 0x321E -#define FTD_SB_CELL_BARR_IND_STATUS_CHANGE 0x321F -#define FTD_SB_RESET_TEST_TIMERS 0x3220 -#define FTD_SB_MAIN_CH_PLACE 0x3221 -#define FTD_SB_MAIN_CH_PWR_CONTROL 0x3222 -#define FTD_SB_PWR_CONTROL_TS_0 0x3223 -#define FTD_SB_PWR_CONTROL_TS_1 0x3224 -#define FTD_SB_PWR_CONTROL_TS_2 0x3225 -#define FTD_SB_PWR_CONTROL_TS_3 0x3226 -#define FTD_SB_PWR_CONTROL_TS_4 0x3227 -#define FTD_SB_PWR_CONTROL_TS_5 0x3228 -#define FTD_SB_PWR_CONTROL_TS_6 0x3229 -#define FTD_SB_PWR_CONTROL_TS_7 0x322A -#define FTD_SB_PH_TAI 0x322B -#define FTD_SB_SAME_RA_AS_SRV_CELL_1_NEIGH 0x322C -#define FTD_SB_SAME_RA_AS_SRV_CELL_2_NEIGH 0x322D -#define FTD_SB_SAME_RA_AS_SRV_CELL_3_NEIGH 0x322E -#define FTD_SB_SAME_RA_AS_SRV_CELL_4_NEIGH 0x322F -#define FTD_SB_SAME_RA_AS_SRV_CELL_5_NEIGH 0x3230 -#define FTD_SB_SAME_RA_AS_SRV_CELL_6_NEIGH 0x3231 -#define FTD_SB_CELL_BAR_ACC_2_1_NEIGH 0x3232 -#define FTD_SB_CELL_BAR_ACC_2_2_NEIGH 0x3233 -#define FTD_SB_CELL_BAR_ACC_2_3_NEIGH 0x3234 -#define FTD_SB_CELL_BAR_ACC_2_4_NEIGH 0x3235 -#define FTD_SB_CELL_BAR_ACC_2_5_NEIGH 0x3236 -#define FTD_SB_CELL_BAR_ACC_2_6_NEIGH 0x3237 -#define FTD_SB_EXC_ACC_1_NEIGH 0x3238 -#define FTD_SB_EXC_ACC_2_NEIGH 0x3239 -#define FTD_SB_EXC_ACC_3_NEIGH 0x323A -#define FTD_SB_EXC_ACC_4_NEIGH 0x323B -#define FTD_SB_EXC_ACC_5_NEIGH 0x323C -#define FTD_SB_EXC_ACC_6_NEIGH 0x323D -#define FTD_SB_CELL_BAR_ACC_2 0x323E -#define FTD_SB_EXC_ACC 0x323F -#define FTD_SB_GPRS_TIMING_ADV 0x3240 -#define FTD_SB_GPRS_RXLEV_ACC_MIN 0x3241 -#define FTD_SB_GPRS_CELL_RESEL_HYST 0x3242 -#define FTD_SB_RA_RESEL_HYST 0x3243 -#define FTD_SB_C31_HYST 0x3244 -#define FTD_SB_C32_QUAL 0x3245 -#define FTD_SB_RAND_ACC_RETRY 0x3246 -#define FTD_SB_GPRS_RX_LEVEL_SERV 0x3247 -#define FTD_SB_GPRS_RX_LEVEL_1_NEIGH 0x3248 -#define FTD_SB_GPRS_RX_LEVEL_2_NEIGH 0x3249 -#define FTD_SB_GPRS_RX_LEVEL_3_NEIGH 0x324A -#define FTD_SB_GPRS_RX_LEVEL_4_NEIGH 0x324B -#define FTD_SB_GPRS_RX_LEVEL_5_NEIGH 0x324C -#define FTD_SB_GPRS_RX_LEVEL_6_NEIGH 0x324D -#define FTD_SB_EGPRS_SUPPORT 0x324E -#define FTD_SB_EGPRS_PACKET_CHANNEL_REQUEST 0x324F -#define FTD_SB_EGPRS_BEP_PER 0x3250 -#define FTD_SB_PH_MSCR 0x3251 -#define FTD_SB_PH_SGSNR 0x3252 -#define FTD_SB_SMS_SEND_FAIL_CAUSE_GPRS 0x3253 -#define FTD_SB_SMS_REC_FAIL_CAUSE_GPRS 0x3254 -#define FTD_SB_GPRS_SUPPORT 0x3255 -#define FTD_SB_PH_SI_STATUS_IND 0x3258 -#define FTD_SB_PH_EXT_UTBF 0x3259 -#define FTD_SB_PH_CCN_ACTIVE 0x325A -#define FTD_SB_PH_PFC_FEATURE_MODE 0x325B -#define FTD_SB_CURR_BAND 0x325C -#define FTD_SB_LAST_USED_BAND_READ 0x325D -#define FTD_SB_SELECTED_RAT_READ 0x325E -#define FTD_SB_GPRS_RX_LEVEL 0x325F -#define FTD_SB_TOGGLE_TRANS_STATUS_CHANGE 0x3260 -#define FTD_SB_RX_LEVEL_FULL 0x3261 -#define FTD_SB_RX_LEVEL_SUB 0x3262 -#define FTD_SB_RX_QUALITY_FULL 0x3263 -#define FTD_SB_RX_QUALITY_SUB 0x3264 -#define FTD_SB_SYSTEM_INFO_BITS1 0x3265 -#define FTD_SB_SYSTEM_INFO_BITS2 0x3266 -#define FTD_SB_SYSTEM_INFO_BITS3 0x3267 -#define FTD_SB_SYSTEM_INFO_BITS4 0x3268 -#define FTD_SB_SYSTEM_INFO_BITS5 0x3269 -#define FTD_SB_SYSTEM_INFO_BITS6 0x326A -#define FTD_SB_SYSTEM_INFO_BITS7 0x326B -#define FTD_SB_SYSTEM_INFO_BITS8 0x326C -#define FTD_SB_SYSTEM_INFO_BITS9 0x326D -#define FTD_SB_SYSTEM_INFO_BITS10 0x326E -#define FTD_SB_DTM_MAX_LAPDM 0x326F -#define FTD_SB_UMA_PREF_MODE_SET 0x3270 -#define FTD_SB_UMA_PREF_MODE_NR_READ 0x3271 -#define GSS_FTD_LAST_BYTE_SUB_BLOCK 0x3272 -#define FTD_SB_PENALTY_TIME 0x3400 -#define FTD_SB_LAC 0x3401 -#define FTD_SB_CELL_ID 0x3402 -#define FTD_SB_T_RESEL 0x3403 -#define FTD_SB_NEIGH_PSW_ATT 0x3405 -#define FTD_SB_NEIGH_SYNC_ATT 0x3406 -#define FTD_SB_NEIGH_BCCH_ATT 0x3407 -#define FTD_SB_NEIGH_BCCH_EXT_ATT 0x3408 -#define FTD_SB_NORMAL_LOC_UP_COUNT 0x3409 -#define FTD_SB_SUCC_LOC_UP_COUNT 0x340A -#define FTD_SB_LOC_UP_COUNT_IMSI 0x340B -#define FTD_SB_SUCC_LOC_UP_COUNT_IMSI 0x340C -#define FTD_SB_HO_GSM_GSM 0x340D -#define FTD_SB_HO_DCS_DCS 0x340E -#define FTD_SB_HO_GSM_DCS 0x340F -#define FTD_SB_HO_DCS_GSM 0x3410 -#define FTD_SB_FAILED_HO_GSM_GSM 0x3411 -#define FTD_SB_FAILED_HO_DCS_DCS 0x3412 -#define FTD_SB_FAILED_HO_GSM_DCS 0x3413 -#define FTD_SB_FAILED_HO_DCS_GSM 0x3414 -#define FTD_SB_BACK_TO_PREV_GSM_GSM 0x3415 -#define FTD_SB_BACK_TO_PREV_DCS_DCS 0x3416 -#define FTD_SB_BACK_TO_PREV_GSM_DCS 0x3417 -#define FTD_SB_BACK_TO_PREV_DCS_GSM 0x3418 -#define FTD_SB_INTRA_HO_GSM_GSM 0x3419 -#define FTD_SB_INTRA_HO_DCS_DCS 0x341A -#define FTD_SB_INTRA_HO_GSM_DCS 0x341B -#define FTD_SB_INTRA_HO_DCS_GSM 0x341C -#define FTD_SB_FAILED_INTRA_HO_GSM_GSM 0x341D -#define FTD_SB_FAILED_INTRA_HO_DCS_DCS 0x341E -#define FTD_SB_FAILED_INTRA_HO_GSM_DCS 0x341F -#define FTD_SB_FAILED_INTRA_HO_DCS_GSM 0x3420 -#define FTD_SB_INTRA_BACK_TO_PREV_GSM_GSM 0x3421 -#define FTD_SB_INTRA_BACK_TO_PREV_DCS_DCS 0x3422 -#define FTD_SB_INTRA_BACK_TO_PREV_GSM_DCS 0x3423 -#define FTD_SB_INTRA_BACK_TO_PREV_DCS_GSM 0x3424 -#define FTD_SB_T200_EXP_MS_GSM 0x3425 -#define FTD_SB_T200_EXP_BS_GSM 0x3426 -#define FTD_SB_T200_EXP_MS_DCS 0x3427 -#define FTD_SB_T200_EXP_BS_DCS 0x3428 -#define FTD_SB_MO_CALL_COUNT 0x3429 -#define FTD_SB_MO_CALL_OK_COUNT 0x342A -#define FTD_SB_MT_CALL_COUNT 0x342B -#define FTD_SB_MT_CALL_OK_COUNT 0x342C -#define FTD_SB_MO_SMS_COUNT 0x342D -#define FTD_SB_MO_SMS_OK_COUNT 0x342E -#define FTD_SB_MT_SMS_COUNT 0x342F -#define FTD_SB_MT_SMS_OK_COUNT 0x3430 -#define FTD_SB_CB_SCHEDULE_MSG 0x3431 -#define FTD_SB_TR1M_COUNT 0x3432 -#define FTD_SB_TR2M_COUNT 0x3433 -#define FTD_SB_TRAM_COUNT 0x3434 -#define FTD_SB_TC1M_COUNT 0x3435 -#define FTD_SB_TC2M_COUNT 0x3436 -#define FTD_SB_CB_SCHEDULE_COUNT 0x3437 -#define FTD_SB_POWER_ON_TIMER 0x3438 -#define FTD_SB_SERV_TIMER 0x3439 -#define FTD_SB_NSPS_TIMER 0x343A -#define FTD_SB_TRANSMIT_TIMER 0x343B -#define FTD_SB_SMS_MO_ATT_GPRS 0x343C -#define FTD_SB_SMS_MO_GPRS_OK 0x343D -#define FTD_SB_SMS_MT_ATT_GPRS 0x343E -#define FTD_SB_SMS_MT_GPRS_OK 0x343F -#define GSS_FTD_LAST_WORD_SUB_BLOCK 0x3440 -#define FTD_SB_LAST_REG 0x3600 -#define FTD_SB_TMSI 0x3601 -#define FTD_SB_1ST_FORBIDDEN_NW 0x3602 -#define FTD_SB_2ND_FORBIDDEN_NW 0x3603 -#define FTD_SB_3RD_FORBIDDEN_NW 0x3604 -#define FTD_SB_4TH_FORBIDDEN_NW 0x3605 -#define FTD_SB_LAST_USED_BAND_SET 0x3606 -#define FTD_SB_SELECTED_RAT_SET 0x3607 -#define FTD_SB_RX_TIMESLOT_ALLOC 0x3608 -#define FTD_SB_TX_TIMESLOT_ALLOC 0x3609 -#define FTD_SB_1_EQUIV_PLMN 0x360A -#define FTD_SB_2_EQUIV_PLMN 0x360B -#define FTD_SB_3_EQUIV_PLMN 0x360C -#define FTD_SB_4_EQUIV_PLMN 0x360D -#define FTD_SB_5_EQUIV_PLMN 0x360E -#define FTD_SB_6_EQUIV_PLMN 0x360F -#define FTD_SB_7_EQUIV_PLMN 0x3610 -#define FTD_SB_8_EQUIV_PLMN 0x3611 -#define FTD_SB_9_EQUIV_PLMN 0x3612 -#define FTD_SB_10_EQUIV_PLMN 0x3613 -#define FTD_SB_11_EQUIV_PLMN 0x3614 -#define FTD_SB_12_EQUIV_PLMN 0x3615 -#define FTD_SB_13_EQUIV_PLMN 0x3616 -#define FTD_SB_14_EQUIV_PLMN 0x3617 -#define FTD_SB_15_EQUIV_PLMN 0x3618 -#define FTD_SB_16_EQUIV_PLMN 0x3619 -#define FTD_SB_DTM_CS_TSLOT_CONF 0x361A -#define FTD_SB_DTM_PS_DL_CONF 0x361B -#define FTD_SB_DTM_PS_UL_CONF 0x361C -#define FTD_SB_NO_PSW_FOUND_GSM 0x361D -#define FTD_SB_NO_PSW_FOUND_DCS 0x361E -#define FTD_SB_SYNC_GSM 0x361F -#define FTD_SB_SYNC_DCS 0x3620 -#define FTD_SB_RESEL_GSM_GSM 0x3621 -#define FTD_SB_RESEL_DCS_DCS 0x3622 -#define FTD_SB_RESEL_GSM_DCS 0x3623 -#define FTD_SB_RESEL_DCS_GSM 0x3624 -#define FTD_SB_UMA_1_AVAIL_PLMN 0x3625 -#define FTD_SB_UMA_2_AVAIL_PLMN 0x3626 -#define FTD_SB_UMA_3_AVAIL_PLMN 0x3627 -#define FTD_SB_UMA_4_AVAIL_PLMN 0x3628 -#define FTD_SB_UMA_5_AVAIL_PLMN 0x3629 -#define FTD_SB_UMA_6_AVAIL_PLMN 0x362A -#define GSS_FTD_LAST_DWORD_SUB_BLOCK 0x362B -#define FTD_SB_CARRIER 0x3800 -#define FTD_SB_HOPPING 0x3801 -#define FTD_SB_TX_LEVEL 0x3802 -#define FTD_SB_C1 0x3803 -#define FTD_SB_TYPE_OF_CURR_CH 0x3804 -#define FTD_SB_C2 0x3805 -#define FTD_SB_PAGING_MODE 0x3806 -#define FTD_SB_ROAMING_IND 0x3807 -#define FTD_SB_C1_1_NEIGH 0x3808 -#define FTD_SB_C1_2_NEIGH 0x3809 -#define FTD_SB_C1_3_NEIGH 0x380A -#define FTD_SB_C1_4_NEIGH 0x380B -#define FTD_SB_C1_5_NEIGH 0x380C -#define FTD_SB_C1_6_NEIGH 0x380D -#define FTD_SB_C1_7_NEIGH 0x380E -#define FTD_SB_C1_8_NEIGH 0x380F -#define FTD_SB_C2_1_NEIGH 0x3810 -#define FTD_SB_C2_2_NEIGH 0x3811 -#define FTD_SB_C2_3_NEIGH 0x3812 -#define FTD_SB_C2_4_NEIGH 0x3813 -#define FTD_SB_C2_5_NEIGH 0x3814 -#define FTD_SB_C2_6_NEIGH 0x3815 -#define FTD_SB_C2_7_NEIGH 0x3816 -#define FTD_SB_C2_8_NEIGH 0x3817 -#define FTD_SB_CIPH 0x381A -#define FTD_SB_DTX_VALUE 0x381B -#define FTD_SB_IMSI_ATT 0x381C -#define FTD_SB_DTX_STATUS 0x381D -#define FTD_SB_DTX_DEF 0x381E -#define FTD_SB_DTX_FROM_BS 0x381F -#define FTD_SB_CC_CAUSE 0x3820 -#define FTD_SB_MM_CAUSE 0x3821 -#define FTD_SB_RR_CAUSE 0x3822 -#define FTD_SB_LOCATION_AREA_INFO_1 0x3823 -#define FTD_SB_LOCATION_AREA_INFO_2 0x3824 -#define FTD_SB_LOCATION_AREA_INFO_3 0x3825 -#define FTD_SB_LOCATION_AREA_INFO_4 0x3826 -#define FTD_SB_LOCATION_AREA_INFO_5 0x3827 -#define FTD_SB_LOCATION_AREA_INFO_6 0x3828 -#define FTD_SB_LOCATION_AREA_INFO_7 0x3829 -#define FTD_SB_LOCATION_AREA_INFO_8 0x382A -#define FTD_SB_CELL_PRIORITY_1 0x382B -#define FTD_SB_CELL_PRIORITY_2 0x382C -#define FTD_SB_CELL_PRIORITY_3 0x382D -#define FTD_SB_CELL_PRIORITY_4 0x382E -#define FTD_SB_CELL_PRIORITY_5 0x382F -#define FTD_SB_CELL_PRIORITY_6 0x3830 -#define FTD_SB_CELL_PRIORITY_7 0x3831 -#define FTD_SB_CELL_PRIORITY_8 0x3832 -#define FTD_SB_CELL_BARR_IND_STATUS 0x3833 -#define FTD_SB_C1S 0x3834 -#define FTD_SB_C2S 0x3835 -#define FTD_SB_HOPP_STATUS 0x3836 -#define FTD_SB_TEST_TIMER_STATE 0x3837 -#define FTD_SB_TOGGLE_TRANS_STATUS 0x3838 -#define FTD_SB_PH_SI13_LOCATION 0x3839 -#define FTD_SB_PH_USF 0x383A -#define FTD_SB_PBCCH_HOPPING 0x383B -#define FTD_SB_PCCCH_HOPPING 0x383C -#define FTD_SB_GPRS_HOPPING 0x383D -#define FTD_SB_GPRS_TYPE_OF_CURR_CH 0x383E -#define FTD_SB_GMM_STATE 0x383F -#define FTD_SB_PRIOR_CLASS_SERV 0x3840 -#define FTD_SB_C32_SERV 0x3841 -#define FTD_SB_PRIOR_CLASS_1_NEIGH 0x3842 -#define FTD_SB_PRIOR_CLASS_2_NEIGH 0x3843 -#define FTD_SB_PRIOR_CLASS_3_NEIGH 0x3844 -#define FTD_SB_PRIOR_CLASS_4_NEIGH 0x3845 -#define FTD_SB_PRIOR_CLASS_5_NEIGH 0x3846 -#define FTD_SB_PRIOR_CLASS_6_NEIGH 0x3847 -#define FTD_SB_C32_1_NEIGH 0x3848 -#define FTD_SB_C32_2_NEIGH 0x3849 -#define FTD_SB_C32_3_NEIGH 0x384A -#define FTD_SB_C32_4_NEIGH 0x384B -#define FTD_SB_C32_5_NEIGH 0x384C -#define FTD_SB_C32_6_NEIGH 0x384D -#define FTD_SB_INT_PRO_MODE 0x384E -#define FTD_SB_CARRIER_1_NEIGH 0x384F -#define FTD_SB_CARRIER_2_NEIGH 0x3850 -#define FTD_SB_CARRIER_3_NEIGH 0x3851 -#define FTD_SB_CARRIER_4_NEIGH 0x3852 -#define FTD_SB_CARRIER_5_NEIGH 0x3853 -#define FTD_SB_CARRIER_6_NEIGH 0x3854 -#define FTD_SB_CARRIER_7_NEIGH 0x3855 -#define FTD_SB_CARRIER_8_NEIGH 0x3856 -#define FTD_SB_BCCH_CARRIER_SERV 0x3857 -#define FTD_SB_GPRS_CARRIER_SERV 0x3858 -#define FTD_SB_GPRS_CARRIER 0x3859 -#define FTD_SB_GPRS_CARRIER_1_NEIGH 0x385A -#define FTD_SB_GPRS_CARRIER_2_NEIGH 0x385B -#define FTD_SB_GPRS_CARRIER_3_NEIGH 0x385C -#define FTD_SB_GPRS_CARRIER_4_NEIGH 0x385D -#define FTD_SB_GPRS_CARRIER_5_NEIGH 0x385E -#define FTD_SB_GPRS_CARRIER_6_NEIGH 0x385F -#define FTD_SB_LAST_CALL_REL_DIRECTION 0x3860 -#define FTD_SB_ENAB_OR_DISAB_TEST_TIMERS 0x3861 -#define FTD_SB_REG_CC 0x3862 -#define FTD_SB_REG_MNC 0x3863 -#define FTD_SB_INT_PRO_MODE_TOGGLE 0x3864 -#define FTD_SB_DTM_SUPP 0x3865 -#define FTD_SB_UMA_PREF_MODE_TXT_READ 0x3866 -#define FTD_SB_UMA_MCC 0x3867 -#define FTD_SB_UMA_MNC 0x3868 -#define FTD_SB_UMA_RAT_INFO 0x3869 -#define FTD_SB_UMA_INFO 0x386A -#define FTD_SB_UMA_DTM_SUPPORT 0x386B -#define FTD_SB_UMA_GPRS_AVAIL 0x386C -#define FTD_SB_UMA_NMO 0x386D -#define FTD_SB_UMA_ECMP 0x386E -#define GSS_FTD_LAST_SUB_BLOCK 0x386F - //ConstantTable for GSS_OPERATION #define GSS_CS_STATUS_GET 0x00 #define GSS_CS_TASKS_SUSPEND 0x01 @@ -507,12 +171,33 @@ #define GSS_FAIL 0x02 //ConstantTable for GSS_HSXPA_CAUSE +#define GSS_HSXPA_NO_CAUSE 0x00 #define GSS_HSXPA_DISABLED_VIA_PP 0x01 //ConstantTable for GSS_HAC_MODE #define GSS_HAC_ACTIVE 0x01 #define GSS_HAC_INACTIVE 0x02 +//ConstantTable for GSS_ENV_REQUEST_TYPE +#define GSS_ENV_INFO_SET 0x01 +#define GSS_ENV_INFO_QUERY_CERTAIN 0x02 +#define GSS_ENV_INFO_QUERY_ALL 0x03 + +//ConstantTable for GSS_ENV_INFO_RESP_STATUS +#define GSS_ENV_INFO_OK 0x01 +#define GSS_ENV_INFO_FAIL 0x02 + +//ConstantTable for GSS_USER_ACTIVITY_STATUS +//#define GSS_ENV_INFO_STATUS_UNKNOWN 0x00 //Already defined as 0x00 +#define GSS_ENV_USER_ACTIVE 0x01 +#define GSS_ENV_USER_INACTIVE 0x02 + +//ConstantTable for GSS_BATTERY_INFO +//#define GSS_ENV_INFO_STATUS_UNKNOWN 0x00 //Already defined as 0x00 +#define GSS_BATTERY_IN_CHARGER 0x01 +#define GSS_BATTERY_NORMAL 0x02 +#define GSS_BATTERY_LOW 0x03 + //SUBBLOCKS @@ -667,8 +352,6 @@ #define GSS_SELECTED_GSM_BAND_INFO_OFFSET_SELECTEDGSMBANDS 2 //size 1 byte(s) #define GSS_SELECTED_GSM_BAND_INFO_OFFSET_FILLERBYTE1 3 //size 1 byte(s) #define SIZE_GSS_SELECTED_GSM_BAND_INFO 4 - - //Definition for GSS_REL_SIGNAL_LEVEL_INFO #define GSS_REL_SIGNAL_LEVEL_INFO 0x14 #define GSS_REL_SIGNAL_LEVEL_INFO_OFFSET_SUBBLOCKID 0 //size 1 byte(s) @@ -687,6 +370,24 @@ #define SIZE_GSS_THRESHOLD_INFO 4 +//Definition for GSS_ENV_USER_ACTIVITY_INFO +#define GSS_ENV_USER_ACTIVITY_INFO 0x17 +#define GSS_ENV_USER_ACTIVITY_INFO_OFFSET_SUBBLOCKID 0 //size 1 byte(s) +#define GSS_ENV_USER_ACTIVITY_INFO_OFFSET_SUBBLOCKLENGTH 1 //size 1 byte(s) +#define GSS_ENV_USER_ACTIVITY_INFO_OFFSET_ACTIVITYSTATUS 2 //size 1 byte(s) +#define GSS_ENV_USER_ACTIVITY_INFO_OFFSET_FILLERBYTE1 3 //size 1 byte(s) +#define SIZE_GSS_ENV_USER_ACTIVITY_INFO 4 + + +//Definition for GSS_ENV_BATTERY_INFO +#define GSS_ENV_BATTERY_INFO 0x18 +#define GSS_ENV_BATTERY_INFO_OFFSET_SUBBLOCKID 0 //size 1 byte(s) +#define GSS_ENV_BATTERY_INFO_OFFSET_SUBBLOCKLENGTH 1 //size 1 byte(s) +#define GSS_ENV_BATTERY_INFO_OFFSET_BATTERYINFORMATION 2 //size 1 byte(s) +#define GSS_ENV_BATTERY_INFO_OFFSET_FILLERBYTE1 3 //size 1 byte(s) +#define SIZE_GSS_ENV_BATTERY_INFO 4 + + //MESSAGES @@ -814,4 +515,31 @@ #define GSS_HAC_MODE_WRITE_RESP_OFFSET_FILLERBYTE1 3 //size 1 byte(s) #define SIZE_GSS_HAC_MODE_WRITE_RESP 4 + +//Definition for GSS_ENV_INFO_REQ +#define GSS_ENV_INFO_REQ 0x19 +#define GSS_ENV_INFO_REQ_OFFSET_TRANSID 0 //size 1 byte(s) +#define GSS_ENV_INFO_REQ_OFFSET_MESSAGEID 1 //size 1 byte(s) +#define GSS_ENV_INFO_REQ_OFFSET_ENVREQUESTTYPE 2 //size 1 byte(s) +#define GSS_ENV_INFO_REQ_OFFSET_NBROFSUBBLOCKS 3 //size 1 byte(s) +#define SIZE_GSS_ENV_INFO_REQ 4 + + +//Definition for GSS_ENV_INFO_RESP +#define GSS_ENV_INFO_RESP 0x20 +#define GSS_ENV_INFO_RESP_OFFSET_TRANSID 0 //size 1 byte(s) +#define GSS_ENV_INFO_RESP_OFFSET_MESSAGEID 1 //size 1 byte(s) +#define GSS_ENV_INFO_RESP_OFFSET_ENVINFOSTATUS 2 //size 1 byte(s) +#define GSS_ENV_INFO_RESP_OFFSET_NBROFSUBBLOCKS 3 //size 1 byte(s) +#define SIZE_GSS_ENV_INFO_RESP 4 + + +//Definition for GSS_ENV_INFO_IND +#define GSS_ENV_INFO_IND 0x21 +#define GSS_ENV_INFO_IND_OFFSET_TRANSID 0 //size 1 byte(s) +#define GSS_ENV_INFO_IND_OFFSET_MESSAGEID 1 //size 1 byte(s) +#define GSS_ENV_INFO_IND_OFFSET_FILLERBYTE1 2 //size 1 byte(s) +#define GSS_ENV_INFO_IND_OFFSET_NBROFSUBBLOCKS 3 //size 1 byte(s) +#define SIZE_GSS_ENV_INFO_IND 4 + #endif \ No newline at end of file diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/location_wmisi.h --- a/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/location_wmisi.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/location_wmisi.h Tue Oct 19 13:16:20 2010 +0300 @@ -13,7 +13,7 @@ * * Description: * Name : PN_MODEM_LCS [ 0x90 ] Resource Modem LCS Server -* Version : 006.000 +* Version : 008.000 * * Documentation: www.wirelessmodemapi.com * @@ -23,7 +23,7 @@ #ifndef _SYMBIAN_ISI_LOCATION_WMISI_H_ #define _SYMBIAN_ISI_LOCATION_WMISI_H_ -#define MODEM_LCS_SERVER_ISI_VERSION_Z 7 +#define MODEM_LCS_SERVER_ISI_VERSION_Z 8 #define MODEM_LCS_SERVER_ISI_VERSION_Y 0 @@ -383,6 +383,7 @@ #define MODEM_LCS_SS_MM_ERROR 0x0B #define MODEM_LCS_SS_CS_INACTIVE 0x0F #define MODEM_LCS_SS_SS_NOT_AVAILABLE 0x12 +#define MODEM_LCS_SS_MO_LR_TIMER_TLCSL_EXPIRED 0x17 //ConstantTable for MODEM_LCS_SS_PSEUDONYM_REQUESTED #define MODEM_LCS_SS_PSEUDONYM_NOT_REQUESTED 0x00 @@ -1545,6 +1546,14 @@ #define SIZE_MODEM_LCS_SUPPORT_CONTROL_RESP 4 +//Definition for MODEM_LCS_SUPPORT_CONTROL_IND +#define MODEM_LCS_SUPPORT_CONTROL_IND 0x22 +#define MODEM_LCS_SUPPORT_CONTROL_IND_OFFSET_TRANSID 0 //size 1 byte(s) +#define MODEM_LCS_SUPPORT_CONTROL_IND_OFFSET_MESSAGEID 1 //size 1 byte(s) +#define MODEM_LCS_SUPPORT_CONTROL_IND_OFFSET_FILLERBYTE1 2 //size 2 byte(s) +#define SIZE_MODEM_LCS_SUPPORT_CONTROL_IND 4 + + //Definition for MODEM_LCS_RRLP_ASTNC_IND #define MODEM_LCS_RRLP_ASTNC_IND 0x05 #define MODEM_LCS_RRLP_ASTNC_IND_OFFSET_TRANSID 0 //size 1 byte(s) diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/modem_infoisi.h --- a/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/modem_infoisi.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/modem_infoisi.h Tue Oct 19 13:16:20 2010 +0300 @@ -13,7 +13,7 @@ * * Description: * Name : PN_MODEM_INFO [ 0xC5 ] Resource Modem Info Server -* Version : 001.002 +* Version : 001.005 * * Documentation: www.wirelessmodemapi.com * @@ -24,7 +24,7 @@ #define _SYMBIAN_ISI_INFOISI_H_ #define MODEM_INFO_SERVER_ISI_VERSION_Z 1 -#define MODEM_INFO_SERVER_ISI_VERSION_Y 2 +#define MODEM_INFO_SERVER_ISI_VERSION_Y 5 //CONSTANTS @@ -44,6 +44,7 @@ //BitmaskTables for M_INFO_VERSION_TARGETS #define M_INFO_MODEMSW 0x01 +#define M_INFO_DO 0x02 //SUBBLOCKS @@ -71,6 +72,26 @@ //NOTE: Definition contains array(s) or sequence(s). SIZE_ and offsets following array or sequence might be defined incorrectly. +//Definition for M_INFO_SB_DO_NUM_VERSION +#define M_INFO_SB_DO_NUM_VERSION 0x02 +#define M_INFO_SB_DO_NUM_VERSION_OFFSET_SUBBLOCKID 0 //size 1 byte(s) +#define M_INFO_SB_DO_NUM_VERSION_OFFSET_SUBBLOCKLEN 1 //size 1 byte(s) +#define M_INFO_SB_DO_NUM_VERSION_OFFSET_FILLERBYTE1 2 //size 2 byte(s) +#define M_INFO_SB_DO_NUM_VERSION_OFFSET_DONUMVER 4 //size 4 byte(s) +#define SIZE_M_INFO_SB_DO_NUM_VERSION 8 + + +//Definition for M_INFO_SB_DO_STR_VERSION +#define M_INFO_SB_DO_STR_VERSION 0x03 +#define M_INFO_SB_DO_STR_VERSION_OFFSET_SUBBLOCKID 0 //size 1 byte(s) +#define M_INFO_SB_DO_STR_VERSION_OFFSET_SUBBLOCKLEN 1 //size 1 byte(s) +#define M_INFO_SB_DO_STR_VERSION_OFFSET_FILLERBYTE1 2 //size 1 byte(s) +#define M_INFO_SB_DO_STR_VERSION_OFFSET_STRLEN 3 //size 1 byte(s) +#define M_INFO_SB_DO_STR_VERSION_OFFSET_DOSTRVER 4 //size 1 byte(s) +#define SIZE_M_INFO_SB_DO_STR_VERSION 5 +//NOTE: Definition contains array(s) or sequence(s). SIZE_ and offsets following array or sequence might be defined incorrectly. + + //MESSAGES @@ -127,4 +148,17 @@ #define M_INFO_VERSION_READ_RESP_OFFSET_SUBBLOCKCOUNT 3 //size 1 byte(s) #define SIZE_M_INFO_VERSION_READ_RESP 4 +//Definition for M_INFO_PP_DEFAULTS_RESTORE_REQ +#define M_INFO_PP_DEFAULTS_RESTORE_REQ 0x06 +#define M_INFO_PP_DEFAULTS_RESTORE_REQ_OFFSET_TRANSID 0 //size 1 byte(s) +#define M_INFO_PP_DEFAULTS_RESTORE_REQ_OFFSET_MESSAGEID 1 //size 1 byte(s) +#define SIZE_M_INFO_PP_DEFAULTS_RESTORE_REQ 2 + +//Definition for M_INFO_PP_DEFAULTS_RESTORE_RESP +#define M_INFO_PP_DEFAULTS_RESTORE_RESP 0x07 +#define M_INFO_PP_DEFAULTS_RESTORE_RESP_OFFSET_TRANSID 0 //size 1 byte(s) +#define M_INFO_PP_DEFAULTS_RESTORE_RESP_OFFSET_MESSAGEID 1 //size 1 byte(s) +#define M_INFO_PP_DEFAULTS_RESTORE_RESP_OFFSET_STATUS 2 //size 1 byte(s) +#define SIZE_M_INFO_PP_DEFAULTS_RESTORE_RESP 3 + #endif diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/net_modemisi.h --- a/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/net_modemisi.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/net_modemisi.h Tue Oct 19 13:16:20 2010 +0300 @@ -24,7 +24,7 @@ #define _SYMBIAN_ISI_NET_MODEMISI_H_ #define MODEM_NETWORK_SELECT_SERVER_ISI_VERSION_Z 16 -#define MODEM_NETWORK_SELECT_SERVER_ISI_VERSION_Y 9 +#define MODEM_NETWORK_SELECT_SERVER_ISI_VERSION_Y 12 //CONSTANTS @@ -40,6 +40,8 @@ #define NET_INDEX_NOT_USED 0x00 #define NET_SCRAMBLING_CODE_UNDEFINED 0xFFFF #define NET_ECID_TA_UNDEFINED 0xFF +#define NET_NO_RSSI_INDICATED 0x00 +#define NET_ALL_RSSI_INDICATED 0xFF //TABLES @@ -110,6 +112,9 @@ #define NET_SELECT_MODE_AUTOMATIC 0x02 #define NET_SELECT_MODE_USER_RESELECTION 0x03 #define NET_SELECT_MODE_NO_SELECTION 0x04 +#define NET_SELECT_MODE_POWER_ON_AUTOMATIC 0x05 +#define NET_SELECT_MODE_POWER_ON_MANUAL 0x06 +#define NET_SELECT_MODE_POWER_ON_NO_SELECTION 0x07 //ConstantTable for NET_MODEM_NETWORK_STATUS #define NET_OPER_STATUS_UNKNOWN 0x00 @@ -333,6 +338,10 @@ #define NET_UTRAN_RADIO_IDLE 0x00 #define NET_UTRAN_RADIO_CELL_DCH 0x01 +//ConstantTable for NET_SIGNAL_LEVEL_TYPE_TBL +#define PERCENT 0x00 +#define DBM 0x01 + //STRUCTURES @@ -773,6 +782,19 @@ //NOTE: Definition contains array(s) or sequence(s). SIZE_ and offsets following array or sequence might be defined incorrectly. +//Definition for NET_RSSI_CONF_INFO +#define NET_RSSI_CONF_INFO 0x54 +#define NET_RSSI_CONF_INFO_OFFSET_SUBBLOCKID 0 //size 1 byte(s) +#define NET_RSSI_CONF_INFO_OFFSET_SUBBLOCKLENGTH 1 //size 1 byte(s) +#define NET_RSSI_CONF_INFO_OFFSET_NETSIGNALLEVELTYPE 2 //size 1 byte(s) +#define NET_RSSI_CONF_INFO_OFFSET_HYSTERESISDOWN 3 //size 1 byte(s) +#define NET_RSSI_CONF_INFO_OFFSET_HYSTERESISUP 4 //size 1 byte(s) +#define NET_RSSI_CONF_INFO_OFFSET_LOWLIMIT 5 //size 1 byte(s) +#define NET_RSSI_CONF_INFO_OFFSET_UPLIMIT 6 //size 1 byte(s) +#define NET_RSSI_CONF_INFO_OFFSET_FILLERBYTE1 7 //size 1 byte(s) +#define SIZE_NET_RSSI_CONF_INFO 8 + + //MESSAGES @@ -1152,4 +1174,22 @@ #define NET_SOR_RESP_OFFSET_FILLERBYTE1 3 //size 1 byte(s) #define SIZE_NET_SOR_RESP 4 + +//Definition for NET_RSSI_CONF_REQ +#define NET_RSSI_CONF_REQ 0x46 +#define NET_RSSI_CONF_REQ_OFFSET_TRANSID 0 //size 1 byte(s) +#define NET_RSSI_CONF_REQ_OFFSET_MESSAGEID 1 //size 1 byte(s) +#define NET_RSSI_CONF_REQ_OFFSET_NBROFSEGMENTS 2 //size 1 byte(s) +#define NET_RSSI_CONF_REQ_OFFSET_SUBBLOCKCOUNT 3 //size 1 byte(s) +#define SIZE_NET_RSSI_CONF_REQ 4 + + +//Definition for NET_RSSI_CONF_RESP +#define NET_RSSI_CONF_RESP 0x47 +#define NET_RSSI_CONF_RESP_OFFSET_TRANSID 0 //size 1 byte(s) +#define NET_RSSI_CONF_RESP_OFFSET_MESSAGEID 1 //size 1 byte(s) +#define NET_RSSI_CONF_RESP_OFFSET_SUCCESSCODE 2 //size 1 byte(s) +#define NET_RSSI_CONF_RESP_OFFSET_FILLERBYTE1 3 //size 1 byte(s) +#define SIZE_NET_RSSI_CONF_RESP 4 + #endif \ No newline at end of file diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/nvdisi.h --- a/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/nvdisi.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/nvdisi.h Tue Oct 19 13:16:20 2010 +0300 @@ -13,7 +13,7 @@ * * Description: * Name : PN_NVD [ 0x43 ] Resource Non-Volatile Data Server -* Version : 000.001 +* Version : 000.002 * * Documentation: www.wirelessmodemapi.com * @@ -24,7 +24,7 @@ #define _SYMBIAN_ISI_NVDISI_H_ #define NON_VOLATILE_DATA_SERVER_ISI_VERSION_Z 0 -#define NON_VOLATILE_DATA_SERVER_ISI_VERSION_Y 1 +#define NON_VOLATILE_DATA_SERVER_ISI_VERSION_Y 2 //TABLES diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/pn_const.h --- a/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/pn_const.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/pn_const.h Tue Oct 19 13:16:20 2010 +0300 @@ -32,6 +32,7 @@ /* === Objects === */ #define PN_OBJ_ROUTING_REQ 0x00 /* Resource-based routing */ #define PN_OBJ_EVENT_MULTICAST 0x20 /* Indications are sent to this object */ +#define PN_OBJ_PEP_GPDS 0x30 /* Pipe-End-Point, General Packet Data Service */ /* === Resources/Servers === */ #define PN_SMS 0x02 /* Short Message Services */ @@ -58,7 +59,6 @@ #define PN_WCDMA_RF_TEST 0xEE /* WCDMA RF test server */ #define PN_GSM_RF_TEST 0xF1 /* GSM test server */ - /* === NOTE! Next definitions are temporary System resources from non MeXe pn_const === */ #define PN_HEADER_SIZE 0x06 diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/pn_eventmodem_extisi.h --- a/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/pn_eventmodem_extisi.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/pn_eventmodem_extisi.h Tue Oct 19 13:16:20 2010 +0300 @@ -13,7 +13,7 @@ * * Description: * Name : pn_event header definitions -* Version : 001.000 +* Version : 001.001 * */ diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/ss_wmisi.h --- a/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/ss_wmisi.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/ss_wmisi.h Tue Oct 19 13:16:20 2010 +0300 @@ -13,7 +13,7 @@ * * Description: * Name : PN_SS [ 0x06 ] Resource Supplementary Services Server -* Version : 014.000 +* Version : 014.001 * * Documentation: www.wirelessmodemapi.com * @@ -24,7 +24,7 @@ #define _SYMBIAN_ISI_SS_WMISI_H_ #define SUPPLEMENTARY_SERVICES_SERVER_ISI_VERSION_Z 14 -#define SUPPLEMENTARY_SERVICES_SERVER_ISI_VERSION_Y 0 +#define SUPPLEMENTARY_SERVICES_SERVER_ISI_VERSION_Y 1 //CONSTANTS @@ -190,6 +190,7 @@ #define SS_GSM_CLI_DEFAULT_ALLOWED 0x02 #define SS_GSM_OVERRIDE_ENABLED 0x03 #define SS_GSM_OVERRIDE_DISABLED 0x04 +#define SS_PARAMETER_NOT_AVAILABLE 0xFF //ConstantTable for SS_GSM_GUIDANCE_INFO #define SS_GSM_BAD_PASSWORD 0x01 @@ -227,7 +228,7 @@ //ConstantTable for SS_MISC_SS_ERRORS #define SS_SERVICE_BUSY 0x00 -#define SS_GSM_MM_RELEASE 0x01 +#define SS_GSM_MM_RELEASE 0x01 //Obsolete error code #define SS_GSM_DATA_ERROR 0x02 #define SS_GSM_REQUEST_CANCELLED 0x04 #define SS_GSM_INDICATE_DEVICE_PASSWORD 0x05 diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/uiccisi.h --- a/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/uiccisi.h Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/isimessage/symbianisamacroif/include/wgmodem25/uiccisi.h Tue Oct 19 13:16:20 2010 +0300 @@ -13,7 +13,7 @@ * * Description: * Name : PN_UICC [ 0x8C ] Resource UICC Server -* Version : 003.000 +* Version : 004.001 * * Documentation: www.wirelessmodemapi.com * @@ -23,8 +23,8 @@ #ifndef _SYMBIAN_ISI_UICCISI_H_ #define _SYMBIAN_ISI_UICCISI_H_ -#define UICC_SERVER_ISI_VERSION_Z 3 -#define UICC_SERVER_ISI_VERSION_Y 0 +#define UICC_SERVER_ISI_VERSION_Z 4 +#define UICC_SERVER_ISI_VERSION_Y 1 //CONSTANTS @@ -32,6 +32,7 @@ #define UICC_SFI_NOT_PRESENT 0x00 #define UICC_APPL_ID_UNKNOWN 0x00 #define UICC_APPL_LAST 0xFF +#define UICC_APPL_ID_NOT_USED 0x00 #define UICC_SESSION_ID_NOT_USED 0x00 #define UICC_ANY_SIZE 0x01 @@ -49,6 +50,7 @@ #define UICC_STATUS_CARD_READY 0x21 #define UICC_STATUS_CARD_DISCONNECTED 0x22 #define UICC_STATUS_CARD_NOT_PRESENT 0x23 +#define UICC_STATUS_CARD_REJECTED 0x24 #define UICC_STATUS_APPL_ACTIVE 0x30 #define UICC_STATUS_APPL_NOT_ACTIVE 0x31 #define UICC_STATUS_PIN_ENABLED 0x40 @@ -63,8 +65,6 @@ #define UICC_CARD_ERROR 0x05 #define UICC_SERVICE_NOT_SUPPORTED 0x06 #define UICC_SESSION_EXPIRED 0x07 -#define UICC_PIN_INVALID 0x08 -#define UICC_PIN_BLOCKED 0x09 //ConstantTable for UICC_APPL_TYPE_TABLE #define UICC_APPL_TYPE_UNKNOWN 0x00 @@ -86,6 +86,7 @@ #define UICC_CARD_TYPE_UNKNOWN 0x00 #define UICC_CARD_TYPE_ICC 0x01 #define UICC_CARD_TYPE_UICC 0x02 +#define UICC_CARD_TYPE_USB 0x03 //ConstantTable for UICC_PIN_STATUS_TABLE @@ -139,7 +140,8 @@ #define UICC_APPL_CLEAR_CACHE 0x27 #define UICC_APPL_SESSION_START 0x28 #define UICC_APPL_SESSION_END 0x29 -#define UICC_APPL_CACHE_UPDATED 0x30 +#define UICC_APPL_READ_CYCLIC 0x2A +#define UICC_APPL_UPDATE_CYCLIC 0x2B #define UICC_CONNECT 0x31 #define UICC_DISCONNECT 0x32 #define UICC_RECONNECT 0x33 @@ -164,6 +166,7 @@ #define UICC_CAT_FETCHED_CMD 0x91 #define UICC_CAT_NOT_SUPPORTED 0x92 #define UICC_CAT_REG_FAILED 0x93 +#define UICC_CAT_REG_OK 0x94 #define UICC_REFRESH_PERMISSION 0xA1 #define UICC_REFRESH_STARTING 0xA2 #define UICC_REFRESH_CANCELLED 0xA3 @@ -173,13 +176,22 @@ #define UICC_READY 0xB2 #define UICC_INITIALIZED 0xB4 #define UICC_SHUTTING_DOWN 0xB5 +#define UICC_SHUT_DOWN_CONFIG 0xB6 +#define UICC_ERROR 0xB7 #define UICC_CARD_DISCONNECTED 0xC0 #define UICC_CARD_REMOVED 0xC1 #define UICC_CARD_NOT_PRESENT 0xC2 -#define UICC_CARD_RESET 0xC3 #define UICC_CARD_READY 0xC4 #define UICC_CARD_STATUS_GET 0xC5 -#define UICC_SIMLOCK_ACTIVE 0xD0 +#define UICC_CARD_REJECTED 0xC8 +#define UICC_CARD_INFO_GET 0xC9 +#define UICC_APDU_SAP_ACTIVATE 0xE1 +#define UICC_APDU_SAP_DEACTIVATE 0xE2 +#define UICC_APDU_SAP_ATR_GET 0xE3 +#define UICC_APDU_SAP_COLD_RESET 0xE4 +#define UICC_APDU_SAP_WARM_RESET 0xE5 +#define UICC_APDU_SAP_APDU_SEND 0xE6 +#define UICC_APDU_SAP_RECOVERY 0xE7 //ConstantTable for UICC_REFRESH_STATUS_TABLE #define UICC_REFRESH_OK 0x01 @@ -187,13 +199,51 @@ #define UICC_REFRESH_DONE 0x03 //ConstantTable for UICC_SIMLOCK_STATUS_TABLE -#define UICC_SIMLOCK_STATUS_ACTIVE 0x01 -#define UICC_SIMLOCK_STATUS_INACTIVE 0x02 + +//ConstantTable for UICC_APDU_SAP_STATUS_TABLE +#define UICC_APDU_SAP_OK 0x01 +#define UICC_APDU_SAP_FAIL 0x02 +#define UICC_APDU_SAP_CARD_ERROR 0x03 + +//ConstantTable for UICC_POWER_MODE_TABLE +#define UICC_POWER_MODE_LOW 0x01 +#define UICC_POWER_MODE_FULL 0x02 + +//ConstantTable for UICC_VOLTAGE_CLASS_TABLE +#define UICC_VOLTAGE_CLASS_NOT_AVAILABLE 0x00 +#define UICC_VOLTAGE_CLASS_A 0x50 +#define UICC_VOLTAGE_CLASS_B 0x30 +#define UICC_VOLTAGE_CLASS_C 0x18 + +//ConstantTable for UICC_CLF_IF_SUPPORT_TABLE +#define UICC_CLF_IF_NOT_SUPPORTED 0x01 +#define UICC_CLF_IF_SUPPORTED 0x02 + +//ConstantTable for UICC_CARD_REJECT_CAUSE_TABLE +#define UICC_CARD_REJECT_CAUSE_NOT_AVAILABLE 0x00 +#define UICC_CARD_REJECT_CAUSE_SIMLOCK 0x01 +#define UICC_CARD_REJECT_CAUSE_SW_6F00 0x02 + +//ConstantTable for UICC_PROTOCOL_TABLE +#define UICC_PROTOCOL_NOT_USED 0x00 +#define UICC_PROTOCOL_NO_PREFERENCE 0x01 +#define UICC_PROTOCOL_T0 0x02 +#define UICC_PROTOCOL_T1 0x03 //SUBBLOCKS +//Definition for UICC_SB_SHUT_DOWN_CONFIG +#define UICC_SB_SHUT_DOWN_CONFIG 0x23 +#define UICC_SB_SHUT_DOWN_CONFIG_OFFSET_SBID 0 //size 2 byte(s) +#define UICC_SB_SHUT_DOWN_CONFIG_OFFSET_SBLEN 2 //size 2 byte(s) +#define UICC_SB_SHUT_DOWN_CONFIG_OFFSET_FILLERBYTE1 4 //size 2 byte(s) +#define UICC_SB_SHUT_DOWN_CONFIG_OFFSET_POWERMODE 6 //size 1 byte(s) +#define UICC_SB_SHUT_DOWN_CONFIG_OFFSET_VOLTAGECLASS 7 //size 1 byte(s) +#define SIZE_UICC_SB_SHUT_DOWN_CONFIG 8 + + //Definition for UICC_SB_CARD_STATUS #define UICC_SB_CARD_STATUS 0x01 #define UICC_SB_CARD_STATUS_OFFSET_SBID 0 //size 2 byte(s) @@ -203,6 +253,25 @@ #define SIZE_UICC_SB_CARD_STATUS 8 +//Definition for UICC_SB_CARD_INFO +#define UICC_SB_CARD_INFO 0x24 +#define UICC_SB_CARD_INFO_OFFSET_SBID 0 //size 2 byte(s) +#define UICC_SB_CARD_INFO_OFFSET_SBLEN 2 //size 2 byte(s) +#define UICC_SB_CARD_INFO_OFFSET_FILLERBYTE1 4 //size 2 byte(s) +#define UICC_SB_CARD_INFO_OFFSET_VOLTAGECLASS 6 //size 1 byte(s) +#define UICC_SB_CARD_INFO_OFFSET_CLFSUPPORT 7 //size 1 byte(s) +#define SIZE_UICC_SB_CARD_INFO 8 + + +//Definition for UICC_SB_CARD_REJECT_CAUSE +#define UICC_SB_CARD_REJECT_CAUSE 0x25 +#define UICC_SB_CARD_REJECT_CAUSE_OFFSET_SBID 0 //size 2 byte(s) +#define UICC_SB_CARD_REJECT_CAUSE_OFFSET_SBLEN 2 //size 2 byte(s) +#define UICC_SB_CARD_REJECT_CAUSE_OFFSET_FILLERBYTE1 4 //size 3 byte(s) +#define UICC_SB_CARD_REJECT_CAUSE_OFFSET_REJECTCAUSE 7 //size 1 byte(s) +#define SIZE_UICC_SB_CARD_REJECT_CAUSE 8 + + //Definition for UICC_SB_CLIENT #define UICC_SB_CLIENT 0x1F #define UICC_SB_CLIENT_OFFSET_SBID 0 //size 2 byte(s) @@ -288,13 +357,10 @@ #define UICC_SB_PIN_OFFSET_SBLEN 2 //size 2 byte(s) #define UICC_SB_PIN_OFFSET_PINID 4 //size 1 byte(s) #define UICC_SB_PIN_OFFSET_PINQUALIFIER 5 //size 1 byte(s) -#define UICC_SB_PIN_OFFSET_FILLERBYTE1 6 //size 1 byte(s) -#define UICC_SB_PIN_OFFSET_LENGTH 7 //size 1 byte(s) -#define UICC_SB_PIN_OFFSET_PINCODE 8 //size 1 byte(s) -#define UICC_SB_PIN_OFFSET_FILLERBYTE2 9 //size 1 byte(s) -#define UICC_SB_PIN_OFFSET_FILLERBYTE3 10 //size 1 byte(s) -#define UICC_SB_PIN_OFFSET_FILLERBYTE4 11 //size 1 byte(s) -#define SIZE_UICC_SB_PIN 12 +#define UICC_SB_PIN_OFFSET_LENGTH 6 //size 1 byte(s) +#define UICC_SB_PIN_OFFSET_PINCODE 7 //size 8 byte(s) +#define UICC_SB_PIN_OFFSET_FILLERBYTE1 15 //size 1 byte(s) +#define SIZE_UICC_SB_PIN 16 //NOTE: Definition contains variable size field(s). SIZE_ and offsets following variable field cannot be defined correctly. @@ -312,13 +378,10 @@ #define UICC_SB_PUK_OFFSET_SBID 0 //size 2 byte(s) #define UICC_SB_PUK_OFFSET_SBLEN 2 //size 2 byte(s) #define UICC_SB_PUK_OFFSET_PINID 4 //size 1 byte(s) -#define UICC_SB_PUK_OFFSET_FILLERBYTE1 5 //size 2 byte(s) -#define UICC_SB_PUK_OFFSET_PUKLENGTH 7 //size 1 byte(s) -#define UICC_SB_PUK_OFFSET_PUKCODE 8 //size 1 byte(s) -#define UICC_SB_PUK_OFFSET_FILLERBYTE2 9 //size 1 byte(s) -#define UICC_SB_PUK_OFFSET_FILLERBYTE3 10 //size 1 byte(s) -#define UICC_SB_PUK_OFFSET_FILLERBYTE4 11 //size 1 byte(s) -#define SIZE_UICC_SB_PUK 12 +#define UICC_SB_PUK_OFFSET_PUKLENGTH 5 //size 1 byte(s) +#define UICC_SB_PUK_OFFSET_PUKCODE 6 //size 8 byte(s) +#define UICC_SB_PUK_OFFSET_FILLERBYTE1 14 //size 2 byte(s) +#define SIZE_UICC_SB_PUK 16 //NOTE: Definition contains variable size field(s). SIZE_ and offsets following variable field cannot be defined correctly. @@ -418,6 +481,17 @@ #define SIZE_UICC_SB_LINEAR_FIXED 8 +//Definition for UICC_SB_CYCLIC +#define UICC_SB_CYCLIC 0x26 +#define UICC_SB_CYCLIC_OFFSET_SBID 0 //size 2 byte(s) +#define UICC_SB_CYCLIC_OFFSET_SBLEN 2 //size 2 byte(s) +#define UICC_SB_CYCLIC_OFFSET_RECORD 4 //size 1 byte(s) +#define UICC_SB_CYCLIC_OFFSET_OFFSET 5 //size 1 byte(s) +#define UICC_SB_CYCLIC_OFFSET_AMOUNT 6 //size 1 byte(s) +#define UICC_SB_CYCLIC_OFFSET_FILLERBYTE1 7 //size 1 byte(s) +#define SIZE_UICC_SB_CYCLIC 8 + + //Definition for UICC_SB_TERMINAL_PROFILE #define UICC_SB_TERMINAL_PROFILE 0x15 #define UICC_SB_TERMINAL_PROFILE_OFFSET_SBID 0 //size 2 byte(s) @@ -433,15 +507,6 @@ //NOTE: Definition contains array(s) or sequence(s). SIZE_ and offsets following array or sequence might be defined incorrectly. -//Definition for UICC_SB_TERMINAL_SUPPORT_TABLE -#define UICC_SB_TERMINAL_SUPPORT_TABLE 0x1E -#define UICC_SB_TERMINAL_SUPPORT_TABLE_OFFSET_SBID 0 //size 2 byte(s) -#define UICC_SB_TERMINAL_SUPPORT_TABLE_OFFSET_SBLEN 2 //size 2 byte(s) -#define UICC_SB_TERMINAL_SUPPORT_TABLE_OFFSET_FILLERBYTE1 4 //size 3 byte(s) -#define UICC_SB_TERMINAL_SUPPORT_TABLE_OFFSET_NSB 7 //size 1 byte(s) -#define SIZE_UICC_SB_TERMINAL_SUPPORT_TABLE 8 - - //Definition for UICC_SB_TERMINAL_RESPONSE #define UICC_SB_TERMINAL_RESPONSE 0x1D #define UICC_SB_TERMINAL_RESPONSE_OFFSET_SBID 0 //size 2 byte(s) @@ -457,6 +522,21 @@ //NOTE: Definition contains array(s) or sequence(s). SIZE_ and offsets following array or sequence might be defined incorrectly. +//Definition for UICC_SB_ENVELOPE +#define UICC_SB_ENVELOPE 0x21 +#define UICC_SB_ENVELOPE_OFFSET_SBID 0 //size 2 byte(s) +#define UICC_SB_ENVELOPE_OFFSET_SBLEN 2 //size 2 byte(s) +#define UICC_SB_ENVELOPE_OFFSET_FILLERBYTE1 4 //size 2 byte(s) +#define UICC_SB_ENVELOPE_OFFSET_ENVELOPELENGTH 6 //size 2 byte(s) +#define UICC_SB_ENVELOPE_OFFSET_ENVELOPE 8 //size 1 byte(s) +#define UICC_SB_ENVELOPE_OFFSET_FILLERBYTE2 9 //size 1 byte(s) +#define UICC_SB_ENVELOPE_OFFSET_FILLERBYTE3 10 //size 1 byte(s) +#define UICC_SB_ENVELOPE_OFFSET_FILLERBYTE4 11 //size 1 byte(s) +#define SIZE_UICC_SB_ENVELOPE 12 +//NOTE: Definition contains variable size field(s). SIZE_ and offsets following variable field cannot be defined correctly. +//NOTE: Definition contains array(s) or sequence(s). SIZE_ and offsets following array or sequence might be defined incorrectly. + + //Definition for UICC_SB_POLLING_SET #define UICC_SB_POLLING_SET 0x16 #define UICC_SB_POLLING_SET_OFFSET_SBID 0 //size 2 byte(s) @@ -493,8 +573,12 @@ #define UICC_SB_REFRESH_RESULT_OFFSET_SBID 0 //size 2 byte(s) #define UICC_SB_REFRESH_RESULT_OFFSET_SBLEN 2 //size 2 byte(s) #define UICC_SB_REFRESH_RESULT_OFFSET_REFRESHSTATUS 4 //size 1 byte(s) -#define UICC_SB_REFRESH_RESULT_OFFSET_FILLERBYTE1 5 //size 3 byte(s) +#define UICC_SB_REFRESH_RESULT_OFFSET_FILLERBYTE1 5 //size 1 byte(s) +#define UICC_SB_REFRESH_RESULT_OFFSET_ADDITIONALINFOLENGTH 6 //size 1 byte(s) +#define UICC_SB_REFRESH_RESULT_OFFSET_ADDITIONALINFO 7 //size 1 byte(s) #define SIZE_UICC_SB_REFRESH_RESULT 8 +//NOTE: Definition contains variable size field(s). SIZE_ and offsets following variable field cannot be defined correctly. +//NOTE: Definition contains array(s) or sequence(s). SIZE_ and offsets following array or sequence might be defined incorrectly. //Definition for UICC_SB_APDU_ACTIONS @@ -502,21 +586,28 @@ #define UICC_SB_APDU_ACTIONS_OFFSET_SBID 0 //size 2 byte(s) #define UICC_SB_APDU_ACTIONS_OFFSET_SBLEN 2 //size 2 byte(s) #define UICC_SB_APDU_ACTIONS_OFFSET_ACTION 4 //size 1 byte(s) -#define UICC_SB_APDU_ACTIONS_OFFSET_FILLERBYTE1 5 //size 3 byte(s) +#define UICC_SB_APDU_ACTIONS_OFFSET_PROTOCOL 5 //size 1 byte(s) +#define UICC_SB_APDU_ACTIONS_OFFSET_FILLERBYTE1 6 //size 2 byte(s) #define SIZE_UICC_SB_APDU_ACTIONS 8 -#define UICC_SB_STATUS_WORD 0x0020 + +//Definition for UICC_SB_STATUS_WORD +#define UICC_SB_STATUS_WORD 0x20 +#define UICC_SB_STATUS_WORD_OFFSET_SBID 0 //size 2 byte(s) +#define UICC_SB_STATUS_WORD_OFFSET_SBLEN 2 //size 2 byte(s) +#define UICC_SB_STATUS_WORD_OFFSET_FILLERBYTE1 4 //size 2 byte(s) #define UICC_SB_STATUS_WORD_OFFSET_SW1 6 //size 1 byte(s) #define UICC_SB_STATUS_WORD_OFFSET_SW2 7 //size 1 byte(s) +#define SIZE_UICC_SB_STATUS_WORD 8 -//Definition for UICC_SB_OBJECT_ID -#define UICC_SB_OBJECT_ID 0x1A -#define UICC_SB_OBJECT_ID_OFFSET_SBID 0 //size 2 byte(s) -#define UICC_SB_OBJECT_ID_OFFSET_SBLEN 2 //size 2 byte(s) -#define UICC_SB_OBJECT_ID_OFFSET_OBJID 4 //size 2 byte(s) -#define UICC_SB_OBJECT_ID_OFFSET_DEVICEID 6 //size 1 byte(s) -#define UICC_SB_OBJECT_ID_OFFSET_FILLERBYTE1 7 //size 1 byte(s) -#define SIZE_UICC_SB_OBJECT_ID 8 + +//Definition for UICC_SB_APDU_SAP_INFO +#define UICC_SB_APDU_SAP_INFO 0x22 +#define UICC_SB_APDU_SAP_INFO_OFFSET_SBID 0 //size 2 byte(s) +#define UICC_SB_APDU_SAP_INFO_OFFSET_SBLEN 2 //size 2 byte(s) +#define UICC_SB_APDU_SAP_INFO_OFFSET_APDUSAPID 4 //size 1 byte(s) +#define UICC_SB_APDU_SAP_INFO_OFFSET_FILLERBYTE1 5 //size 3 byte(s) +#define SIZE_UICC_SB_APDU_SAP_INFO 8 //MESSAGES @@ -527,7 +618,8 @@ #define UICC_REQ_OFFSET_TRANSID 0 //size 1 byte(s) #define UICC_REQ_OFFSET_MESSAGEID 1 //size 1 byte(s) #define UICC_REQ_OFFSET_SERVICETYPE 2 //size 1 byte(s) -#define SIZE_UICC_REQ 3 +#define UICC_REQ_OFFSET_NSB 3 //size 1 byte(s) +#define SIZE_UICC_REQ 4 //Definition for UICC_RESP @@ -719,23 +811,25 @@ #define SIZE_UICC_REFRESH_RESP 5 -//Definition for UICC_SIMLOCK_REQ -#define UICC_SIMLOCK_REQ 0x1B -#define UICC_SIMLOCK_REQ_OFFSET_TRANSID 0 //size 1 byte(s) -#define UICC_SIMLOCK_REQ_OFFSET_MESSAGEID 1 //size 1 byte(s) -#define UICC_SIMLOCK_REQ_OFFSET_SERVICETYPE 2 //size 1 byte(s) -#define SIZE_UICC_SIMLOCK_REQ 3 +//Definition for UICC_APDU_SAP_REQ +#define UICC_APDU_SAP_REQ 0x1E +#define UICC_APDU_SAP_REQ_OFFSET_TRANSID 0 //size 1 byte(s) +#define UICC_APDU_SAP_REQ_OFFSET_MESSAGEID 1 //size 1 byte(s) +#define UICC_APDU_SAP_REQ_OFFSET_SERVICETYPE 2 //size 1 byte(s) +#define UICC_APDU_SAP_REQ_OFFSET_STATUS 3 //size 1 byte(s) +#define UICC_APDU_SAP_REQ_OFFSET_FILLERBYTE1 4 //size 3 byte(s) +#define UICC_APDU_SAP_REQ_OFFSET_NSB 7 //size 1 byte(s) +#define SIZE_UICC_APDU_SAP_REQ 8 -//Definition for UICC_SIMLOCK_RESP -#define UICC_SIMLOCK_RESP 0x1C -#define UICC_SIMLOCK_RESP_OFFSET_TRANSID 0 //size 1 byte(s) -#define UICC_SIMLOCK_RESP_OFFSET_MESSAGEID 1 //size 1 byte(s) -#define UICC_SIMLOCK_RESP_OFFSET_SERVICETYPE 2 //size 1 byte(s) -#define UICC_SIMLOCK_RESP_OFFSET_STATUS 3 //size 1 byte(s) -#define UICC_SIMLOCK_RESP_OFFSET_DETAILS 4 //size 1 byte(s) -#define UICC_SIMLOCK_RESP_OFFSET_SIMLOCKSTATUS 5 //size 1 byte(s) -#define SIZE_UICC_SIMLOCK_RESP 6 +//Definition for UICC_APDU_SAP_RESP +#define UICC_APDU_SAP_RESP 0x1F +#define UICC_APDU_SAP_RESP_OFFSET_TRANSID 0 //size 1 byte(s) +#define UICC_APDU_SAP_RESP_OFFSET_MESSAGEID 1 //size 1 byte(s) +#define UICC_APDU_SAP_RESP_OFFSET_SERVICETYPE 2 //size 1 byte(s) +#define UICC_APDU_SAP_RESP_OFFSET_STATUS 3 //size 1 byte(s) +#define UICC_APDU_SAP_RESP_OFFSET_DETAILS 4 //size 1 byte(s) +#define SIZE_UICC_APDU_SAP_RESP 5 //Definition for UICC_APPLICATION_IND @@ -775,7 +869,9 @@ #define UICC_CARD_IND_OFFSET_MESSAGEID 1 //size 1 byte(s) #define UICC_CARD_IND_OFFSET_SERVICETYPE 2 //size 1 byte(s) #define UICC_CARD_IND_OFFSET_CARDTYPE 3 //size 1 byte(s) -#define SIZE_UICC_CARD_IND 4 +#define UICC_CARD_IND_OFFSET_FILLERBYTE1 4 //size 3 byte(s) +#define UICC_CARD_IND_OFFSET_NSB 7 //size 1 byte(s) +#define SIZE_UICC_CARD_IND 8 //Definition for UICC_PIN_IND @@ -789,25 +885,13 @@ #define SIZE_UICC_PIN_IND 8 -//Definition for UICC_APPL_CMD_IND -#define UICC_APPL_CMD_IND 0x0E -#define UICC_APPL_CMD_IND_OFFSET_TRANSID 0 //size 1 byte(s) -#define UICC_APPL_CMD_IND_OFFSET_MESSAGEID 1 //size 1 byte(s) -#define UICC_APPL_CMD_IND_OFFSET_SERVICETYPE 2 //size 1 byte(s) -#define UICC_APPL_CMD_IND_OFFSET_APPLID 3 //size 1 byte(s) -#define UICC_APPL_CMD_IND_OFFSET_FILLERBYTE1 4 //size 3 byte(s) -#define UICC_APPL_CMD_IND_OFFSET_NSB 7 //size 1 byte(s) -#define SIZE_UICC_APPL_CMD_IND 8 - - //Definition for UICC_CAT_IND #define UICC_CAT_IND 0x14 #define UICC_CAT_IND_OFFSET_TRANSID 0 //size 1 byte(s) #define UICC_CAT_IND_OFFSET_MESSAGEID 1 //size 1 byte(s) #define UICC_CAT_IND_OFFSET_SERVICETYPE 2 //size 1 byte(s) #define UICC_CAT_IND_OFFSET_CARDTYPE 3 //size 1 byte(s) -#define UICC_CAT_IND_OFFSET_APPLID 4 //size 1 byte(s) -#define UICC_CAT_IND_OFFSET_FILLERBYTE1 5 //size 2 byte(s) +#define UICC_CAT_IND_OFFSET_FILLERBYTE1 4 //size 3 byte(s) #define UICC_CAT_IND_OFFSET_NSB 7 //size 1 byte(s) #define SIZE_UICC_CAT_IND 8 @@ -820,4 +904,15 @@ #define UICC_APDU_RESET_IND_OFFSET_FILLERBYTE1 3 //size 1 byte(s) #define SIZE_UICC_APDU_RESET_IND 4 + +//Definition for UICC_APDU_SAP_IND +#define UICC_APDU_SAP_IND 0x20 +#define UICC_APDU_SAP_IND_OFFSET_TRANSID 0 //size 1 byte(s) +#define UICC_APDU_SAP_IND_OFFSET_MESSAGEID 1 //size 1 byte(s) +#define UICC_APDU_SAP_IND_OFFSET_SERVICETYPE 2 //size 1 byte(s) +#define UICC_APDU_SAP_IND_OFFSET_APDUSAPID 3 //size 1 byte(s) +#define UICC_APDU_SAP_IND_OFFSET_FILLERBYTE1 4 //size 3 byte(s) +#define UICC_APDU_SAP_IND_OFFSET_NSB 7 //size 1 byte(s) +#define SIZE_UICC_APDU_SAP_IND 8 + #endif \ No newline at end of file diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/usbphonetlink/usbpnclient_dll/src/rusbpnclient.cpp --- a/connectivitylayer/usbphonetlink/usbpnclient_dll/src/rusbpnclient.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/usbphonetlink/usbpnclient_dll/src/rusbpnclient.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -57,7 +57,7 @@ // EXPORT_C void RUsbPnClient::ConnectL() { - OstTrace0( TRACE_API, RUSBPNCLIENT_CONNECTL_ENTRY, "RUsbPnClient::ConnectL" ); + OstTrace0( TRACE_BORDER, RUSBPNCLIENT_CONNECTL_ENTRY, "RUsbPnClient::ConnectL" ); A_TRACE( ( _T( "RUsbPnClient::ConnectL()" ) ) ); TInt err( KErrNone ); @@ -77,7 +77,7 @@ if ( err == KErrNotFound ) { // Lock is not enabled - OstTrace0( TRACE_DETAILED, RUSBPNCLIENT_CONNECTL, "RUsbPnClient::ConnectL() - semaphore not found, start server" ); + OstTrace0( TRACE_INTERNALS, RUSBPNCLIENT_CONNECTL, "RUsbPnClient::ConnectL() - semaphore not found, start server" ); E_TRACE( ( _L( "RUsbPnClient::ConnectL() - semaphore not found, start server" ) ) ); RSemaphore startLock; @@ -105,7 +105,7 @@ server.Resume(); // Logon OK -> start the server } - OstTrace0( TRACE_DETAILED, RUSBPNCLIENT_CONNECTL_DUP1, "RUsbPnClient::ConnectL() - waiting server response" ); + OstTrace0( TRACE_INTERNALS, RUSBPNCLIENT_CONNECTL_DUP1, "RUsbPnClient::ConnectL() - waiting server response" ); E_TRACE( ( _T( "RUsbPnClient::ConnectL() - waiting server response" ) ) ); User::WaitForRequest( status ); // Wait for start or death @@ -122,7 +122,7 @@ if( err ) { - OstTrace1( TRACE_DETAILED, RUSBPNCLIENT_CONNECTL_DUP2, "RUsbPnClient::ConnectL() - waiting server response status; err=%d", err ); + OstTrace1( TRACE_INTERNALS, RUSBPNCLIENT_CONNECTL_DUP2, "RUsbPnClient::ConnectL() - waiting server response status; err=%d", err ); E_TRACE( ( _T( "RUsbPnClient::ConnectL() - waiting server response status: %d" ), err ) ); TRACE_ASSERT_ALWAYS; User::LeaveIfError( err ); @@ -130,7 +130,7 @@ /* End of starting process */ /********************************************/ - OstTrace0( TRACE_DETAILED, RUSBPNCLIENT_CONNECTL_DUP3, "RUsbPnClient::ConnectL() - server is started, signal other clients" ); + OstTrace0( TRACE_INTERNALS, RUSBPNCLIENT_CONNECTL_DUP3, "RUsbPnClient::ConnectL() - server is started, signal other clients" ); E_TRACE( ( _L( "RUsbPnClient::ConnectL() - server is started, signal other clients" ) ) ); // Signal other clients startLock.Signal( KMaxTInt ); @@ -147,11 +147,11 @@ // Open lock semaphore User::LeaveIfError( startLock.Open( lock ) ); - OstTrace0( TRACE_DETAILED, RUSBPNCLIENT_CONNECTL_DUP4, "RUsbPnClient::ConnectL() - server is starting, wait for signal" ); + OstTrace0( TRACE_INTERNALS, RUSBPNCLIENT_CONNECTL_DUP4, "RUsbPnClient::ConnectL() - server is starting, wait for signal" ); E_TRACE( ( _L( "RUsbPnClient::ConnectL() - server is starting, wait for signal" ) ) ); // Wait for signal startLock.Wait(); - OstTrace0( TRACE_DETAILED, RUSBPNCLIENT_CONNECTL_DUP5, "RUsbPnClient::ConnectL() - signal received" ); + OstTrace0( TRACE_INTERNALS, RUSBPNCLIENT_CONNECTL_DUP5, "RUsbPnClient::ConnectL() - signal received" ); E_TRACE( ( _L( "RUsbPnClient::ConnectL() - signal received" ) ) ); // Close semaphore @@ -160,27 +160,27 @@ } // Create USB Phonet Link server session - OstTrace0( TRACE_DETAILED, RUSBPNCLIENT_CONNECTL_DUP6, "RUsbPnClient::ConnectL() - Create session" ); + OstTrace0( TRACE_INTERNALS, RUSBPNCLIENT_CONNECTL_DUP6, "RUsbPnClient::ConnectL() - Create session" ); E_TRACE( ( _L( "RUsbPnClient::ConnectL() - Create session" ) ) ); User::LeaveIfError( CreateSession( KUsbPnServerName, TVersion(1,0,0) ) ); - OstTrace0( TRACE_DETAILED, RUSBPNCLIENT_CONNECTL_DUP7, "RUsbPnClient::ConnectL() - session created1" ); + OstTrace0( TRACE_INTERNALS, RUSBPNCLIENT_CONNECTL_DUP7, "RUsbPnClient::ConnectL() - session created1" ); E_TRACE( ( _L( "RUsbPnClient::ConnectL() - session created1" ) ) ); } else if ( err ) { - OstTrace0( TRACE_DETAILED, RUSBPNCLIENT_CONNECTL_DUP8, "RUsbPnClient::ConnectL() - session not created, reason uknown" ); + OstTrace0( TRACE_INTERNALS, RUSBPNCLIENT_CONNECTL_DUP8, "RUsbPnClient::ConnectL() - session not created, reason uknown" ); E_TRACE( ( _L( "RUsbPnClient::ConnectL() - session not created, reason uknown" ) ) ); TRACE_ASSERT_ALWAYS; User::Leave( err ); } else { - OstTrace0( TRACE_DETAILED, RUSBPNCLIENT_CONNECTL_DUP9, "RUsbPnClient::ConnectL() - session created2" ); + OstTrace0( TRACE_INTERNALS, RUSBPNCLIENT_CONNECTL_DUP9, "RUsbPnClient::ConnectL() - session created2" ); E_TRACE( ( _T( "RUsbPnClient::ConnectL() - session created2" ) ) ); } - OstTrace0( TRACE_API, RUSBPNCLIENT_CONNECTL_EXIT, "RUsbPnClient::ConnectL() - return void" ); + OstTrace0( TRACE_BORDER, RUSBPNCLIENT_CONNECTL_EXIT, "RUsbPnClient::ConnectL() - return void" ); A_TRACE( ( _T( "RUsbPnClient::ConnectL() - return void" ) ) ); } @@ -191,12 +191,12 @@ // EXPORT_C void RUsbPnClient::Detach() { - OstTrace0( TRACE_API, RUSBPNCLIENT_DETACH_ENTRY, "RUsbPnClient::Detach" ); + OstTrace0( TRACE_BORDER, RUSBPNCLIENT_DETACH_ENTRY, "RUsbPnClient::Detach" ); A_TRACE( ( _T( "RUsbPnClient::Disconnect()" ) ) ); SendReceive( EPnDetach ); // close the session RSessionBase::Close(); - OstTrace0( TRACE_API, RUSBPNCLIENT_DETACH_EXIT, "RUsbPnClient::Detach - return void" ); + OstTrace0( TRACE_BORDER, RUSBPNCLIENT_DETACH_EXIT, "RUsbPnClient::Detach - return void" ); A_TRACE( ( _T( "RUsbPnClient::Disconnect() - return void" ) ) ); } diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnalt.cpp --- a/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnalt.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnalt.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -148,7 +148,7 @@ // void CUsbPnAlt::RunL( ) { - OstTrace1( TRACE_API, CUSBPNALT_RUNL_ENTRY, "CUsbPnAlt::RunL;iStatus=%d", iStatus.Int() ); + OstTrace1( TRACE_BORDER, CUSBPNALT_RUNL_ENTRY, "CUsbPnAlt::RunL;iStatus=%d", iStatus.Int() ); A_TRACE( ( _T( "CUsbPnAlt::RunL() iStatus:%d" ), iStatus.Int() ) ); User::LeaveIfError( iStatus.Int() ); @@ -160,21 +160,21 @@ { case EUsbcDeviceStateAddress: { - OstTrace0( TRACE_API, CUSBPNALT_RUNL_DUP1, "CUsbPnAlt::RunL - EUsbcDeviceStateAddress" ); + OstTrace0( TRACE_BORDER, CUSBPNALT_RUNL_DUP1, "CUsbPnAlt::RunL - EUsbcDeviceStateAddress" ); A_TRACE( ( _T( "CUsbPnAlt::RunL - EUsbcDeviceStateAddress"))); SendControlMessage( PNS_USB_CABLE_PLUGGED ); break; } case EUsbcDeviceStateConfigured: { - OstTrace0( TRACE_API, CUSBPNALT_RUNL_DUP2, "CUsbPnAlt::RunL - EUsbcDeviceStateConfigured" ); + OstTrace0( TRACE_BORDER, CUSBPNALT_RUNL_DUP2, "CUsbPnAlt::RunL - EUsbcDeviceStateConfigured" ); A_TRACE( ( _T( "CUsbPnAlt::RunL - EUsbcDeviceStateConfigured"))); SendControlMessage( PNS_USB_CONNECTED ); break; } case EUsbcDeviceStateUndefined: { - OstTrace0( TRACE_API, CUSBPNALT_RUNL_DUP3, "CUsbPnAlt::RunL - EUsbcDeviceStateUndefined" ); + OstTrace0( TRACE_BORDER, CUSBPNALT_RUNL_DUP3, "CUsbPnAlt::RunL - EUsbcDeviceStateUndefined" ); A_TRACE( ( _T( "CUsbPnAlt::RunL - EUsbcDeviceStateUndefined"))); SendControlMessage( PNS_USB_CABLE_UNPLUGGED ); break; @@ -187,7 +187,7 @@ iLdd.AlternateDeviceStatusNotify( iStatus, iState ); SetActive(); - OstTrace0( TRACE_API, CUSBPNALT_RUNL_EXIT, "CUsbPnAlt::RunL - return void"); + OstTrace0( TRACE_BORDER, CUSBPNALT_RUNL_EXIT, "CUsbPnAlt::RunL - return void"); A_TRACE( ( _T( "CUsbPnAlt::RunL() - return void" ) ) ); } @@ -218,7 +218,7 @@ void CUsbPnAlt::SendControlMessage( const TUint8 aId ) const { C_TRACE( ( _T( "CUsbPnAlt::SendControlMessage( aId:%d )" ), aId ) ); - OstTrace0( TRACE_API, CUSBPNALT_SENDCONTROLMESSAGE_DUP1, "CUsbPnAlt::SendControlMessage( aId )" ); + OstTrace0( TRACE_BORDER, CUSBPNALT_SENDCONTROLMESSAGE_DUP1, "CUsbPnAlt::SendControlMessage( aId )" ); TBuf8< SIZE_PNS_MEDIA_SPECIFIC_REQ > buf; TIsiSend ctrlMsg(buf, 12 ); @@ -232,11 +232,11 @@ ctrlMsg.Complete(); C_TRACE( ( _T( "CUsbPnAlt::SendControlMessage() - Sending...") ) ); - OstTrace0( TRACE_API, CUSBPNALT_SENDCONTROLMESSAGE_DUP2, "CUsbPnAlt::SendControlMessage() - Sending..." ); + OstTrace0( TRACE_BORDER, CUSBPNALT_SENDCONTROLMESSAGE_DUP2, "CUsbPnAlt::SendControlMessage() - Sending..." ); iIscApi.Send( buf ); C_TRACE( ( _T( "CUsbPnAlt::SendControlMessage() - return void") ) ); - OstTrace0( TRACE_API, CUSBPNALT_SENDCONTROLMESSAGE_DUP3, "CUsbPnAlt::SendControlMessage() - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNALT_SENDCONTROLMESSAGE_DUP3, "CUsbPnAlt::SendControlMessage() - return void" ); } #endif /* NCP_COMMON_BRIDGE_FAMILY */ diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpninterface.cpp --- a/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpninterface.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpninterface.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -154,12 +154,12 @@ // void CUsbPnInterface::HandleDeviceStateChange( TUint aDeviceState ) { - OstTrace1( TRACE_API, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_ENTRY, "CUsbPnInterface::HandleDeviceStateChange;aDeviceState=%u", aDeviceState ); + OstTrace1( TRACE_BORDER, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_ENTRY, "CUsbPnInterface::HandleDeviceStateChange;aDeviceState=%u", aDeviceState ); A_TRACE( ( _T( "CUsbPnInterface::HandleDeviceStateChange( aDeviceState:%d )"), aDeviceState )); if(aDeviceState & KUsbAlternateSetting) { - OstTrace0( TRACE_API, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE, "CUsbPnInterface::HandleDeviceStateChange - Change alternate setting" ); + OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE, "CUsbPnInterface::HandleDeviceStateChange - Change alternate setting" ); A_TRACE( ( _T( "CUsbPnInterface::HandleDeviceStateChange - Change alternate setting"))); TUint altSetNbr( aDeviceState & ~KUsbAlternateSetting ); @@ -167,13 +167,13 @@ } else { - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP1, "CUsbPnInterface::HandleDeviceStateChange - Normal state change" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP1, "CUsbPnInterface::HandleDeviceStateChange - Normal state change" ); E_TRACE( ( _T( "CUsbPnInterface::HandleDeviceStateChange - Normal state change"))); switch( aDeviceState ) { case EUsbcDeviceStateUndefined: { - OstTrace0( TRACE_API, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP4, "CUsbPnInterface::HandleDeviceStateChange - EUsbcDeviceStateUndefined" ); + OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP4, "CUsbPnInterface::HandleDeviceStateChange - EUsbcDeviceStateUndefined" ); A_TRACE( ( _T( "CUsbPnInterface::HandleDeviceStateChange - EUsbcDeviceStateUndefined"))); // Cancel async USB operations iUsbReceiver->SetEnumerated( EFalse ); @@ -182,7 +182,7 @@ } case EUsbcDeviceStateDefault: { - OstTrace0( TRACE_API, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP5, "CUsbPnInterface::HandleDeviceStateChange - EUsbcDeviceStateDefault" ); + OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP5, "CUsbPnInterface::HandleDeviceStateChange - EUsbcDeviceStateDefault" ); A_TRACE( ( _T( "CUsbPnInterface::HandleDeviceStateChange - EUsbcDeviceStateDefault"))); // Cancel async USB operations iUsbReceiver->SetEnumerated( EFalse ); @@ -191,14 +191,14 @@ } default: { - OstTrace0( TRACE_API, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP6, "CUsbPnInterface::HandleDeviceStateChange - State of no interest" ); + OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_DUP6, "CUsbPnInterface::HandleDeviceStateChange - State of no interest" ); A_TRACE( ( _T( "CUsbPnInterface::HandleDeviceStateChange - State of no interest"))); break; } } } - OstTrace0( TRACE_API, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_EXIT, "CUsbPnInterface::HandleDeviceStateChange - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_HANDLEDEVICESTATECHANGE_EXIT, "CUsbPnInterface::HandleDeviceStateChange - return void" ); A_TRACE( ( _T( "CUsbPnInterface::HandleDeviceStateChange() - return void"))); } @@ -210,7 +210,7 @@ // void CUsbPnInterface::SetAltSetting( TUint aAltSetNumber ) { - OstTrace1( TRACE_API, CUSBPNINTERFACE_SETALTSETTING_ENTRY, "CUsbPnInterface::SetAltSetting;aAltSetNumber=%u", aAltSetNumber ); + OstTrace1( TRACE_BORDER, CUSBPNINTERFACE_SETALTSETTING_ENTRY, "CUsbPnInterface::SetAltSetting;aAltSetNumber=%u", aAltSetNumber ); A_TRACE( ( _T( "CUsbPnInterface::SetAltSetting( aAltSetNumber:%d )" ), aAltSetNumber ) ); if( aAltSetNumber ) @@ -230,7 +230,7 @@ iUsbReceiver->Cancel(); } - OstTrace0( TRACE_API, CUSBPNINTERFACE_SETALTSETTING_EXIT, "CUsbPnInterface::SetAltSetting - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_SETALTSETTING_EXIT, "CUsbPnInterface::SetAltSetting - return void" ); A_TRACE( ( _T( "CUsbPnInterface::SetAltSetting() - return void"))); } @@ -242,7 +242,7 @@ // void CUsbPnInterface::InitialiseInterfaceL() { - OstTrace0( TRACE_API, CUSBPNINTERFACE_INITIALISEINTERFACEL_ENTRY, "CUsbPnInterface::InitialiseInterfaceL" ); + OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_INITIALISEINTERFACEL_ENTRY, "CUsbPnInterface::InitialiseInterfaceL" ); A_TRACE( ( _T( "CUsbPnInterface::InitialiseInterfaceL()" ) ) ); TInt ret = iCommLdd.Open(0); @@ -252,7 +252,7 @@ _LIT(KUsbLDDName, "eusbc"); ret = User::LoadLogicalDevice( KUsbLDDName ); - OstTrace1( TRACE_DETAILED, DUP100_CUSBPNINTERFACE_INITIALISEINTERFACEL, "CUsbPnInterface::InitialiseInterfaceL - Tried loading the device with status %d", ret ); + OstTrace1( TRACE_INTERNALS, DUP100_CUSBPNINTERFACE_INITIALISEINTERFACEL, "CUsbPnInterface::InitialiseInterfaceL - Tried loading the device with status %d", ret ); E_TRACE( ( _T("CUsbPnInterface::InitialiseInterfaceL - Tried loading the device with status %d"), ret ) ); if (ret == KErrNone || ret == KErrAlreadyExists) @@ -262,7 +262,7 @@ if (ret != KErrNone) { - OstTrace1( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Cannot open Comm LDD %d", ret ); + OstTrace1( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Cannot open Comm LDD %d", ret ); E_TRACE( ( _T( "USBPN - Cannot open Comm LDD %d" ), ret ) ); User::Leave( KErrNotReady ); } @@ -271,7 +271,7 @@ ret = iPnDataLdd.Open(0); if (ret != KErrNone) { - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP1, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Cannot open PnData LDD" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP1, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Cannot open PnData LDD" ); E_TRACE( ( _T( "USBPN - Cannot open PnData LDD" ) ) ); User::Leave( KErrNotReady ); } @@ -281,7 +281,7 @@ // Comm interface ////////////////////////////////////////////////////////////////////// - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP2, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Setup Comm interface" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP2, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Setup Comm interface" ); E_TRACE( ( _T( "USBPN - Setup Comm interface" ) ) ); TUsbcInterfaceInfoBuf ifc; @@ -292,7 +292,7 @@ ifc().iClass.iSubClassNum = KCommInterfaceSubClass; ifc().iClass.iProtocolNum = KCommInterfaceProtocol; - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP3, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Call SetInterface 0" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP3, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Call SetInterface 0" ); E_TRACE( ( _T( "USBPN - Call SetInterface 0" ) ) ); ret = iCommLdd.SetInterface(0, ifc); @@ -338,7 +338,7 @@ desc.Append(KVendorDMADescriptorSubType); desc.Append(KDmaCapabilities); // Is zero. Meaning interface is DMA incapable - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP4, "CUsbPnInterface::InitialiseInterfaceL - USBPN - SetCSInterfaceDescriptorBlock" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP4, "CUsbPnInterface::InitialiseInterfaceL - USBPN - SetCSInterfaceDescriptorBlock" ); E_TRACE( ( _T( "USBPN - SetCSInterfaceDescriptorBlock" ) ) ); ret = iCommLdd.SetCSInterfaceDescriptorBlock(0, desc); @@ -355,7 +355,7 @@ // PHONET data interface alt 0 ////////////////////////////////////////////////////////////////////// - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP5, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Register PHONET Data IF (alt 0)" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP5, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Register PHONET Data IF (alt 0)" ); E_TRACE( ( _T( "USBPN - Register PHONET Data IF (alt 0)" ) ) ); TUsbcInterfaceInfoBuf dataifc; @@ -365,7 +365,7 @@ dataifc().iClass.iProtocolNum = KDataInterfaceProtocol; dataifc().iTotalEndpointsUsed = 0; - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP6, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Setup PHONET Data IF (alt 0)" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP6, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Setup PHONET Data IF (alt 0)" ); E_TRACE( ( _T( "USBPN - Setup PHONET Data IF (alt 0)" ) ) ); ret = iPnDataLdd.SetInterface(0, dataifc); @@ -381,7 +381,7 @@ // data interface alt 1 ////////////////////////////////////////////////////////////////////// - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP7, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Register PHONET Data IF (alt 1)" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP7, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Register PHONET Data IF (alt 1)" ); E_TRACE( ( _T( "USBPN - Register PHONET Data IF (alt 1)" ) ) ); //Register Data Interface 1 TUsbcInterfaceInfoBuf dataifc1; @@ -394,7 +394,7 @@ TUsbDeviceCaps dCaps1; ret = iPnDataLdd.DeviceCaps(dCaps1); - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP8, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Checking result of DeviceCaps" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP8, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Checking result of DeviceCaps" ); E_TRACE( ( _T( "USBPN - Checking result of DeviceCaps" ) ) ); if ( ret ) { @@ -403,7 +403,7 @@ } const TUint totalEndpoints1 = static_cast(dCaps1().iTotalEndpoints); - OstTrace1( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP9, "CUsbPnInterface::InitialiseInterfaceL - USBPN - TotalEndpoints1=%d", totalEndpoints1 ); + OstTrace1( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP9, "CUsbPnInterface::InitialiseInterfaceL - USBPN - TotalEndpoints1=%d", totalEndpoints1 ); E_TRACE( ( _T( "USBPN - TotalEndpoints1 %d" ), totalEndpoints1 ) ); if (totalEndpoints1 < KUsbPnRequiredNumberOfEndpoints) { @@ -415,7 +415,7 @@ TUsbcEndpointData data1[KUsbcMaxEndpoints]; TPtr8 dataptr1 = TPtr8(reinterpret_cast(data1), sizeof(data1), sizeof(data1)); ret = iPnDataLdd.EndpointCaps(dataptr1); - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP10, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Checking result of EndpointCaps" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP10, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Checking result of EndpointCaps" ); E_TRACE( ( _T( "USBPN - Checking result of EndpointCaps" ) ) ); if (ret) { @@ -429,35 +429,35 @@ for (TUint ii = 0 ; ii < totalEndpoints1; ii++) { - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP11, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Set data interface 1" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP11, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Set data interface 1" ); E_TRACE( ( _T( "USBPN - Set data interface 1" ) ) ); const TUsbcEndpointCaps* caps; caps = &data1[ii].iCaps; - OstTraceExt2( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP12, "CUsbPnInterface::InitialiseInterfaceL - USBPN - iTypesAndDir=%d, epSize=%d", caps->iTypesAndDir, caps->MaxPacketSize() ); + OstTraceExt2( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP12, "CUsbPnInterface::InitialiseInterfaceL - USBPN - iTypesAndDir=%d, epSize=%d", caps->iTypesAndDir, caps->MaxPacketSize() ); E_TRACE( ( _T( "USBPN - iTypesAndDir %d, epSize:%d" ), caps->iTypesAndDir, caps->MaxPacketSize() ) ); #ifdef EXTENDED_TRACE_FLAG if(((caps->iTypesAndDir & (KUsbEpDirIn)) == (KUsbEpDirIn) ) ) { - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP13, "CUsbPnInterface::InitialiseInterfaceL - USBPN - IN" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP13, "CUsbPnInterface::InitialiseInterfaceL - USBPN - IN" ); E_TRACE( ( _T( "USBPN - IN" ))); } if(((caps->iTypesAndDir & (KUsbEpDirOut)) == (KUsbEpDirOut) ) ) { - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP14, "CUsbPnInterface::InitialiseInterfaceL - USBPN - OUT" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP14, "CUsbPnInterface::InitialiseInterfaceL - USBPN - OUT" ); E_TRACE( ( _T( "USBPN - OUT" ))); } if(((caps->iTypesAndDir & (KUsbEpTypeBulk)) == (KUsbEpTypeBulk))) { - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP15, "CUsbPnInterface::InitialiseInterfaceL - USBPN - BULK" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP15, "CUsbPnInterface::InitialiseInterfaceL - USBPN - BULK" ); E_TRACE( ( _T( "USBPN - BULK" ))); } #endif // EXTENDED_TRACE_FLAG if(data1[ii].iInUse) { - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP16, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Ep in use. Next..." ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP16, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Ep in use. Next..." ); E_TRACE( ( _T( "USBPN - Ep in use. Next..."))); continue; } @@ -466,7 +466,7 @@ if (((caps->iTypesAndDir & (KUsbEpTypeBulk | KUsbEpDirIn)) == (KUsbEpTypeBulk | KUsbEpDirIn)) && !inFound) { - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP17, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Bulk IN found for EEndpoint1" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP17, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Bulk IN found for EEndpoint1" ); E_TRACE( ( _T( "USBPN - Bulk IN found for EEndpoint1" ) ) ); // EEndpoint1 is bulk in endpoint dataifc1().iEndpointData[0].iType = KUsbEpTypeBulk; @@ -479,7 +479,7 @@ else if (((caps->iTypesAndDir & (KUsbEpTypeBulk | KUsbEpDirOut)) == (KUsbEpTypeBulk | KUsbEpDirOut)) && !outFound) { - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP18, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Bulk OUT found for EEndpoint2" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP18, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Bulk OUT found for EEndpoint2" ); E_TRACE( ( _T( "USBPN - Bulk OUT found for EEndpoint2" ) ) ); // EEndpoint2 is bulk out endpoint dataifc1().iEndpointData[1].iType = KUsbEpTypeBulk; @@ -495,7 +495,7 @@ break; } } // end for ( ... ) - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP19, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Checking epFound" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP19, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Checking epFound" ); E_TRACE( ( _T( "USBPN - Checking epFound" ) ) ); if (!outFound || !inFound ) { @@ -503,7 +503,7 @@ User::Leave( KErrGeneral ); } - OstTrace0( TRACE_DETAILED, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP20, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Setting LCIF Data IF (alt 1)" ); + OstTrace0( TRACE_INTERNALS, CUSBPNINTERFACE_INITIALISEINTERFACEL_DUP20, "CUsbPnInterface::InitialiseInterfaceL - USBPN - Setting LCIF Data IF (alt 1)" ); E_TRACE( ( _T( "USBPN - Setting LCIF Data IF (alt 1)" ) ) ); ret = iPnDataLdd.SetInterface(1, dataifc1); @@ -527,7 +527,7 @@ // EXPORT_C void CUsbPnInterface::ReleaseInterface() { - OstTrace0( TRACE_API, CUSBPNINTERFACE_RELEASEINTERFACE_ENTRY, "CUsbPnInterface::ReleaseInterface" ); + OstTrace0( TRACE_BORDER, CUSBPNINTERFACE_RELEASEINTERFACE_ENTRY, "CUsbPnInterface::ReleaseInterface" ); A_TRACE( ( _T( "CUsbPnInterface::ReleaseInterface()" ) ) ); iAlt->Cancel(); diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnisareceiver.cpp --- a/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnisareceiver.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnisareceiver.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -140,7 +140,7 @@ // void CUsbPnIsaReceiver::RunL( ) { - OstTrace1( TRACE_API, CUSBPNISARECEIVER_RUNL_ENTRY, "CUsbPnIsaReceiver::RunL;iStatus=%d", iStatus.Int() ); + OstTrace1( TRACE_BORDER, CUSBPNISARECEIVER_RUNL_ENTRY, "CUsbPnIsaReceiver::RunL;iStatus=%d", iStatus.Int() ); A_TRACE( ( _T( "CUsbPnIsaReceiver::RunL() iStatus:%d" ), iStatus.Int() ) ); User::LeaveIfError(iStatus.Int()); @@ -152,7 +152,7 @@ if( (iRecvPtr[ISI_HEADER_OFFSET_RESOURCEID] == PN_MEDIA_CONTROL) && (iRecvPtr[ISI_HEADER_OFFSET_MESSAGEID] == PNS_MEDIA_SPECIFIC_RESP) ) { - OstTrace0( TRACE_API, CUSBPNISARECEIVER_RUNL, "CUsbPnIsaReceiver::RunL - Media specific resp" ); + OstTrace0( TRACE_BORDER, CUSBPNISARECEIVER_RUNL, "CUsbPnIsaReceiver::RunL - Media specific resp" ); A_TRACE( ( _T( "CUsbPnIsaReceiver::RunL - Media specific resp" ))); iPacket->ReleaseL(); ReceivingNextPacket(); @@ -171,14 +171,14 @@ // PC phonet connection not open else { - OstTrace0( TRACE_API, CUSBPNISARECEIVER_RUNL_DUP2, "CUsbPnIsaReceiver::RunL - Discarding" ); + OstTrace0( TRACE_BORDER, CUSBPNISARECEIVER_RUNL_DUP2, "CUsbPnIsaReceiver::RunL - Discarding" ); A_TRACE( ( _T( "CUsbPnIsaReceiver::RunL - Discarding" ))); iPacket->ReleaseL(); ReceivingNextPacket(); } } - OstTrace0( TRACE_API, CUSBPNISARECEIVER_RUNL_EXIT, "CUsbPnIsaReceiver::RunL - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNISARECEIVER_RUNL_EXIT, "CUsbPnIsaReceiver::RunL - return void" ); A_TRACE( ( _T( "CUsbPnIsaReceiver::RunL() - return void" ) ) ); } @@ -192,10 +192,10 @@ C_TRACE( ( _T( "CUsbPnIsaReceiver::ReceivingNextPacket()" ) ) ); iRecvPtr.Set( iPacket->Buffer().Des() ); iIscApi.Receive( iStatus, iRecvPtr, iNeededLength ); - OstTrace0( TRACE_DETAILED, CUSBPNISARECEIVER_RECEIVINGNEXTPACKET_DUP1, "CUsbPnIsaReceiver::ReceivingNextPacket - receiving new" ); + OstTrace0( TRACE_INTERNALS, CUSBPNISARECEIVER_RECEIVINGNEXTPACKET_DUP1, "CUsbPnIsaReceiver::ReceivingNextPacket - receiving new" ); E_TRACE((_T("CUsbPnIsaReceiver::ReceivingNextPacket - Receiving new"))); SetActive(); - OstTrace0( TRACE_API, CUSBPNISARECEIVER_RECEIVINGNEXTPACKET_EXIT, "CUsbPnIsaReceiver::ReceivingNextPacket - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNISARECEIVER_RECEIVINGNEXTPACKET_EXIT, "CUsbPnIsaReceiver::ReceivingNextPacket - return void" ); A_TRACE( ( _T( "CUsbPnIsaReceiver::ReceivingNextPacket() - return void" ) ) ); } @@ -205,14 +205,14 @@ // TInt CUsbPnIsaReceiver::RunError( TInt aError ) { - OstTrace1( TRACE_API, CUSBPNISARECEIVER_RUNERROR_ENTRY, "CUsbPnIsaReceiver::RunError;aError=%d", aError ); + OstTrace1( TRACE_BORDER, CUSBPNISARECEIVER_RUNERROR_ENTRY, "CUsbPnIsaReceiver::RunError;aError=%d", aError ); A_TRACE( ( _T( "CUsbPnIsaReceiver::RunError( aError:%d )" ), aError ) ); switch( aError ) { case KErrNoMemory: { - OstTrace0( TRACE_DETAILED, CUSBPNISARECEIVER_RUNERROR, "CUsbPnIsaReceiver::RunError - Release packet buffer and alloc bigger for temporary use" ); + OstTrace0( TRACE_INTERNALS, CUSBPNISARECEIVER_RUNERROR, "CUsbPnIsaReceiver::RunError - Release packet buffer and alloc bigger for temporary use" ); E_TRACE( ( _T( "CUsbPnIsaReceiver::RunError - Release packet buffer and alloc bigger for temporary use" ))); aError = KErrNone; TRAP( aError, iPacket->ReallocBufferL( iNeededLength ) ); @@ -224,7 +224,7 @@ } case KErrOverflow: { - OstTrace0( TRACE_DETAILED, CUSBPNISARECEIVER_RUNERROR_DUP2, "CUsbPnIsaReceiver::RunError - Release ISC buffer." ); + OstTrace0( TRACE_INTERNALS, CUSBPNISARECEIVER_RUNERROR_DUP2, "CUsbPnIsaReceiver::RunError - Release ISC buffer." ); E_TRACE( ( _T( "CUsbPnIsaReceiver::RunError - Release ISC buffer." ))); iIscApi.ResetBuffers(); // Connection was probably down, so the old messages are not needed break; @@ -297,14 +297,14 @@ OstTrace0( TRACE_NORMAL, CUSBPNISARECEIVER_CONSTRUCTMESSAGE_ENTRY, "CUsbPnIsaReceiver::ConstructMessage" ); C_TRACE( ( _T( "CUsbPnIsaReceiver::ConstructMessage()" ) ) ); - OstTrace1( TRACE_DETAILED, CUSBPNISARECEIVER_CONSTRUCTMESSAGE, "CUsbPnIsaReceiver::ConstructMessage - Convert endianness;iRecvPtr.Length()=%d", iRecvPtr.Length() ); + OstTrace1( TRACE_INTERNALS, CUSBPNISARECEIVER_CONSTRUCTMESSAGE, "CUsbPnIsaReceiver::ConstructMessage - Convert endianness;iRecvPtr.Length()=%d", iRecvPtr.Length() ); E_TRACE( ( _T( "CUsbPnIsaReceiver::ConstructMessage() - Convert endianness - iRecvPtr.Length():%d" ), iRecvPtr.Length() ) ); -#ifdef ISI_LENGTH_LITTLE_ENDIAN +#ifndef ISI_LENGTH_BIG_ENDIAN TUint8 lsb(iRecvPtr[ISI_HEADER_OFFSET_LENGTH]); TUint8 msb(iRecvPtr[ISI_HEADER_OFFSET_LENGTH +1]); iRecvPtr[ISI_HEADER_OFFSET_LENGTH] = msb; iRecvPtr[ISI_HEADER_OFFSET_LENGTH +1] = lsb; -#endif // ISI_LENGTH_LITTLE_ENDIAN +#endif // ISI_LENGTH_BIG_ENDIAN OstTrace0( TRACE_NORMAL, CUSBPNISARECEIVER_CONSTRUCTMESSAGE_EXIT, "CUsbPnIsaReceiver::ConstructMessage - return void" ); C_TRACE( ( _T( "CUsbPnIsaReceiver::ConstructMessage() - return void" ) ) ); } diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnisasender.cpp --- a/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnisasender.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnisasender.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -119,7 +119,7 @@ // ----------------------------------------------------------------------------- void CUsbPnIsaSender::DeletePackets( ) { - OstTrace0( TRACE_API, CUSBPNISASENDER_DELETEPACKETS_ENTRY, "CUsbPnIsaSender::DeletePackets" ); + OstTrace0( TRACE_BORDER, CUSBPNISASENDER_DELETEPACKETS_ENTRY, "CUsbPnIsaSender::DeletePackets" ); A_TRACE( ( _T( "CUsbPnIsaSender::DeletePackets()" ) ) ); CUsbPnPacket* packet = NULL; while(iPacketCount > 0) @@ -129,7 +129,7 @@ delete iPacket; iPacket = packet; } - OstTrace0( TRACE_API, CUSBPNISASENDER_DELETEPACKETS_EXIT, "CUsbPnIsaSender::DeletePackets - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNISASENDER_DELETEPACKETS_EXIT, "CUsbPnIsaSender::DeletePackets - return void" ); A_TRACE( ( _T( "CUsbPnIsaSender::DeletePackets() - return void" ) ) ); } @@ -176,7 +176,7 @@ // void CUsbPnIsaSender::RunL( ) { - OstTrace1( TRACE_API, CUSBPNISASENDER_RUNL_ENTRY, "CUsbPnIsaSender::RunL;iStatus=%d", iStatus.Int() ); + OstTrace1( TRACE_BORDER, CUSBPNISASENDER_RUNL_ENTRY, "CUsbPnIsaSender::RunL;iStatus=%d", iStatus.Int() ); A_TRACE( ( _T( "CUsbPnIsaSender::RunL() iStatus:%d" ), iStatus.Int() ) ); User::LeaveIfError( iStatus.Int() ); @@ -186,18 +186,18 @@ iBufferListener.Receive( ETrue ); iCurrentPacket = &iCurrentPacket->NextPacket(); - OstTraceExt2( TRACE_DETAILED, CUSBPNISASENDER_RUNL, "CUsbPnIsaSender::RunL;tail:%d,head:%d", iCurrentPacket->PacketNumber(), iPacket->PacketNumber() ); + OstTraceExt2( TRACE_INTERNALS, CUSBPNISASENDER_RUNL, "CUsbPnIsaSender::RunL;tail:%d,head:%d", iCurrentPacket->PacketNumber(), iPacket->PacketNumber() ); E_TRACE( ( _T( "CUsbPnIsaSender::RunL() - tail:%d,head:%d " ), iCurrentPacket->PacketNumber(), iPacket->PacketNumber())); if(iCurrentPacket != iPacket) { // Continue write - OstTrace0( TRACE_DETAILED, CUSBPNISASENDER_RUNL_DUP1, "CUsbPnIsaSender::RunL - Write next in queue." ); + OstTrace0( TRACE_INTERNALS, CUSBPNISASENDER_RUNL_DUP1, "CUsbPnIsaSender::RunL - Write next in queue." ); E_TRACE( ( _T( "CUsbPnIsaSender::RunL() - Write next in queue." ))); TryToSendPacket( iCurrentPacket->NextPacket() ); } - OstTrace0( TRACE_API, CUSBPNISASENDER_RUNL_EXIT, "CUsbPnIsaSender::RunL - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNISASENDER_RUNL_EXIT, "CUsbPnIsaSender::RunL - return void" ); A_TRACE( ( _T( "CUsbPnIsaSender::RunL() - return void" ) ) ); } @@ -207,7 +207,7 @@ // TInt CUsbPnIsaSender::RunError( TInt aError ) { - OstTrace1( TRACE_API, CUSBPNISASENDER_RUNERROR_ENTRY, "CUsbPnIsaSender::RunError;aError=%d", aError ); + OstTrace1( TRACE_BORDER, CUSBPNISASENDER_RUNERROR_ENTRY, "CUsbPnIsaSender::RunError;aError=%d", aError ); A_TRACE( ( _T( "CUsbPnIsaSender::RunError( aError:%d )" ), aError ) ); switch( aError ) @@ -261,14 +261,14 @@ void CUsbPnIsaSender::AddPacketToSendingQueue( CUsbPnPacket& aPacket ) { ASSERT( &aPacket ); - OstTrace1( TRACE_API, CUSBPNISASENDER_ADDPACKETTOSENDINGQUEUE_ENTRY, "CUsbPnIsaSender::AddPacketToSendingQueue;aPacket=%x", ( TUint )&( aPacket ) ); + OstTrace1( TRACE_BORDER, CUSBPNISASENDER_ADDPACKETTOSENDINGQUEUE_ENTRY, "CUsbPnIsaSender::AddPacketToSendingQueue;aPacket=%x", ( TUint )&( aPacket ) ); A_TRACE( ( _T( "CUsbPnIsaSender::AddPacketToSendingQueue( aPacket:0x%x)" ), &aPacket ) ); CUsbPnPacket& packet( iPacket->NextPacket() ); if( &packet == &aPacket ) { iPacket = &packet; - OstTrace1( TRACE_DETAILED, CUSBPNISASENDER_ADDPACKETTOSENDINGQUEUE, "CUsbPnIsaSender::AddPacketToSendingQueue;packet number:%d", iPacket->PacketNumber() ); + OstTrace1( TRACE_INTERNALS, CUSBPNISASENDER_ADDPACKETTOSENDINGQUEUE, "CUsbPnIsaSender::AddPacketToSendingQueue;packet number:%d", iPacket->PacketNumber() ); E_TRACE( ( _T( "CUsbPnIsaSender::AddPacketToSendingQueue() - packet number:%d" ), iPacket->PacketNumber() ) ); TryToSendPacket( *iPacket ); @@ -279,7 +279,7 @@ User::Panic(_L("USBPNSERVER"), KErrTotalLossOfPrecision); } - OstTrace0( TRACE_API, CUSBPNISASENDER_ADDPACKETTOSENDINGQUEUE_EXIT, "CUsbPnIsaSender::AddPacketToSendingQueue - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNISASENDER_ADDPACKETTOSENDINGQUEUE_EXIT, "CUsbPnIsaSender::AddPacketToSendingQueue - return void" ); A_TRACE( ( _T( "CUsbPnIsaSender::AddPacketToSendingQueue() - return void" ) ) ); } @@ -291,7 +291,7 @@ void CUsbPnIsaSender::TryToSendPacket( CUsbPnPacket& aPacket ) { ASSERT( &aPacket ); - OstTrace1( TRACE_API, CUSBPNISASENDER_TRYTOSENDPACKET_ENTRY, "CUsbPnIsaSender::TryToSendPacket;aPacket=%x", ( TUint )&( aPacket ) ); + OstTrace1( TRACE_BORDER, CUSBPNISASENDER_TRYTOSENDPACKET_ENTRY, "CUsbPnIsaSender::TryToSendPacket;aPacket=%x", ( TUint )&( aPacket ) ); A_TRACE( ( _T( "CUsbPnIsaSender::TryToSendPacket( aPacket:0x%x )" ), &aPacket ) ); if(!IsActive()) @@ -299,7 +299,7 @@ if( &aPacket == ( &iCurrentPacket->NextPacket() ) || &aPacket == iCurrentPacket ) { - OstTrace0( TRACE_DETAILED, CUSBPNISASENDER_TRYTOSENDPACKET, "CUsbPnIsaSender::TryToSendPacket - Send to ISA" ); + OstTrace0( TRACE_INTERNALS, CUSBPNISASENDER_TRYTOSENDPACKET, "CUsbPnIsaSender::TryToSendPacket - Send to ISA" ); E_TRACE( ( _T( "CUsbPnIsaSender::TryToSendPacket() - Send to ISA"))); @@ -309,7 +309,7 @@ TInt length( data.Length() ); for( TInt i = 0; i < length; i++ ) { - OstTraceExt2( TRACE_DETAILED, CUSBPNISASENDER_TRYTOSENDPACKET_DUP1, "CUsbPnIsaSender::Send([%d] = %x )", i, data[i] ); + OstTraceExt2( TRACE_INTERNALS, CUSBPNISASENDER_TRYTOSENDPACKET_DUP1, "CUsbPnIsaSender::Send([%d] = %x )", i, data[i] ); E_TRACE( ( _T( "CUsbPnIsaSender::Send([%d] = %x )" ), i, data[i] ) ); i++; } @@ -326,11 +326,11 @@ } else { - OstTrace0( TRACE_DETAILED, CUSBPNISASENDER_TRYTOSENDPACKET_DUP2, "CUsbPnIsaSender::TryToSendPacket - Already sending" ); + OstTrace0( TRACE_INTERNALS, CUSBPNISASENDER_TRYTOSENDPACKET_DUP2, "CUsbPnIsaSender::TryToSendPacket - Already sending" ); E_TRACE( ( _T( "CUsbPnIsaSender::TryToSendPacket() - Already sending"))); } - OstTrace0( TRACE_API, CUSBPNISASENDER_TRYTOSENDPACKET_EXIT, "CUsbPnIsaSender::TryToSendPacket - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNISASENDER_TRYTOSENDPACKET_EXIT, "CUsbPnIsaSender::TryToSendPacket - return void" ); A_TRACE( ( _T( "CUsbPnIsaSender::TryToSendPacket() - return void" ) ) ); } diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnpacket.cpp --- a/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnpacket.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnpacket.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -201,7 +201,7 @@ TPtr8 ptr(iBuffer->Des()); if(ptr.Length() > KPnPacketSize ) { - OstTrace0( TRACE_DETAILED, CUSBPNPACKET_RELEASEL, "CUsbPnPacket::ReleaseL - Returning to normal size" ); + OstTrace0( TRACE_INTERNALS, CUSBPNPACKET_RELEASEL, "CUsbPnPacket::ReleaseL - Returning to normal size" ); E_TRACE((_T("CUsbPnPacket::ReleaseL() - Returning to normal size"))); delete iBuffer; iBuffer = NULL; diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnscheduler.cpp --- a/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnscheduler.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnscheduler.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -102,7 +102,7 @@ TInt CUsbPnScheduler::ThreadStart( ) { - OstTrace0( TRACE_API, CUSBPNSCHEDULER_THREADSTART_ENTRY, "CUsbPnScheduler::ThreadStart" ); + OstTrace0( TRACE_BORDER, CUSBPNSCHEDULER_THREADSTART_ENTRY, "CUsbPnScheduler::ThreadStart" ); A_TRACE(_T("CUsbPnScheduler::ThreadStart()")); TInt err(KErrNone); @@ -125,7 +125,7 @@ } - OstTrace1( TRACE_API, CUSBPNSCHEDULER_THREADSTART_EXIT, "CUsbPnScheduler::ThreadStart - return %d", err ); + OstTrace1( TRACE_BORDER, CUSBPNSCHEDULER_THREADSTART_EXIT, "CUsbPnScheduler::ThreadStart - return %d", err ); A_TRACE((_T("CUsbPnScheduler::ThreadStart() - return %d"), err)); return err; } diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnusbreceiver.cpp --- a/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnusbreceiver.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnusbreceiver.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -154,7 +154,7 @@ // void CUsbPnUsbReceiver::RunL( ) { - OstTrace1( TRACE_API, CUSBPNUSBRECEIVER_RUNL_ENTRY, "CUsbPnUsbReceiver::RunL;iStatus:%d", iStatus.Int() ); + OstTrace1( TRACE_BORDER, CUSBPNUSBRECEIVER_RUNL_ENTRY, "CUsbPnUsbReceiver::RunL;iStatus:%d", iStatus.Int() ); A_TRACE( ( _T( "CUsbPnUsbReceiver::RunL() iStatus:%d" ), iStatus.Int() ) ); User::LeaveIfError( iStatus.Int() ); @@ -168,7 +168,7 @@ Receive( ETrue ); } - OstTrace0( TRACE_API, CUSBPNUSBRECEIVER_RUNL_EXIT, "CUsbPnUsbReceiver::RunL - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNUSBRECEIVER_RUNL_EXIT, "CUsbPnUsbReceiver::RunL - return void" ); A_TRACE( ( _T( "CUsbPnUsbReceiver::RunL() - return void" ) ) ); } @@ -177,10 +177,10 @@ // ----------------------------------------------------------------------------- void CUsbPnUsbReceiver::SetMessageComplete( const TBool aMsgComplete ) { - OstTrace1( TRACE_API, CUSBPNUSBRECEIVER_SETMESSAGECOMPLETE_ENTRY, "CUsbPnUsbReceiver::SetMessageComplete;aMsgComplete:%d", aMsgComplete ); + OstTrace1( TRACE_BORDER, CUSBPNUSBRECEIVER_SETMESSAGECOMPLETE_ENTRY, "CUsbPnUsbReceiver::SetMessageComplete;aMsgComplete:%d", aMsgComplete ); A_TRACE( ( _T( "CUsbPnUsbReceiver::SetMessageComplete() aMsgComplete:%d" ), aMsgComplete ) ); iMessageComplete = aMsgComplete; - OstTrace0( TRACE_API, CUSBPNUSBRECEIVER_SETMESSAGECOMPLETE_EXIT, "CUsbPnUsbReceiver::SetMessageComplete - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNUSBRECEIVER_SETMESSAGECOMPLETE_EXIT, "CUsbPnUsbReceiver::SetMessageComplete - return void" ); A_TRACE( ( _T( "CUsbPnUsbReceiver::SetMessageComplete() - return void" ) ) ); } @@ -189,10 +189,10 @@ // ----------------------------------------------------------------------------- void CUsbPnUsbReceiver::SetByteCount( const TUint aByteCount ) { - OstTrace1( TRACE_API, CUSBPNUSBRECEIVER_SETBYTECOUNT_ENTRY, "CUsbPnUsbReceiver::SetByteCount;aByteCount:%d", aByteCount ); + OstTrace1( TRACE_BORDER, CUSBPNUSBRECEIVER_SETBYTECOUNT_ENTRY, "CUsbPnUsbReceiver::SetByteCount;aByteCount:%d", aByteCount ); A_TRACE( ( _T( "CUsbPnUsbReceiver::SetByteCount() aByteCount:%d" ), aByteCount ) ); iByteCount = aByteCount; - OstTrace0( TRACE_API, CUSBPNUSBRECEIVER_SETBYTECOUNT_EXIT, "CUsbPnUsbReceiver::SetByteCount - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNUSBRECEIVER_SETBYTECOUNT_EXIT, "CUsbPnUsbReceiver::SetByteCount - return void" ); A_TRACE( ( _T( "CUsbPnUsbReceiver::SetByteCount() - return void" ) ) ); } @@ -202,10 +202,10 @@ // ----------------------------------------------------------------------------- void CUsbPnUsbReceiver::SetMessageLength( const TUint aMessageLength ) { - OstTrace1( TRACE_API, CUSBPNUSBRECEIVER_SetMessageLength_ENTRY, "CUsbPnUsbReceiver::SetMessageLength;aMessageLength:%d", aMessageLength ); + OstTrace1( TRACE_BORDER, CUSBPNUSBRECEIVER_SetMessageLength_ENTRY, "CUsbPnUsbReceiver::SetMessageLength;aMessageLength:%d", aMessageLength ); A_TRACE( ( _T( "CUsbPnUsbReceiver::SetMessageLength() aMessageLength:%d" ), aMessageLength ) ); iMessageLength = aMessageLength; - OstTrace0( TRACE_API, CUSBPNUSBRECEIVER_SetMessageLength_EXIT, "CUsbPnUsbReceiver::SetMessageLength - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNUSBRECEIVER_SetMessageLength_EXIT, "CUsbPnUsbReceiver::SetMessageLength - return void" ); A_TRACE( ( _T( "CUsbPnUsbReceiver::SetMessageLength() - return void" ) ) ); } @@ -215,7 +215,7 @@ // TInt CUsbPnUsbReceiver::RunError( TInt aError ) { - OstTrace1( TRACE_API, CUSBPNUSBRECEIVER_RUNERROR_ENTRY, "CUsbPnUsbReceiver::RunError;aError=%d", aError ); + OstTrace1( TRACE_BORDER, CUSBPNUSBRECEIVER_RUNERROR_ENTRY, "CUsbPnUsbReceiver::RunError;aError=%d", aError ); A_TRACE( ( _T( "CUsbPnUsbReceiver::RunError(aError:%d)" ), aError ) ); switch( aError ) @@ -324,7 +324,7 @@ C_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage()" ) ) ); TUint packetLength( iPacket->Buffer().Length() ); - OstTrace1( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL, "CUsbPnUsbReceiver::ConstructMessageL;packetLength=%d", packetLength ); + OstTrace1( TRACE_INTERNALS, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL, "CUsbPnUsbReceiver::ConstructMessageL;packetLength=%d", packetLength ); E_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage - packetLength:%d" ), packetLength ) ); // New message @@ -335,18 +335,18 @@ iMessageLength = ( lsb | ( msb<<8 ) ); - OstTrace1( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP1, "CUsbPnUsbReceiver::ConstructMessageL;iMessageLength=%d", iMessageLength ); + OstTrace1( TRACE_INTERNALS, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP1, "CUsbPnUsbReceiver::ConstructMessageL;iMessageLength=%d", iMessageLength ); E_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage - iMessageLength:%d" ), iMessageLength ) ); if( iMessageLength >= 4 ) { iByteCount = packetLength; - OstTrace1( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP2, "CUsbPnUsbReceiver::ConstructMessageLNew message;Received:%d", iByteCount ); + OstTrace1( TRACE_INTERNALS, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP2, "CUsbPnUsbReceiver::ConstructMessageLNew message;Received:%d", iByteCount ); E_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage - New message. Received:%d"), iByteCount)); if( ( PN_HEADER_SIZE + iMessageLength ) > packetLength ) { - OstTrace0( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP3, "CUsbPnUsbReceiver::ConstructMessageL - partial message. Receive more" ); + OstTrace0( TRACE_INTERNALS, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP3, "CUsbPnUsbReceiver::ConstructMessageL - partial message. Receive more" ); E_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage - partial message. Receive more"))); iStorage = HBufC8::NewL( iMessageLength + PN_HEADER_SIZE ); @@ -360,7 +360,7 @@ else { iByteCount = iByteCount + packetLength; - OstTrace1( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP4, "CUsbPnUsbReceiver::ConstructMessageL - Append to previous part;iByteCount:%d", iByteCount ); + OstTrace1( TRACE_INTERNALS, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP4, "CUsbPnUsbReceiver::ConstructMessageL - Append to previous part;iByteCount:%d", iByteCount ); E_TRACE((_T("CUsbPnUsbReceiver::ConstructMessage - Append to previous part. iByteCount:%d"), iByteCount)); TPtr8 tmp( iStorage->Des() ); tmp.Append( iPacket->Buffer() ); @@ -369,12 +369,12 @@ // message ready to be sent if( iByteCount == ( iMessageLength + PN_HEADER_SIZE ) ) { - OstTrace0( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP5, "CUsbPnUsbReceiver::ConstructMessageL - message complete" ); + OstTrace0( TRACE_INTERNALS, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP5, "CUsbPnUsbReceiver::ConstructMessageL - message complete" ); E_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage - message complete"))); if( iByteCount > KPnPacketSize ) { - OstTrace0( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP6, "CUsbPnUsbReceiver::ConstructMessageL - realloc for whole message" ); + OstTrace0( TRACE_INTERNALS, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP6, "CUsbPnUsbReceiver::ConstructMessageL - realloc for whole message" ); E_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage - realloc for whole message"))); iPacket->ReallocBufferL( iMessageLength + PN_HEADER_SIZE ); iRecvPtr.Set( iPacket->Buffer().Des() ); @@ -383,7 +383,7 @@ iStorage = NULL; } -#ifdef ISI_LENGTH_LITTLE_ENDIAN +#ifndef ISI_LENGTH_BIG_ENDIAN // Converts the endianess of message length TUint8 tmp4(iRecvPtr[ISI_HEADER_OFFSET_LENGTH]); TUint8 tmp5(iRecvPtr[ISI_HEADER_OFFSET_LENGTH +1]); @@ -396,7 +396,7 @@ if( (iRecvPtr[ISI_HEADER_OFFSET_RESOURCEID] == PN_EPOC_TEST) && (iRecvPtr[ISI_HEADER_OFFSET_MESSAGEID] == TS_SOS_FILE_WRITE_REQ ) ) { - OstTrace0( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP7, "CUsbPnUsbReceiver::ConstructMessageL - Message to APE Test Server" ); + OstTrace0( TRACE_INTERNALS, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP7, "CUsbPnUsbReceiver::ConstructMessageL - Message to APE Test Server" ); E_TRACE( ( _T( "CUsbPnUsbReceiver::ConstructMessage - Message to APE Test Server"))); iRecvPtr[ISI_HEADER_OFFSET_RECEIVERDEVICE] = PN_DEV_SOS; @@ -412,7 +412,7 @@ iPacket->ReleaseL(); iRecvPtr.Set( iPacket->Buffer().Des() ); iLdd.ReadUntilShort( iStatus, EEndpoint2, iRecvPtr ); - OstTrace0( TRACE_DETAILED, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP8, "CUsbPnUsbReceiver::ConstructMessageL - Receiving" ); + OstTrace0( TRACE_INTERNALS, CUSBPNUSBRECEIVER_CONSTRUCTMESSAGEL_DUP8, "CUsbPnUsbReceiver::ConstructMessageL - Receiving" ); E_TRACE((_T("CUsbPnUsbReceiver::ConstructMessage - Receiving"))); SetActive(); } diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnusbsender.cpp --- a/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnusbsender.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/usbphonetlink/usbpnserver_exe/src/cusbpnusbsender.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -121,7 +121,7 @@ // ----------------------------------------------------------------------------- void CUsbPnUsbSender::DeletePackets( ) { - OstTrace0( TRACE_API, CUSBPNUSBSENDER_DELETEPACKETS_ENTRY, "CUsbPnUsbSender::DeletePackets" ); + OstTrace0( TRACE_BORDER, CUSBPNUSBSENDER_DELETEPACKETS_ENTRY, "CUsbPnUsbSender::DeletePackets" ); A_TRACE( ( _T( "CUsbPnUsbSender::DeletePackets()" ) ) ); CUsbPnPacket* packet = NULL; while(iPacketCount > 0) @@ -131,7 +131,7 @@ delete iPacket; iPacket = packet; } - OstTrace0( TRACE_API, CUSBPNUSBSENDER_DELETEPACKETS_EXIT, "CUsbPnUsbSender::DeletePackets - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNUSBSENDER_DELETEPACKETS_EXIT, "CUsbPnUsbSender::DeletePackets - return void" ); A_TRACE( ( _T( "CUsbPnUsbSender::DeletePackets() - return void" ) ) ); } @@ -184,16 +184,16 @@ void CUsbPnUsbSender::AddPacketToSendingQueue( CUsbPnPacket& aPacket ) { ASSERT( &aPacket ); - OstTrace0( TRACE_API, CUSBPNUSBSENDER_ADDPACKETTOSENDINGQUEUE_ENTRY, "CUsbPnUsbSender::AddPacketToSendingQueue" ); + OstTrace0( TRACE_BORDER, CUSBPNUSBSENDER_ADDPACKETTOSENDINGQUEUE_ENTRY, "CUsbPnUsbSender::AddPacketToSendingQueue" ); A_TRACE( ( _T( "CUsbPnUsbSender::Send()" ) ) ); iPacket = &iPacket->NextPacket(); - OstTrace1( TRACE_DETAILED, CUSBPNUSBSENDER_ADDPACKETTOSENDINGQUEUE, "CUsbPnUsbSender::AddPacketToSendingQueue;packet number:%d", iPacket->PacketNumber() ); + OstTrace1( TRACE_INTERNALS, CUSBPNUSBSENDER_ADDPACKETTOSENDINGQUEUE, "CUsbPnUsbSender::AddPacketToSendingQueue;packet number:%d", iPacket->PacketNumber() ); E_TRACE( ( _T( "CUsbPnUsbSender::AddPacketToSendingQueue() - packet number:%d" ), iPacket->PacketNumber() ) ); TryToSendPacket( *iPacket ); - OstTrace0( TRACE_API, CUSBPNUSBSENDER_ADDPACKETTOSENDINGQUEUE_EXIT, "CUsbPnUsbSender::AddPacketToSendingQueue - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNUSBSENDER_ADDPACKETTOSENDINGQUEUE_EXIT, "CUsbPnUsbSender::AddPacketToSendingQueue - return void" ); A_TRACE( ( _T( "CUsbPnUsbSender::AddPacketToSendingQueue() - return void" ) ) ); } @@ -204,7 +204,7 @@ void CUsbPnUsbSender::TryToSendPacket( const CUsbPnPacket& aPacket ) { ASSERT( &aPacket ); - OstTraceExt2( TRACE_API, CUSBPNUSBSENDER_TRYTOSENDPACKET_ENTRY, "CUsbPnUsbSender::TryToSendPacket;aPacket=0x%x;iCurrentPacket=%d", ( TUint )&( aPacket ), iCurrentPacket->PacketNumber() ); + OstTraceExt2( TRACE_BORDER, CUSBPNUSBSENDER_TRYTOSENDPACKET_ENTRY, "CUsbPnUsbSender::TryToSendPacket;aPacket=0x%x;iCurrentPacket=%d", ( TUint )&( aPacket ), iCurrentPacket->PacketNumber() ); A_TRACE( ( _T( "CUsbPnUsbSender::TryToSendPacket( aPacketNumber:0x%x, iCurrentPacket:%d )" ), &aPacket, iCurrentPacket->PacketNumber( ) )); // Write message to USB @@ -213,7 +213,7 @@ if( &aPacket == ( &iCurrentPacket->NextPacket() ) || &aPacket == iCurrentPacket ) { - OstTrace0( TRACE_DETAILED, CUSBPNUSBSENDER_TRYTOSENDPACKET, "CUsbPnUsbSender::TryToSendPacket - Write to socket" ); + OstTrace0( TRACE_INTERNALS, CUSBPNUSBSENDER_TRYTOSENDPACKET, "CUsbPnUsbSender::TryToSendPacket - Write to socket" ); E_TRACE( ( _T( "CUsbPnUsbSender::TryToSendPacket() - Write to socket"))); HBufC8& data(aPacket.Buffer()); @@ -221,7 +221,7 @@ #ifdef EXTENDED_TRACE_FLAG for(TInt i = 0; i < length; i++) { - OstTraceExt2( TRACE_DETAILED, CUSBPNUSBSENDER_TRYTOSENDPACKET_DUP1, "CUsbPnUsbSender::Send( [%d] = %x )", i, data[i] ); + OstTraceExt2( TRACE_INTERNALS, CUSBPNUSBSENDER_TRYTOSENDPACKET_DUP1, "CUsbPnUsbSender::Send( [%d] = %x )", i, data[i] ); E_TRACE( ( _T( "CUsbPnUsbSender::Send([%d] = %x )" ), i, data[i] ) ); i++; } @@ -245,11 +245,11 @@ } else { - OstTrace0( TRACE_DETAILED, CUSBPNUSBSENDER_TRYTOSENDPACKET_DUP2, "CUsbPnUsbSender::TryToSendPacket - Already sending" ); + OstTrace0( TRACE_INTERNALS, CUSBPNUSBSENDER_TRYTOSENDPACKET_DUP2, "CUsbPnUsbSender::TryToSendPacket - Already sending" ); E_TRACE( ( _T( "CUsbPnUsbSender::TryToSendPacket() - Already sending"))); } - OstTrace0( TRACE_API, CUSBPNUSBSENDER_TRYTOSENDPACKET_EXIT, "CUsbPnUsbSender::TryToSendPacket - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNUSBSENDER_TRYTOSENDPACKET_EXIT, "CUsbPnUsbSender::TryToSendPacket - return void" ); A_TRACE( ( _T( "CUsbPnUsbSender::TryToSendPacket() - return void" ) ) ); } @@ -272,7 +272,7 @@ // void CUsbPnUsbSender::RunL( ) { - OstTrace1( TRACE_API, CUSBPNUSBSENDER_RUNL_ENTRY, "CUsbPnUsbSender::RunL;iStatus:%d", iStatus.Int() ); + OstTrace1( TRACE_BORDER, CUSBPNUSBSENDER_RUNL_ENTRY, "CUsbPnUsbSender::RunL;iStatus:%d", iStatus.Int() ); A_TRACE( ( _T( "CUsbPnUsbSender::RunL() iStatus:%d" ), iStatus.Int() ) ); User::LeaveIfError( iStatus.Int() ); @@ -283,11 +283,11 @@ if(iCurrentPacket != iPacket) { - OstTraceExt2( TRACE_DETAILED, CUSBPNUSBSENDER_RUNL, "CUsbPnUsbSender::RunL - Write next in queue;tail=%d;head=%d", iCurrentPacket->PacketNumber(), iPacket->PacketNumber() ); + OstTraceExt2( TRACE_INTERNALS, CUSBPNUSBSENDER_RUNL, "CUsbPnUsbSender::RunL - Write next in queue;tail=%d;head=%d", iCurrentPacket->PacketNumber(), iPacket->PacketNumber() ); E_TRACE( ( _T( "CUsbPnUsbSender::RunL() - Write next in queue tail:%d,head:%d " ), iCurrentPacket->PacketNumber(), iPacket->PacketNumber())); TryToSendPacket( iCurrentPacket->NextPacket() ); } - OstTrace0( TRACE_API, CUSBPNUSBSENDER_RUNL_EXIT, "CUsbPnUsbSender::RunL - return void" ); + OstTrace0( TRACE_BORDER, CUSBPNUSBSENDER_RUNL_EXIT, "CUsbPnUsbSender::RunL - return void" ); A_TRACE( ( _T( "CUsbPnUsbSender::RunL() - return void" ) ) ); } @@ -297,7 +297,7 @@ // TInt CUsbPnUsbSender::RunError( TInt aError ) { - OstTrace1( TRACE_API, CUSBPNUSBSENDER_RUNERROR_ENTRY, "CUsbPnUsbSender::RunError;aError=%d", aError ); + OstTrace1( TRACE_BORDER, CUSBPNUSBSENDER_RUNERROR_ENTRY, "CUsbPnUsbSender::RunError;aError=%d", aError ); A_TRACE( ( _T( "CUsbPnUsbSender::RunError(aError:%d)" ), aError ) ); switch( aError ) diff -r 6295dc2169f3 -r 8486d82aef45 connectivitylayer/usbphonetlink/usbpnserver_exe/src/usbpnexe.cpp --- a/connectivitylayer/usbphonetlink/usbpnserver_exe/src/usbpnexe.cpp Wed Apr 21 14:29:55 2010 +0300 +++ b/connectivitylayer/usbphonetlink/usbpnserver_exe/src/usbpnexe.cpp Tue Oct 19 13:16:20 2010 +0300 @@ -64,7 +64,7 @@ TRACE_ASSERT_ALWAYS; } - OstTrace0( TRACE_API, _E32MAIN_ENTRY, "USBPhonetLink - UsbPnExe::E32Main" ); + OstTrace0( TRACE_BORDER, _E32MAIN_ENTRY, "USBPhonetLink - UsbPnExe::E32Main" ); A_TRACE( _L( "USBPhonetLink - UsbPnExe::E32Main()" ) ); BUILD_TRACE( &KTraceName ); @@ -75,7 +75,7 @@ TRACE_ASSERT_ALWAYS; } - OstTrace1( TRACE_API, _E32MAIN_EXIT, "USBPhonetLink - UsbPnExe::E32Main - return %d", err ); + OstTrace1( TRACE_BORDER, _E32MAIN_EXIT, "USBPhonetLink - UsbPnExe::E32Main - return %d", err ); A_TRACE( ( _T( "USBPhonetLink - UsbPnExe::E32Main() return %d" ), err ) ); return err; }