MCL/sf/os/cellularsrv: comparison telephonyprotocols/pdplayer/src/PDPCPR.cpp

equal deleted inserted replaced

-:630d2f34d719
+:07a122eea281
 #include <etelmm.h>
 #include <etelpckt.h>
 #include <comms-infras/ss_metaconnprov.h>
 #include "PDPProvision.h"
 #include <etel.h>
+#include <networking/cfbearers.h>
 #include "pdpcpravailabilitylistener.h"
 #include <comms-infras/ss_nodemessages.h>
+#include <networking/ipcpr_states.h>
 #include <comms-infras/linkmessages.h>
 #include <elements/nm_interfaces.h>
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
-#include <networking/cfbearers.h>
-#include <networking/ipcpr_states.h>
 #include <cs_genevent.h>
 #include <networking/etelbearers.h>
-#endif
 using namespace ESock;
 //-=========================================================
 //
 // CPDPConnectionProvider methods
 //
 //-=========================================================
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 namespace PDPCprLinkCharacteristicActivity
 {
 DECLARE_DEFINE_NODEACTIVITY(ECFActivityParamRequest, PDPCprLinkCharacteristic, TCFScpr::TGetParamsRequest)
 NODEACTIVITY_ENTRY(MeshMachine::KNoTag, PDPCprStates::TUpdateBundleAndRespondWithRetrievedParams, PRStates::TAwaitingParamRequest, MeshMachine::TNoTag)
 NODEACTIVITY_END()
 FIRST_NODEACTIVITY_ENTRY(CoreNetStates::TAwaitingDataClientGoneDown, CoreNetStates::TNoTagOrNonDefault)
 LAST_NODEACTIVITY_ENTRY(MeshMachine::KNoTag, PRStates::TSendGoneDown)
 LAST_NODEACTIVITY_ENTRY(CoreNetStates::KNonDefault, MeshMachine::TDoNothing)
 NODEACTIVITY_END()
 }
-#endif
 namespace PDPCprActivities
 {
 DEFINE_ACTIVITY_MAP(activityMap)
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 ACTIVITY_MAP_ENTRY(PDPDataClientGoneDownActivity, PDPScprGoneDown)
 	ACTIVITY_MAP_ENTRY(PDPCprLinkCharacteristicActivity, PDPCprLinkCharacteristic)
-#endif
 ACTIVITY_MAP_END_BASE(CprActivities, coreCprActivities)
 }
 CPDPConnectionProvider* CPDPConnectionProvider::NewL(ESock::CConnectionProviderFactoryBase& aFactory)
 {
 CPDPConnectionProvider* provider = new (ELeave) CPDPConnectionProvider(aFactory);
 CleanupStack::PushL(provider);
 provider->ConstructL();
 CleanupStack::Pop(provider);
 	return provider;
 }
+void CPDPConnectionProvider::StartListener()
+/**
+* Start listening for dynamic caps or network mode changes.
+* @param None
+* @return void
+*/
+	{
+	iDynamicCapsEventListener->NotifyDynamicCapsChange(this);
+	iNetworkModeEventListener->NotifyNetworkModeChange(this);
+	}
 void CPDPConnectionProvider::ConstructL()
 /**
 * PDP Connection Provider Second Phase Constructor
 * @param None
 * @return void
 */
 	{
 	CCoreConnectionProvider::ConstructL();
 	}
+void CPDPConnectionProvider::StopListener()
+/**
+* Start listening for dynamic caps or network mode changes.
+*/
+	{
+	if(iDynamicCapsEventListener)
+		{
+		iDynamicCapsEventListener->Cancel();
+		}
+	if(iNetworkModeEventListener)
+		{
+		iNetworkModeEventListener->Cancel();
+		}
+	}
 CPDPConnectionProvider::CPDPConnectionProvider(ESock::CConnectionProviderFactoryBase& aFactory)
