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".
 const TUint8 KParamIndicatorsLength     = 1;
 // Max Info Length
 const TUint8 KMaxInfoLength             = 82;
 // SMS Delivery report buffer size
 const TUint8 KDeliveryReportSize        = 248;
+// Length of sw1 and sw2
+const TUint8 KSw1Sw2Length              = 2;
 // ==================== MEMBER FUNCTIONS ====================================
 // -----------------------------------------------------------------------------
 iSmsPpDcs( KZero ),
 iSmsPpTransactionId( KZero ),
 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" );
 }
 // -----------------------------------------------------------------------------
 // CSatDataDownload::ConstructL
 // Symbian 2nd phase constructor can leave.
 // -----------------------------------------------------------------------------
 //
 void CSatDataDownload::ConstructL()
 {
-OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_CONSTRUCTL, "CSatDataDownload::ConstructL" );
+OstTrace0( TRACE_NORMAL,  CSATDATADOWNLOAD_CONSTRUCTL_TD, "CSatDataDownload::ConstructL" );
 }
 // -----------------------------------------------------------------------------
 // CSatDataDownload::NewL
 // Two-phased constructor.
 (
 CSatMessHandler*    aSatMessHandler,
 CTsySatMessaging*   aSatMessaging
 )
 {
-OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_NEWL, "CSatDataDownload::NewL" );
+OstTrace0( TRACE_NORMAL,  CSATDATADOWNLOAD_NEWL_TD, "CSatDataDownload::NewL" );
 TFLOGSTRING("TSY: CSatDataDownload::NewL");
 CSatDataDownload* self =
 new ( ELeave ) CSatDataDownload( aSatMessHandler, aSatMessaging );
 // C++ destructor
 // -----------------------------------------------------------------------------
 //
 CSatDataDownload::~CSatDataDownload()
 {
-OstTrace0( TRACE_NORMAL, DUP1_CSATDATADOWNLOAD_CSATDATADOWNLOAD, "CSatDataDownload::~CSatDataDownload" );
+OstTrace0( TRACE_NORMAL,  DUP1_CSATDATADOWNLOAD_CSATDATADOWNLOAD_TD, "CSatDataDownload::~CSatDataDownload" );
 TFLOGSTRING("TSY: CSatDataDownload::~CSatDataDownload");
 }
 // -----------------------------------------------------------------------------
 //
 void CSatDataDownload::UiccCatRespEnvelopeReceived(
 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(
 ISI_HEADER_SIZE + UICC_CAT_RESP_OFFSET_STATUS ) );
 TUint16 apduLength( aIsiMessage.Get16bit(
 uiccSbApduOffset + UICC_SB_APDU_OFFSET_APDULENGTH ) );
 apduData.Set( aIsiMessage.GetData(
 uiccSbApduOffset + UICC_SB_APDU_OFFSET_APDU,
 apduLength ) );
-// Status bytes are two last bytes in APDU
+if( KSw1Sw2Length <= apduLength )
-TUint8 sw1( apduData[apduLength - 2] );
+{
-TUint8 sw2( apduData[apduLength - 1] );
+// 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" );
+OstTrace0( TRACE_NORMAL,  DUP2_CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED_TD, "CSatDataDownload::UiccCatRespEnvelopeReceived" );
-BuildSimMsgReport( ENone, apduData );
+result = ENone;
 }
 else if ( KAtkSwDataNtfSw1busy == sw1 )
 {
 TFLOGSTRING("TSY:CSatDataDownload::UiccCatRespEnvelopeReceived, SIM Busy");
-OstTrace0( TRACE_NORMAL, DUP3_CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED, "CSatDataDownload::UiccCatRespEnvelopeReceived" );
+OstTrace0( TRACE_NORMAL,  DUP3_CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED_TD, "CSatDataDownload::UiccCatRespEnvelopeReceived" );
-BuildSimMsgReport( ESatBusy, apduData );
+result = ESatBusy;
 }
 else
 {
 TFLOGSTRING("TSY:CSatDataDownload::UiccCatRespEnvelopeReceived, Data Download Error");
-OstTrace0( TRACE_NORMAL, DUP4_CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED, "CSatDataDownload::UiccCatRespEnvelopeReceived" );
+OstTrace0( TRACE_NORMAL,  DUP4_CSATDATADOWNLOAD_UICCCATRESPENVELOPERECEIVED_TD, "CSatDataDownload::UiccCatRespEnvelopeReceived" );
-BuildSimMsgReport( ESatDlError, apduData );
+result = ESatDlError;
+}
+if( KSw1Sw2Length <= apduData.Length() )
+{
+BuildSimMsgReport( result, apduData.Mid( 0, apduData.Length() - KSw1Sw2Length ) );
+}
+else
+{
+BuildSimMsgReport( result, KNullDesC8 );
 }
 }
 // -----------------------------------------------------------------------------
 (
 const TTpFailure aTpFailure,
 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
 TUint8 causeType( ENone == aTpFailure ?
 SMS_CAUSE_TYPE_COMMON : SMS_CAUSE_TYPE_EXT );
 msgBuffer.Append( smsCause );
 msgBuffer.AppendFill( KPadding, 3 );
 msgBuffer.Append( 0 );           // no of sublocks
 // Add SMS_SB_DELIVER_REPORT subblock if any failure is there
 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 );
 // set message parameters zero as in S40 ATK server also
 // First octet of SMS-Deliver-Report TPDU. Contains TP-UDHI and TP-MTI
 // Add SMS_SB_PRSM_INDICATOR and SMS_SB_USER_DATA subblock
 if ( dataLen )
 {
 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
 /////////////////////////
 TIsiSubBlock paramInd( msgBuffer, SMS_SB_PARAM_INDICATOR,
 void CSatDataDownload::CellBroadcastReceived
 (
 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<KCbsMsgMaxLength> cbsMsg;
 // For each subblock i
 }
 }
 }
 // -----------------------------------------------------------------------------
