--- a/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaext.cpp Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmgsmwcdma/cmmcallgsmwcdmaext.cpp Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -15,12 +15,6 @@
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmcallgsmwcdmaextTraces.h"
-#endif
-
#include "cmmcallgsmwcdmaext.h"
#include <featureuids.h>
#include "cmmphonetsy.h"
@@ -29,6 +23,7 @@
#include "cmmconferencecallgsmwcdmaext.h"
#include <ctsy/pluginapi/cmmdatapackage.h>
#include "cmmmessagemanagerbase.h"
+#include <ctsy/tflogger.h>
#include "cmmvoicecalltsy.h"
@@ -242,7 +237,7 @@
const TDesC* aTelNumber,
TInt aExtensionId )
{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_1, "TSY: CMmCallGsmWcdmaExt::DialL extensionid %d", aExtensionId );
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::DialL extensionid %d", aExtensionId );
// Reset iCallParams extended members
iCallParams.iAlphaId.Zero();
@@ -268,12 +263,12 @@
RCall::TCallParams& callParams = ( *callParamsPckg )();
TInt extensionId( callParams.ExtensionId() );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_2, "TSY: CMmCallGsmWcdmaExt::DialL callParams.extensionId %d ", extensionId);
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::DialL callParams.extensionId %d ", extensionId);
if( ( RMobileCall::KETelMobileCallParamsV1 == extensionId ) ||
( RMobileCall::KETelMobileCallParamsV2 == extensionId ))
{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_3, "TSY: CMmCallGsmWcdmaExt::DialL callparams V1, V2");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL callparams V1, V2");
iCallParams.iSpeakerControl = callParams.iSpeakerControl;
@@ -293,7 +288,7 @@
if ( RMobileCall::KETelMobileCallParamsV2 == extensionId )
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_4, "TSY: CMmCallGsmWcdmaExt::DialL callparams V2");
+ TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL callparams V2");
RMobileCall::TMobileCallParamsV2Pckg* paramsPckgV2 =
reinterpret_cast<RMobileCall::TMobileCallParamsV2Pckg*>(
const_cast<TDesC8*>( aCallParams ) );
@@ -305,7 +300,7 @@
else if( RMobileCall::KETelMobileCallParamsV7 == extensionId )
{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_5, "TSY: CMmCallGsmWcdmaExt::DialL callparams V7");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL callparams V7");
RMobileCall::TMobileCallParamsV7Pckg* paramsPckgV7 =
reinterpret_cast<RMobileCall::TMobileCallParamsV7Pckg*>(
const_cast<TDesC8*>( aCallParams ) );
@@ -314,7 +309,7 @@
}
else
{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_6, "TSY: CMmCallGsmWcdmaExt::DialL callparams version unknown");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL callparams version unknown");
iCallParams.iSpeakerControl = callParams.iSpeakerControl;
iCallParams.iSpeakerVolume = callParams.iSpeakerVolume;
iCallParams.iInterval = callParams.iInterval;
@@ -353,7 +348,7 @@
//Pack call parameters and mobile call info
// Use argument parameters since TMobileCallParamsV7 does not inherit from 3rd party params.
package.PackData(const_cast<TDesC8*>(aCallParams), &iMobileCallInfo);
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_7, "TSY: CMmCallGsmWcdmaExt::DialL: KETelExt3rdPartyV1");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL: KETelExt3rdPartyV1");
//if it is a 3rd party client
return iMessageManager->HandleRequestL( EMobileCallDialISV,
&package );
@@ -365,7 +360,7 @@
//Pack call parameters and mobile call info
TPckg<RMobileCall::TMobileCallParamsV7> pckgToSend(iCallParams);
package.PackData( &pckgToSend , &iMobileCallInfo );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_8, "TSY: CMmCallGsmWcdmaExt::DialL: KMultimodeCallTypeIDNoFdnCheck");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL: KMultimodeCallTypeIDNoFdnCheck");
return iMessageManager->HandleRequestL(
EMobileCallDialNoFdnCheck, &package );
}
@@ -374,7 +369,7 @@
//Pack call parameters and mobile call info
TPckg<RMobileCall::TMobileCallParamsV7> pckgToSend(iCallParams);
package.PackData( &pckgToSend , &iMobileCallInfo );
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALL_9, "TSY: CMmCallGsmWcdmaExt::DialL: EEtelCallDial");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialL: EEtelCallDial");
return iMessageManager->HandleRequestL( EEtelCallDial, &package );
}
@@ -1160,7 +1155,7 @@
}
else
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCALLPARAMS_1, "TSY: CMmCallGsmWcdmaExt::GetCallParams callparams version unknown");
+ TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCallParams callparams version unknown");
}
}
@@ -1311,7 +1306,7 @@
hscsdParams8.iBCRepeatIndicator = hscsdCallParamsV8->iBCRepeatIndicator;
}
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCALLPARAMS_2, "TSY: CMmCallGsmWcdmaExt::GetCallParams callparams version unknown");
+ TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCallParams callparams version unknown");
}
@@ -1555,7 +1550,8 @@
if ( mmCall )
{
// Held call Id
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_TRANSFERL_1, "TSY: CMmCallGsmWcdmaExt::Transfer, CallId: %d", mmCall->CallId() );
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::Transfer, CallId: %d", \
+ mmCall->CallId() );
//Create package
CCallDataPackage package;
@@ -1604,7 +1600,7 @@
TInt CMmCallGsmWcdmaExt::FillMobileCallInfoV3(
RMobileCall::TMobileCallInfoV3* aInfoV3 )
{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV3_1, "TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV3 - extensionid=%d", aInfoV3->ExtensionId() );
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV3 - extensionid=%d", aInfoV3->ExtensionId() );
// V3 info parameters
aInfoV3->iSecurity = iMobileCallInfo.iSecurity;
@@ -1621,7 +1617,7 @@
TInt CMmCallGsmWcdmaExt::FillMobileCallInfoV7(
RMobileCall::TMobileCallInfoV7* aInfoV7 )
{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV7_1, "TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV7 - extensionid=%d", aInfoV7->ExtensionId() );
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV7 - extensionid=%d", aInfoV7->ExtensionId() );
// V7 info parameters
// TCallParamOrigin iCallParamOrigin;
@@ -1647,7 +1643,7 @@
TInt CMmCallGsmWcdmaExt::FillMobileCallInfoV8(
RMobileCall::TMobileCallInfoV8* aInfoV8 )
{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_FILLMOBILECALLINFOV8_1, "TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV8 - extensionid=%d", aInfoV8->ExtensionId() );
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::FillMobileCallInfoV8 - extensionid=%d", aInfoV8->ExtensionId() );
// V8 info parameters
aInfoV8->iSubAddress = iMobileCallInfo.iSubAddress;
@@ -1689,7 +1685,7 @@
MCtsySsmPluginCallback* aSsmPluginCallback,
TCtsySsmCallbackData& aCallbackData )
{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETRFSTATE_1, "TSY: CMmCallGsmWcdmaExt::SetRfState - state=%d", aMtcState );
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::SetRfState - state=%d", aMtcState );
TInt err ( KErrNotSupported );
if ( (iUsingFeatureManager) && (iFeatureControl.FeatureSupported(NFeature::KEmergencyCallsEnabledInOfflineMode ) == KFeatureSupported) )
@@ -1715,7 +1711,7 @@
}
else
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETRFSTATE_2, "TSY: CMmCallGsmWcdmaExt::SetRfState - bad state");
+ TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::SetRfState - bad state");
// pass this error to callback
SsmPluginCallback (KErrArgument, aCallbackData);
}
@@ -1812,30 +1808,7 @@
{
iMobileCallInfo.iAlternatingCall = mobileCallInfo->iAlternatingCall;
}
-
- // If a Mobile Originated call, take Alpha ID and Icon ID values from iCallParams, if valid.
- if ( iMobileCallInfo.iRemoteParty.iDirection == RMobileCall::EMobileOriginated)
- {
- // Set the Alpha ID, if not set.
- if ( iMobileCallInfo.iAlphaId.Length() <= 0 &&
- iCallParams.iAlphaId.Length() > 0 &&
- iCallParams.iAlphaId.Length() <= RMobileCall::KAlphaIdMaxSize )
- {
- iMobileCallInfo.iAlphaId.Zero();
- iMobileCallInfo.iAlphaId.Copy(iCallParams.iAlphaId );
- iMobileCallInfo.iValid |= RMobileCall::KCallAlphaId;
- }
- // Set the Icon ID, if not set.
- if ( iMobileCallInfo.iIconId.iIdentifier == 0 &&
- iMobileCallInfo.iIconId.iQualifier == RMobileCall::EIconQualifierNotSet &&
- iCallParams.iIconId.iIdentifier > 0 &&
- iCallParams.iIconId.iQualifier != RMobileCall::EIconQualifierNotSet )
- {
- iMobileCallInfo.iIconId.iIdentifier = iCallParams.iIconId.iIdentifier;
- iMobileCallInfo.iIconId.iQualifier = iCallParams.iIconId.iQualifier;
- iMobileCallInfo.iValid |= RMobileCall::KCallIconId;
- }
- }
+
// TMobileCallInfoV3
if ( (KETelExtMultimodeV3 == extensionId) ||
@@ -1849,7 +1822,7 @@
{
// V3 parameters
iMobileCallInfo.iSecurity = mobileCallInfoV3->iSecurity;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_1, "TSY: CMmCallGsmWcdmaExt::SetMobileCallData V3 params copied");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::SetMobileCallData V3 params copied");
}
}
@@ -1867,20 +1840,14 @@
iMobileCallInfo.iCallParamOrigin = mobileCallInfoV7->iCallParamOrigin;
}
- // Set the Alpha ID if call is not Mobile Originated.
- // If MO, the Alpha ID would be set above from iCallParams
- if(RMobileCall::KCallIconId & mobileCallInfo->iValid &&
- iMobileCallInfo.iRemoteParty.iDirection != RMobileCall::EMobileOriginated)
+ if(RMobileCall::KCallIconId & mobileCallInfo->iValid)
{
// TIconId iIconId;
iMobileCallInfo.iIconId.iIdentifier = mobileCallInfoV7->iIconId.iIdentifier;
iMobileCallInfo.iIconId.iQualifier = mobileCallInfoV7->iIconId.iQualifier;
}
- // Set the Icon ID if call is not Mobile Originated.
- // If MO, Icon ID would be set above from iCallParams
- if(RMobileCall::KCallAlphaId & mobileCallInfo->iValid &&
- iMobileCallInfo.iRemoteParty.iDirection != RMobileCall::EMobileOriginated)
+ if(RMobileCall::KCallAlphaId & mobileCallInfo->iValid)
{
// TAlphaIdBuf iAlphaId;
iMobileCallInfo.iAlphaId.Zero();
@@ -1894,7 +1861,7 @@
}
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_2, "TSY: CMmCallGsmWcdmaExt::SetMobileCallData V7 params copied");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::SetMobileCallData V7 params copied");
}
// TMobileCallInfoV8
@@ -1925,7 +1892,7 @@
iMobileCallInfo.iBCRepeatIndicator = mobileCallInfoV8->iBCRepeatIndicator;
}
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SETMOBILECALLDATA_3, "TSY: CMmCallGsmWcdmaExt::SetMobileCallData V8 params copied");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::SetMobileCallData V8 params copied");
}
//update validity flags
@@ -2056,7 +2023,7 @@
if (KETelExtMultimodeV1 == extensionId )
{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_1, "TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV1");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV1");
RMobileCall::TMobileCallHscsdInfoV1Pckg* hscsdInfoPckg =
REINTERPRET_CAST( RMobileCall::TMobileCallHscsdInfoV1Pckg*,
aHSCSDInfo );
@@ -2072,7 +2039,7 @@
else if (KEtelExtMultimodeV7 == extensionId )
{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_2, "TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV7");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV7");
RMobileCall::TMobileCallHscsdInfoV7Pckg* hscsdInfoPckg7 =
( RMobileCall::TMobileCallHscsdInfoV7Pckg* )aHSCSDInfo;
RMobileCall::TMobileCallHscsdInfoV7& hscsdInfoV7 =
@@ -2097,7 +2064,7 @@
else if (KEtelExtMultimodeV8 == extensionId )
{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_GETCURRENTHSCSDINFO_3, "TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV8");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::GetCurrentHscsdInfo - KETelMobileHscsdCallParamsV8");
RMobileCall::TMobileCallHscsdInfoV8Pckg* hscsdInfoPckg8 =
( RMobileCall::TMobileCallHscsdInfoV8Pckg* )aHSCSDInfo;
RMobileCall::TMobileCallHscsdInfoV8& hscsdInfoV8 =
@@ -2161,8 +2128,8 @@
const TDesC8* aCallParams,
const TDesC* aTelNumber )
{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALDATACALLL_1, "TSY: CMmCallGsmWcdmaExt::DialDataCallL");
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALDATACALLL_2, "TSY: CMmCallGsmWcdmaExt::DialDataCallL aCallMode: %d", aCallMode);
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialDataCallL");
+TFLOGSTRING2("TSY: CMmCallGsmWcdmaExt::DialDataCallL aCallMode: %d", aCallMode);
iMobileCallInfo.iDialledParty.iTelNumber.Copy( *aTelNumber );
iMobileCallInfo.iDialledParty.iNumberPlan =
@@ -2402,13 +2369,13 @@
if( KMultimodeCallTypeIDNoFdnCheck == iMmCallTsy->GetDialTypeId() )
{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALDATACALLL_3, "TSY: CMmCallGsmWcdmaExt::DialDataCallL: EMobileCallDialNoFdnCheck");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialDataCallL: EMobileCallDialNoFdnCheck");
//Send request to the Domestic OS layer.
return iMessageManager->HandleRequestL( EMobileCallDialNoFdnCheck, &package );
}
else
{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_DIALDATACALLL_4, "TSY: CMmCallGsmWcdmaExt::DialDataCallL: EEtelCallDial");
+TFLOGSTRING("TSY: CMmCallGsmWcdmaExt::DialDataCallL: EEtelCallDial");
//Send request to the Domestic OS layer.
return iMessageManager->HandleRequestL( EEtelCallDial, &package );
}
@@ -3015,7 +2982,7 @@
if ( KErrNone == aResult )
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCALLGSMWCDMAEXT_SSMPLUGINCALLBACK_1, "TSY:CMmCallGsmWcdmaExt::SsmPluginCallback: Dialing...");
+ TFLOGSTRING ("TSY:CMmCallGsmWcdmaExt::SsmPluginCallback: Dialing...");
//at this point the RF should be enabled in all cases
TRAPD(err, result = iMessageManager->HandleRequestL(