-	: CCoreConnectionProvider(aFactory, PDPCprActivities::activityMap::Self()),
+	: CCoreConnectionProvider(aFactory, PDPCprActivities::activityMap::Self())
-	  iDynamicCapsEventListener(NULL),
-	  iNetworkModeEventListener(NULL),
-	  iBearerType(0),
-	  iBearerSet(EFalse)
 /**
 * Construct PDP connection provider.
 */
 {
 LOG_NODE_CREATE(KESockConnectionTag, CPDPConnectionProvider);
 /**
 * Destroy PDP connection provider.
 */
 {
 LOG_NODE_DESTROY(KESockConnectionTag, CPDPConnectionProvider);
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 StopListener();
-#endif
 	delete iDynamicCapsEventListener;
 	delete iNetworkModeEventListener;
 }
 void CPDPConnectionProvider::ReceivedL(const Messages::TRuntimeCtxId& aSender, const Messages::TNodeId& aRecipient, Messages::TSignatureBase& aMessage)
 /**
 * Update the parmeter set in case of modulation change and send TPlaneNotification message to
 * all the control client.
 */
 	{
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
 	//Update bearers.
 	UpdateBearer();
 	//Send msg to all control clients
 	CEventParamsChanged* eventChanged = CEventParamsChanged::NewL(KBearerInfo);
 	while ((ctl = iter++) != NULL)
 		{
 		msg.iRefCountOwnedNotification->Open();
 		ctl->PostMessage(this->NodeId(), msg);
 		}
-#endif
 	}
-#ifdef SYMBIAN_ADAPTIVE_TCP_RECEIVE_WINDOW
-void CPDPConnectionProvider::StartListener()
-/**
-* Start listening for dynamic caps or network mode changes.
-* @param None
-* @return void
-*/
-{
-iDynamicCapsEventListener->NotifyDynamicCapsChange(this);
-iNetworkModeEventListener->NotifyNetworkModeChange(this);
-}
-void CPDPConnectionProvider::StopListener()
-/**
-* Start listening for dynamic caps or network mode changes.
-*/
-{
-if(iDynamicCapsEventListener)
-{
-iDynamicCapsEventListener->Cancel();
-}
-if(iNetworkModeEventListener)
-{
-iNetworkModeEventListener->Cancel();
-}
-}
 void CPDPConnectionProvider::UpdateBearer()
 /**
 * Update bearer type based on the change of the dynamic caps or network mode.
 */
 	{
 	//Resolve the bearer based on both dynamic caps and network mode
 	iBearerType = Bearer(dynamicCaps, networkMode);
 	iBearerSet = ETrue;
 	}
 TUint32 CPDPConnectionProvider::Bearer(TUint aDynamicCaps, RMobilePhone::TMobilePhoneNetworkMode& aNetworkMode)
 /**
 * Determine bearer based on dynamic caps and network mode.
 * @param aDynamicCaps a value of dynamic caps
 * @param aNetworkMode a value of network mode
 * @return Type of Bearer
 *
 */
 	{
 	if ((aDynamicCaps & RPacketService::KCapsHSUPA) || (aDynamicCaps & RPacketService::KCapsHSDPA))
 		{
 		return KHsdpaBearer;
 		}
 	else if (aDynamicCaps & RPacketService::KCapsEGPRS)
 			{
 		   	return KDefaultBearer;
 			}
 		}
 	}
 DEFINE_SMELEMENT(PDPCprStates::TUpdateBundle, NetStateMachine::MStateTransition, PDPCprStates::TContext)
 void PDPCprStates::TUpdateBundle::DoL()
 /**
 * Process TGetParamsRequest
 		// if Dynamic Caps supported, start listener, which would Notify of Dynamic Caps change
 		// no check required for network mode, since atleast one network mode is supported.
 		iContext.Node().StartListener();
 		}
 	}
-#endif

branch	RCL_3
changeset 20	07a122eea281
parent 19	630d2f34d719