-// 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" );
+OstTrace0( TRACE_NORMAL,  CSATDATADOWNLOAD_SMSSIMMSGINDRECEIVEDL_TD, "CSatDataDownload::SmsSimMsgIndReceivedL" );
-TFLOGSTRING( "TSY:CSatDataDownload::SmsSimMsgIndReceived" );
+TFLOGSTRING( "TSY:CSatDataDownload::SmsSimMsgIndReceivedL" );
 TBuf8<KAddrMaxLength> bcdSmscAddress;          // to store Service centre number
 TBuf8<KTtpduMaxSize> smsTpdu;                  // Temporary buffer to store TPDU data
 TUint sbDeliver( 0 );
 // SMS_SB_TPDU subblock,
 // which contain the message payload data.
 smsTpdu.Append( aIsiMessage.GetData(
 sbDeliver + SMS_SB_TPDU_OFFSET_DATABYTES, userDataLen ));
 // Destination Address Length
 // 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 );
 // Storing protocol id and datacoding scheme from TPDU data buffer
 iSmsPpProtocolId = smsTpdu[ tpduIndexCalc + 1 ];
 iSmsPpDcs = smsTpdu[ tpduIndexCalc + 2 ];
 }
 // Either Envelope sending or SMS storing is going on
 iSmsPpDdOngoing = ETrue;
 if( iSmsPpDdSupported ) // Check for SMS PP-DATA Download supported
 {
-TFLOGSTRING( "TSY:CSatDataDownload::SmsSimMsgIndReceived SMS SIM Supported, sending Envelope..." );
+TFLOGSTRING( "TSY:CSatDataDownload::SmsSimMsgIndReceivedL SMS SIM Supported, sending Envelope..." );
-OstTrace0( TRACE_NORMAL, DUP1_CSATDATADOWNLOAD_SMSSIMMSGINDRECEIVED, "CSatDataDownload::SmsSimMsgIndReceived 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
 SendSmsPpDdlEnvelope(
 iSmsPpTransactionId,
 bcdSmscAddress,
 smsTpdu );
 }
 else
 {
-TFLOGSTRING( "TSY:CSatDataDownload::SmsSimMsgIndReceived SMS SIM not supported, storing SMS..." );
+TFLOGSTRING( "TSY:CSatDataDownload::SmsSimMsgIndReceivedL SMS SIM not supported, storing SMS..." );
-OstTrace0( TRACE_NORMAL, DUP2_CSATDATADOWNLOAD_SMSSIMMSGINDRECEIVED, "CSatDataDownload::SmsSimMsgIndReceived 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;
 // if SMSC present
 (
 TUint8 aTransId,
 TDesC8& aPdu
 )
 {
-OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_SENDCELLBROADCASTDDLENVELOPE, "CSatDataDownload::SendCellBroadcastDdlEnvelope" );
+OstTrace0( TRACE_NORMAL,  CSATDATADOWNLOAD_SENDCELLBROADCASTDDLENVELOPE_TD, "CSatDataDownload::SendCellBroadcastDdlEnvelope" );
 TFLOGSTRING( "TSY:CSatDataDownload::SendEnvelopeForCellBroadcast" );
 TTlv envelope;
 //Tag
 envelope.Begin( KBerTlvCellBroadcastTag );
 TUint8 aTransId,
 TDesC8& aSmsScAddress,
 TDesC8& aPdu
 )
 {
-OstTrace0( TRACE_NORMAL, CSATDATADOWNLOAD_SENDSMSPPDDLENVELOPE, "CSatDataDownload::SendSmsPpDdlEnvelope" );
+OstTrace0( TRACE_NORMAL,  CSATDATADOWNLOAD_SENDSMSPPDDLENVELOPE_TD, "CSatDataDownload::SendSmsPpDdlEnvelope" );
 TFLOGSTRING( "TSY:CSatDataDownload::SendEnvelopeForSmsPpDownload" );
 TTlv envelope;
 envelope.Begin( KBerTlvSmsPpDownloadTag );
 void CSatDataDownload::SmsPpDlSupported
 (
 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;
 }
 void CSatDataDownload::MessageReceivedL
 (
 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 ) );
 TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) );
 }
 case SMS_RECEIVED_SIM_MSG_IND:
 {
 // Receive SMS PP Data Download Indication , Send by SMS Server
 // on reception of message on network
-SmsSimMsgIndReceived(aIsiMessage);
+SmsSimMsgIndReceivedL(aIsiMessage);
 break;
 }
 default:
 {
 // none

changeset 9	8486d82aef45
parent 8	6295dc2169f3