diff -r 8a27654f7b62 -r 20fda83a6398 bluetooth/btstack/linkmgr/linkmgr.h
--- a/bluetooth/btstack/linkmgr/linkmgr.h	Fri Mar 12 15:49:00 2010 +0200
+++ b/bluetooth/btstack/linkmgr/linkmgr.h	Mon Mar 15 12:44:59 2010 +0200
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-2010 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"
@@ -52,6 +52,7 @@
 class CEirManServer;
 class CEirPublisherTxPowerLevel;
 class CEirPublisherLocalName;
+class CBrEdrControllerConfiguration;
 
 NONSHARABLE_CLASS(CRegistrySession)
 	: public CBase
@@ -165,6 +166,7 @@
 
 	// later - change local device management/notification to be nicer...
 	inline const TBTLocalDevice& LocalDevice() const;
+	inline TBTTrackedLocalDevice& DesiredLocalDeviceSettings();
 	void UpdateLocalDeviceName(const TDesC8& aName);
 	void UpdateLocalDeviceName(TBool aSucceeded);
 	void UpdateLocalDevicePower(TBTPowerState aState);
@@ -187,6 +189,7 @@
 	void SetUIConnecting(TBool aConnecting);
 	void SetUINumPhysicalLinks(TUint aNum);
 	void SetUINumSynchronousLinks(TUint aNum);
+	void SetPageScanParameters(TPageScanParameterSettings aPageScanParameters);
 
 	inline CHCIFacade& HCIFacade() const;
 	inline CBTInquiryMgr& InquiryMgr() const;
@@ -245,6 +248,7 @@
 	RBTLocalDevice			iLocalDevice; //subsession
 	TBTTrackedLocalDevice	iLocalDeviceSettings;
 	TBTLocalDevice			iPendingLocalDeviceSettings;
+	TBTTrackedLocalDevice			iDesiredLocalDeviceSettings;	
 	
 	RProperty				iProperty;
 
@@ -252,6 +256,8 @@
 	CHCIFacade*				iHCIFacade;
 	CLinkMuxer*				iLinkMuxer;
 	CEirManServer*			iEirManServer;
+
+	CBrEdrControllerConfiguration*	iBrEdrControllerConfiguration;
 	
 	CACLLinkStateFactory*	iACLStateFactory;
 	CSyncLinkStateFactory*	iSCOStateFactory;
@@ -311,6 +317,12 @@
 	return iLocalDeviceSettings;
 	}
 
+inline TBTTrackedLocalDevice& CLinkMgrProtocol::DesiredLocalDeviceSettings()
+	{
+	return iDesiredLocalDeviceSettings;
+	}
+
+
 inline CBTInquiryMgr& CLinkMgrProtocol::InquiryMgr() const
 	{
 	return *iInquiryMgr;