1.1 --- a/epoc32/include/bt_subscribe.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/bt_subscribe.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -18,19 +18,17 @@
    1.16  //
    1.17  
    1.18  
    1.19 -
    1.20 -
    1.21  #ifndef BT_SUBSCRIBE_H
    1.22  #define BT_SUBSCRIBE_H
    1.23  
    1.24 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.25 +#include <bt_subscribe_partner.h>
    1.26 +#endif
    1.27 +
    1.28 +#include <bt_subscribe_keybase.h>
    1.29 +
    1.30  #include <e32property.h>
    1.31  
    1.32 -/**
    1.33 -@publishedAll
    1.34 -@released
    1.35 -*/
    1.36 -const TInt KUidBluetoothPubSubKeyBase = 0x10203637;	//	Range of 32 values registered
    1.37 -
    1.38  // P&S Categories
    1.39   
    1.40  /**
    1.41 @@ -266,36 +264,6 @@
    1.42  //-------------
    1.43  
    1.44  /**
    1.45 -KPropertyKeyBluetoothSetAFHChannelAssessmentMode
    1.46 -The key to send the Bluetooth AFH Channel Assessment Mode to the local Bluetooth hardware.
    1.47 -If AFH Channel Assessment Mode is on, then the local hardware will keep checking what 
    1.48 -channels are busy and so should be avoided in a connection using AFH.
    1.49 -The P&S value will contain a boolean: ETrue if AFH Channel Assessment Mode is required, 
    1.50 -EFalse if not.
    1.51 -The hardware is likely to support this either never, in master role only, 
    1.52 -or in both master and slave roles.
    1.53 -The default setting of AFH Channel Assessment Mode in the hardware is 'on' 
    1.54 -whenever the hardware can support it.
    1.55 -@publishedPartner
    1.56 -@released
    1.57 -@capability LocalServices	Needed for both read and write access to this property
    1.58 -@capability NetworkControl	Needed for both read and write access to this property
    1.59 -*/
    1.60 -const TUint KPropertyKeyBluetoothSetAFHChannelAssessmentMode = (KUidBluetoothPubSubKeyBase + 10);
    1.61 -
    1.62 -/**
    1.63 -KPropertyKeyBluetoothAFHChannelAssessmentMode
    1.64 -This is a deprecated constant, maintained for source compatibility with non-secured 
    1.65 -Symbian OS platforms.
    1.66 -
    1.67 -@publishedPartner
    1.68 -@deprecated
    1.69 -*/
    1.70 -const TUint KPropertyKeyBluetoothAFHChannelAssessmentMode = KPropertyKeyBluetoothSetAFHChannelAssessmentMode;
    1.71 -
    1.72 -//-------------
    1.73 -
    1.74 -/**
    1.75  KPropertyKeyBluetoothGetRegistryTableChange
    1.76  The key to observe changes in the Bluetooth Registry
    1.77  The P&S value will contain an integer describing which of the tables in the Bluetooth Registry changed
    1.78 @@ -451,21 +419,6 @@
    1.79  */
    1.80  const TUint KPropertyKeyBluetoothHostResolverActive = (KUidBluetoothPubSubKeyBase + 20); 
    1.81  
    1.82 -/**
    1.83 -KPropertyKeyBluetoothSetSimplePairingDebugMode
    1.84 -The key is intended to be used by a platform to set the stack into simple pairing debug mode.
    1.85 -Once enabled (by setting to ETrue) then it cannot be disabled, the mode will remain set until
    1.86 -the Bluetooth stack has been restarted.
    1.87 -When the Symbian simple pairing debug mode is enabled then the stack will instruct the hardware
    1.88 -to generate debug link keys for use with air traffic capture.
    1.89 -When the Symbian simple pairing debug mode is disabled a remote device attempting to make a 
    1.90 -connection with a debug link key will be rejected for secure reasons. 
    1.91 -@publishedPartner
    1.92 -@released
    1.93 -@capability LocalServices	Needed for both read and write access to this property
    1.94 -@capability CommDD			Needed for write access to this property
    1.95 -*/
    1.96 -const TUint KPropertyKeyBluetoothSetSimplePairingDebugMode = (KUidBluetoothPubSubKeyBase + 21);
    1.97  
    1.98  /**
    1.99  KPropertyKeyBluetoothGetSimplePairingDebugMode