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

equal deleted inserted replaced

-:6295dc2169f3
+:8486d82aef45
 /*
-* 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"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 4;      //CALL_MODEM_SB_CAUSE
 const TUint8 KMSBMask = 0x80;
 const TUint8 KSw1Sw2Unknown = 0;
 const TUint8 KValidTonNpi   = 0x3F;
+const TUint8 KSw1Sw2Length  = 2;
 // ==================== MEMBER FUNCTIONS ====================================
 // -----------------------------------------------------------------------------
 iSatMessHandler( aSatMessHandler ),
 iSatMessaging( aSatMessaging ),
 iTonNpiPresent( EFalse ),
 iEnvelopeResponseData( NULL )
 {
-OstTrace0( TRACE_NORMAL, CSATCC_CSATCC, "CSatCC::CSatCC" );
+OstTrace0( TRACE_NORMAL,  CSATCC_CSATCC_TD, "CSatCC::CSatCC" );
 }
 // -----------------------------------------------------------------------------
 // CSatCC::ConstructL
 // Symbian 2nd phase constructor can leave.
 // -----------------------------------------------------------------------------
 //
 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
 iCallControlArray = new( ELeave ) RArray<TCallControl>( 1 );
 (
 CSatMessHandler*    aSatMessHandler, //Pointer to the message handler
 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 );
 CleanupStack::PushL( self );
 // C++ destructor
 // -----------------------------------------------------------------------------
 //
 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 )
 {
 iCallControlArray->Close();
 TInt CSatCC::GetArrayIndexById
 (
 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 );
 TInt arraySize ( iCallControlArray->Count() );
 }
 }
 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
 {
 //None. This is not our message.
 void CSatCC::AddLocationInformationToTlv
 (
 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
 = iSatMessHandler->LocationInfo();
 TInt CSatCC::SendSSEnvelope
 (
 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
 TTlv envelope;
 envelope.Begin  ( KBerTlvCallControlTag );
 envelope.End());
 }
 // -----------------------------------------------------------------------------
-// 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
 TTlv envelope;
 envelope.Begin( KBerTlvCallControlTag );
 {
 // SIM does not support USSD and converting it to SS was
 // impossible. Remove the created CcStruct from the CC array and
 // send CC event response.
 TPtrC8 atkData;
-SendSsResourceControlReq(
+SendSsResourceControlReqL(
 aCcstruct,
 KSw1Sw2Unknown,
 KSw1Sw2Unknown,
 KError,
 atkData );
 TInt index( GetArrayIndexById( aCcstruct.iTransId ) );
 if ( index != KErrNotFound )
 {
 (
 const TIsiReceiveC& aIsiMessage,
 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;
 envelope.Begin( KBerTlvCallControlTag );
 // device identities
 (
 const TUint8 aPdpCcEnvelopeTid,
 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;
 envelope.Begin( KBerTlvCallControlTag );
 // Add Device identities
 return iSatMessHandler->UiccCatReqEnvelope( aPdpCcEnvelopeTid,
 envelope.End() );
 }
 // -----------------------------------------------------------------------------
-// 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" );
+OstTrace0( TRACE_NORMAL,  CSATCC_UICCCATRESPENVELOPERECEIVEDL_TD, "CSatCC::UiccCatRespEnvelopeReceivedL" );
-TFLOGSTRING( "TSY:CSatCC::UiccCatRespEnvelopeReceived" );
+TFLOGSTRING( "TSY:CSatCC::UiccCatRespEnvelopeReceivedL" );
 TUint8 status( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + UICC_CAT_RESP_OFFSET_STATUS ) );
 TUint8 transId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_TRANSID ) );
 {
 switch( ( *iCallControlArray )[ccIndex].iRecourceId )
 {
 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:
 {
 SendGpdsResourceControlReq(
 ( *iCallControlArray )[ccIndex],
 result,
-apduData );
+apduData.Mid( 0, apduData.Length() - KSw1Sw2Length ) );
 break;
 }
 default:
 {
 break;
 iCallControlArray->Compress();
 } // End of if ( ccIndex != KErrNotFound )
 }
 else // Subblock is mandatory
 {
-TFLOGSTRING("TSY: CSatMessHandler::UiccCatRespEnvelopeReceived - Mandatory subblock UICC_SB_APDU not found");
+TFLOGSTRING("TSY: CSatMessHandler::UiccCatRespEnvelopeReceivedL - Mandatory subblock UICC_SB_APDU not found");
-OstTrace0( TRACE_NORMAL, DUP1_CSATCC_UICCCATRESPENVELOPERECEIVED, "CSatCC::UiccCatRespEnvelopeReceived - 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 )
 }
 // -----------------------------------------------------------------------------
 // for call control are no longer recognizable.
 // -----------------------------------------------------------------------------
 //
 void CSatCC::ClearArraysForRefresh()
 {
-OstTrace0( TRACE_NORMAL, CSATCC_CLEARARRAYSFORREFRESH, "CSatCC::ClearArraysForRefresh" );
+OstTrace0( TRACE_NORMAL,  CSATCC_CLEARARRAYSFORREFRESH_TD, "CSatCC::ClearArraysForRefresh" );
 TFLOGSTRING("TSY: CSatCC::ClearArraysForRefresh");
 iCallControlArray->Reset();
 }
 void CSatCC::SetStatusOfUssdSupport
 (
 TBool aStatus
 )
 {
-OstTrace0( TRACE_NORMAL, CSATCC_SETSTATUSOFUSSDSUPPORT, "CSatCC::SetStatusOfUssdSupport" );
+OstTrace0( TRACE_NORMAL,  CSATCC_SETSTATUSOFUSSDSUPPORT_TD, "CSatCC::SetStatusOfUssdSupport" );
 TFLOGSTRING("TSY: CSatCC::SetStatusOfUssdSupport");
 iUssdTlvSupported = aStatus;
 }
 // -----------------------------------------------------------------------------
 TBool CSatCC::IsOnlyDigitsInUssd
 (
 TPtrC8 aUSSDString
 )
 {
-OstTrace0( TRACE_NORMAL, CSATCC_ISONLYDIGITSINUSSD, "CSatCC::IsOnlyDigitsInUssd" );
+OstTrace0( TRACE_NORMAL,  CSATCC_ISONLYDIGITSINUSSD_TD, "CSatCC::IsOnlyDigitsInUssd" );
 TFLOGSTRING("TSY: CSatCC::IsOnlyDigitsInUssd");
 // Unpack it
 TBuf8<256> ussdString;
 TSatUtility::Packed7to8Unpacked( aUSSDString, ussdString );
 void CSatCC::MessageReceivedL
 (
 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 ) );
 TUint8 messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) );
 {
 switch( messageId )
 {
 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 +
 CALL_MODEM_RESOURCE_CONF_IND_OFFSET_CONFSTATUS ) )
 {
 break;
 }
 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;
 }
 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;
 }
 default:
 {
 {
 switch( messageId )
 {
 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 +
 SS_RESOURCE_CONF_IND_OFFSET_CONFSTATUS  ) )
 {
 if ( SS_RESOURCE_CONF_SET ==
 aIsiMessage.Get8bit( ISI_HEADER_SIZE +
 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;
 }
 case SS_STATUS_IND:
 break;
 }
 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 )
 {
 iSatMessHandler->GpdsResourceConfReq();
 }
 if ( GPDS_RESOURCE_CONF_SET ==
 aIsiMessage.Get8bit( ISI_HEADER_SIZE +
 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;
 }
 default:
 uiccSbFileDataOffset + UICC_SB_FILE_DATA_OFFSET_DATA,
 fileDataLength ) );
 // Check call control status
 if ( KUiccTrIdServiceTableByte4 == trId )
 {
-TUint8 usedBitMaskCallControl( KCallControlBitMaskUsim );
+TInt ret( KErrNone );
-if ( UICC_CARD_TYPE_ICC == cardType )
-{
-usedBitMaskCallControl = KCallControlBitMaskSim;
-}
 // 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 )
 {
-// Call control on GPRS enabled in USIM
+if ( fileData[0] & KCallControlBitMaskUsim )
-iCallControlOnGPRSEnabled = ETrue;
+{
-iSatMessHandler->GpdsResourceConfReq();
+// 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
+else if ( UICC_CARD_TYPE_ICC == cardType )
 {
-// Call control on GPRS disabled in USIM
+if ( KCallControlBitMaskSim == ( fileData[0] & KCallControlBitMaskSim ) )
-iCallControlOnGPRSEnabled = EFalse;
+{
+// 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;
 } // End of case UICC_APPL_CMD_RESP
 case UICC_CAT_RESP:
 TUint8 serviceType(
 aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + UICC_CAT_RESP_OFFSET_SERVICETYPE ) );
 if ( UICC_CAT_ENVELOPE == serviceType )
 {
-UiccCatRespEnvelopeReceived( aIsiMessage );
+UiccCatRespEnvelopeReceivedL( aIsiMessage );
 }
 break;
 }
 default:
 {
 void CSatCC::SetTonNpi
 (
 const TUint8 aTonNpi
 )
 {
-OstTrace0( TRACE_NORMAL, CSATCC_SETTONNPI, "CSatCC::SetTonNpi" );
+OstTrace0( TRACE_NORMAL,  CSATCC_SETTONNPI_TD, "CSatCC::SetTonNpi" );
 TFLOGSTRING("TSY: CSatCC::SetTonNpi");
 iTonNpiForSS = aTonNpi;
 iTonNpiPresent = ETrue;
 }
 // -----------------------------------------------------------------------------
-// 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");
+TFLOGSTRING("TSY: CSatCC::CallModemResourceIndL");
-OstTrace0( TRACE_NORMAL, CSATCC_CALLMODEMRESOURCEIND, "CSatCC::CallModemResourceInd" );
+OstTrace0( TRACE_NORMAL,  CSATCC_CALLMODEMRESOURCEINDL_TD, "CSatCC::CallModemResourceIndL" );
 TUint sbStartOffset( 0 );
 // Check if resource control is requested for MO call.
 TInt retValue( aIsiMessage.FindSubBlockOffsetById(
 }
 if( CALL_MODEM_MODE_EMERGENCY == callcontrol.iCallMode[0] )
 {
 // Do not make SIM call control, allow emergency calls always
 TPtrC8 atkData;
-SendCallModemResourceReq(
+SendCallModemResourceReqL(
 callcontrol,
 KAllowed,
 atkData );
 }
 else
 }
 }
 }
 // -----------------------------------------------------------------------------
-// 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");
+TFLOGSTRING("TSY: CSatCC::SendCallModemResourceReqL");
-OstTrace0( TRACE_NORMAL, CSATCC_SENDCALLMODEMRESOURCEREQ, "CSatCC::SendCallModemResourceReq" );
+OstTrace0( TRACE_NORMAL,  CSATCC_SENDCALLMODEMRESOURCEREQL_TD, "CSatCC::SendCallModemResourceReqL" );
 TBuf8<KMaximumCcBufferSize> isiMessage;
 TInt ret( KErrNotFound );
 TBool checkInfoNeeded( EFalse );
 TUint8 checkInfoParams( 0 );
 isiMessage.Append( tonNpi );
 }
 else
 {
 // use default TON/NPI in reserved cases
 isiMessage.Append(
 CALL_MODEM_NBR_TYPE_UNKNOWN |
 CALL_MODEM_NBR_PLAN_ISDN_TELEPHONY );
 }
 isiMessage.Append( KPadding );
 isiMessage.Append( KPadding );
 // Temp storage for address
 TBuf8<2 * KCallServerMaxAddressLenght> asciiAddress;
 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
 // CALL_MODEM_CHECK_INFO with CALL_MODEM_CHK_DISABLE_EMERG
 _LIT8(KEccNbr, "112");
 if( 0 != asciiAddress.Compare( KEccNbr ) )
 {
 checkInfoNeeded = ETrue;
 // before sending the call control result to call server,
 // inform NTSY about call control CALL_ID and call control result
 CMmDataPackage dataPackage;
 TUint8 callId( aTcc.iCallId );
 dataPackage.PackData( &callId, &ccresult );
 iSatMessaging->GetMessageRouter()->ExtFuncL(
 ESatNotifyCallControlRequest, &dataPackage );
 // send request
 iSatMessHandler->CallModemResourceReq( aTcc.iTransId, isiMessage );
 if ( KCcEmptyResponseLenght < aApduData.Length() )
 aApduData );
 }
 }
 // -----------------------------------------------------------------------------
-// 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");
+TFLOGSTRING("TSY: CSatCC::SsResourceControlIndL");
-OstTrace0( TRACE_NORMAL, CSATCC_SSRESOURCECONTROLIND, "CSatCC::SsResourceControlInd" );
+OstTrace0( TRACE_NORMAL,  CSATCC_SSRESOURCECONTROLINDL_TD, "CSatCC::SsResourceControlIndL" );
 TCallControl callcontrol;
 TInt stringLength;
 // store traid's
 callcontrol.iTransId = aIsiMessage.Get8bit( ISI_HEADER_SIZE +
 {
 SendSSEnvelope( callcontrol );
 }
 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");
+TFLOGSTRING("TSY: CSatCC::SendSsResourceControlReqL");
-OstTrace0( TRACE_NORMAL, CSATCC_SENDSSRESOURCECONTROLREQ, "CSatCC::SendSsResourceControlReq" );
+OstTrace0( TRACE_NORMAL,  CSATCC_SENDSSRESOURCECONTROLREQL_TD, "CSatCC::SendSsResourceControlReqL" );
 TBuf8<KMaximumCcBufferSize> isiMessage;
 CBerTlv response;
 response.SetData( aApduData );
 // Set initial cc result, e.g. the SIM has responded with sw1/sw2 90 00
 changedSsServerAction = ETrue;
 }
 else if ( KErrNone == response.TlvByTagValue( &ssServerString,
 KTlvUssdStringTag ) )
 {
-// USSD string has been modified to new USSD string
+// Check if modified USSD string has valid DCS
-isiMessage.Append( SS_RESOURCE_ALLOWED );
+if ( ESmsUnknownOrReservedDcs
-isiMessage.Append( KPadding );
+!= TSatUtility::DecodeCbsDcs( ssServerString.GetValue()[0] ) )
-internalCcResult = KModified;
+{
+// 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;
 }
 default:
 sbcount++;
 }
 }
 }
 // SS_SB_RESOURCE_CONTROL_INFO [O] with sw1, sw2 and result
 TIsiSubBlock resourceCtrlInfo(
 isiMessage,
 SS_SB_RESOURCE_CONTROL_INFO,
 EIsiSubBlockTypeId8Len8 );
 isiMessage.Append( 3 ); // data size is 3 (sw1 + sw2 + result)
 // -----------------------------------------------------------------------------
 //
 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;
 TBuf8<KPdpContextActivationParamsMaxSize> paramsBuffer;
 // store traid's
 const TCallControl& aTcc,
 const TUint8 aResult,
 TPtrC8 aAtkData )
 {
 TFLOGSTRING("TSY: CSatCC::SendGpdsResourceControlReq");
-OstTrace0( TRACE_NORMAL, CSATCC_SENDGPDSRESOURCECONTROLREQ, "CSatCC::SendGpdsResourceControlReq" );
+OstTrace0( TRACE_NORMAL,  CSATCC_SENDGPDSRESOURCECONTROLREQ_TD, "CSatCC::SendGpdsResourceControlReq" );
 TBuf8<KMaximumCcBufferSize> isiMessage;
 CBerTlv response;
 response.SetData( aAtkData );
 RSat::TControlResult internalCcResult = RSat::EAllowedNoModification;

changeset 9	8486d82aef45
parent 8	6295dc2169f3