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

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".
 * Initial Contributors:
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
 *
 * Description:
 *
 */
 // -----------------------------------------------------------------------------
 //
 CMmBroadMessHandler::CMmBroadMessHandler()
 {
 TFLOGSTRING("TSY: CMmBroadMessHandler::CMmBroadMessHandler");
-OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_CMMBROADMESSHANDLER, "CMmBroadMessHandler::CMmBroadMessHandler" );
+OstTrace0( TRACE_NORMAL,  CMMBROADMESSHANDLER_CMMBROADMESSHANDLER_TD, "CMmBroadMessHandler::CMmBroadMessHandler" );
 }
 // -----------------------------------------------------------------------------
 // CMmSmsMessHandler::ConstructL
 // Symbian 2nd phase constructor can leave.
 // -----------------------------------------------------------------------------
 //
 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 );
 // Cb subscription number.
 iCbSubscriptionNumber = SMS_NEW_SUBSCRIPTION;
 CMmPhoNetReceiver* aPhoNetReceiver, // a pointer to the phonetReceiver
 CMmMessageRouter* aMessageRouter    // a pointer to the Message router
 )
 {
 TFLOGSTRING("TSY: CMmBroadMessHandler::NewL");
-OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_NEWL, "CMmBroadMessHandler::NewL" );
+OstTrace0( TRACE_NORMAL,  CMMBROADMESSHANDLER_NEWL_TD, "CMmBroadMessHandler::NewL" );
 CMmBroadMessHandler* mmBroadMessHandler =
 new( ELeave ) CMmBroadMessHandler();
 CleanupStack::PushL( mmBroadMessHandler );
 mmBroadMessHandler->iPhoNetSender = aPhoNetSender;
 // -----------------------------------------------------------------------------
 //
 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();
 delete iCbsMsg;
 }
 {
 TUint8 resource( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) );
 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 )
 {
 case SMS_CB_ROUTING_RESP:
 {
 break;
 }
 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;
 }
 }
 break;
 }
 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;
 }
 }
 return;
 TUint8 aTransId, // Transaction ID
 const CMmDataPackage* aDataPackage // Data Package
 )
 {
 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 );
 // Contents of the data package
 TCbsCbmiAndLangAndFilter data;
 if ( RMobileBroadcastMessaging::EBroadcastAcceptNone == data.iSetting )
 {
 // 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
 {
 TFLOGSTRING2("TSY:CMmBroadMessHandler::SmsCbRoutingRequest:Unsupported filter 0x%x.",data.iSetting);
 // Following lines flagged out just get rid of compiler warning when trace
 // 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;
 }
 // Create a buffer to hold the request
 void CMmBroadMessHandler::SmsCbRoutingResp
 (
 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 ||
-if ( EBroadcastMessagingReceiveMessage == traid )
+EBroadcastMessagingReceiveMessageCancel == traid ||
-{
+EBroadcastMessagingSetFilterSetting == traid )
-ipc = EMobileBroadcastMessagingReceiveMessage;
+{
-}
+TFLOGSTRING("TSY: CMmBroadMessHandler::SmsCbRoutingResp");
-// Response for SmsGsmCbRoutingReq (receive message cancel)
+OstTrace0( TRACE_NORMAL,  CMMBROADMESSHANDLER_SMSGSMCBROUTINGRESP_TD, "CMmBroadMessHandler::SmsCbRoutingResp" );
-else if ( EBroadcastMessagingReceiveMessageCancel == traid )
-{
+iCbSubscriptionNumber = aSmsCbRoutingResp.Get8bit(
-ipc = EMobileBroadcastMessagingReceiveMessageCancel;
+ISI_HEADER_SIZE + SMS_CB_ROUTING_RESP_OFFSET_SUBSCRIPTIONNUMBER );
-}
-// Response for SmsGsmCbRoutingReq (set filter setting)
+TUint8 isiCause( aSmsCbRoutingResp.Get8bit( ISI_HEADER_SIZE
-else if ( EBroadcastMessagingSetFilterSetting == traid )
++ SMS_CB_ROUTING_RESP_OFFSET_SMSCAUSE ) );
-{
-ipc = EMobileBroadcastMessagingSetFilterSetting;
+TInt cause( CMmStaticUtility::CSCauseToEpocError(
-}
+PN_SMS,
+SMS_CAUSE_TYPE_COMMON,
-// Complete status change indication, if ipc is set
+isiCause ) );
-if ( 0 != ipc )
-{
+// Response for SmsGsmCbRoutingReq (receive message)
-iMessageRouter->Complete( ipc, cause );
+if ( EBroadcastMessagingReceiveMessage == traid )
-}
+{
+ipc = EMobileBroadcastMessagingReceiveMessage;
-return;
+}
+// Response for SmsGsmCbRoutingReq (receive message cancel)
+else if ( EBroadcastMessagingReceiveMessageCancel == traid )
+{
+ipc = EMobileBroadcastMessagingReceiveMessageCancel;
+}
+// Response for SmsGsmCbRoutingReq (set filter setting)
+else if ( EBroadcastMessagingSetFilterSetting == traid )
+{
+ipc = EMobileBroadcastMessagingSetFilterSetting;
+}
+// Complete status change indication, if ipc is set
+if ( 0 != ipc )
+{
+iMessageRouter->Complete( ipc, cause );
+}
+}
 }
 // -----------------------------------------------------------------------------
 // CMmBroadMessHandler:: SmsCbRoutingInd
 // Incoming CB message. When the SMS Server receives a CB message
 (
 const TIsiReceiveC& aSmsCbRoutingInd // Received ISI message
 )
 {
 TFLOGSTRING("TSY: CMmBroadMessHandler::SmsCbRoutingInd");
-OstTrace0( TRACE_NORMAL, CMMBROADMESSHANDLER_SMSGSMCBROUTINGNTFL, "CMmBroadMessHandler::SmsCbRoutingIndL" );
+OstTrace0( TRACE_NORMAL,  CMMBROADMESSHANDLER_SMSGSMCBROUTINGNTFL_TD, "CMmBroadMessHandler::SmsCbRoutingIndL" );
 CMmDataPackage data;
 TInt error ( KErrNone );
 // Get the number of subblocks
 infoLength = aSmsCbRoutingInd.Get8bit( firstSbOffset
 + SMS_SB_CB_MESSAGE_OFFSET_INFOLENGTH );
 }
 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();
 // GSM mode, don't care of info length
 // WCDMA mode,take care of info length and number of subblocks should be
 // less or equal to 15
 else if ( ( SMS_CB_MESSAGE_CONTENT_SIZE >= infoLength )
 && ( KWcdmaCbsNumberOfSbMax >= sbNumber ) )
 {
-TUint currSbOffset( firstSbOffset );
+TUint currSbOffset( ISI_HEADER_SIZE + SIZE_SMS_CB_ROUTING_IND );
-// Loop through the SMS_SB_CB_MESSAGE sub blocks.
+// Search all SMS_SB_CB_MESSAGE subblocks
-for ( TInt i( 0 ); i < sbNumber; i++)
+while ( KErrNone == aSmsCbRoutingInd.FindSubBlockOffsetById(
+currSbOffset,
+SMS_SB_CB_MESSAGE,
+EIsiSubBlockTypeId16Len16,
+currSbOffset ) )
 {
 TWcdmaCbsMsg* wcdmaCbsMsg = new ( ELeave ) TWcdmaCbsMsg;
 CleanupStack::PushL( wcdmaCbsMsg );
 // Total number of subblocks in SMS_CB_ROUTING_IND
 //note: Lint doesn't understand the use of PopAndDestroy and 'thinks'
 //that there is a memory leak for wcdmaCbsMsg, we disable that warning with
 //the following command
 //lint -e429
 }
 // Pack data
 data.PackData( &iCbsMsg, &sbNumber );
 // Complete
 iMessageRouter->Complete(
 error );
 }
 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
 // EMmTsyWcdmaBroadcastNotifyMessageReceived or
 // EMmTsyGsmBroadcastNotifyMessageReceived but as it doesn't matter,
 TInt aIpc, // IPC number
 const CMmDataPackage* aDataPackage // packed data
 )
 {
 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
 switch ( aIpc )
 }
 default:
 {
 // 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;
 }
 }
 if ( EBroadcastMessagingUnknown != transId )

changeset 9	8486d82aef45
parent 5	8ccc39f9d787