1.1 --- a/epoc32/include/btsdp.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/btsdp.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2000-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 @@ -13,8 +13,6 @@
    1.16  // Description:
    1.17  //
    1.18  
    1.19 -
    1.20 -
    1.21  /**
    1.22   @file
    1.23   @publishedAll
    1.24 @@ -62,6 +60,8 @@
    1.25  static const TSdpAttributeID KSdpAttrIdClientExecutableURL = 0x000B;
    1.26  /** Icon URL. */
    1.27  static const TSdpAttributeID KSdpAttrIdIconURL = 0x000C;
    1.28 +/** Additional protocol descriptor list. */
    1.29 +static const TSdpAttributeID KSdpAttrIdAdditionalProtocolDescriptorList = 0x000D;
    1.30  
    1.31  
    1.32  /** PAN Profile Security enforcement */
    1.33 @@ -170,6 +170,8 @@
    1.34  static const TInt KAdvancedAudioDistributionUUID = 0x110d;
    1.35  /** Remote control (service class) UUID */
    1.36  static const TInt KAVRemoteControlUUID = 0x110E;
    1.37 +/** Remote control controller (service class) UUID */
    1.38 +static const TInt KAVRemoteControlControllerUUID = 0x110F;
    1.39  /** PBAP PSE Service Class UUID */
    1.40  static const TInt KPbapPseUUID = 0x112F;
    1.41    
    1.42 @@ -674,9 +676,9 @@
    1.43  NONSHARABLE_CLASS(CSdpAttrValueList) : public CSdpAttrValue, public MSdpElementBuilder
    1.44  	{
    1.45  public:
    1.46 -	IMPORT_C virtual ~CSdpAttrValueList();
    1.47 -	IMPORT_C virtual void AcceptVisitorL(MSdpAttributeValueVisitor& aVisitor);
    1.48 -	IMPORT_C virtual TUint DataSize() const;
    1.49 +	virtual ~CSdpAttrValueList();
    1.50 +	virtual void AcceptVisitorL(MSdpAttributeValueVisitor& aVisitor);
    1.51 +	virtual TUint DataSize() const;
    1.52  	IMPORT_C void AppendValueL(CSdpAttrValue* aValue);
    1.53  
    1.54  	// MSdpElementBuilder interface
    1.55 @@ -686,19 +688,19 @@
    1.56  	@param aSizeDesc Size descriptor
    1.57  	@param aData Data field
    1.58  	@return Attribute value with added element */
    1.59 -	IMPORT_C virtual MSdpElementBuilder* BuildUnknownL(TUint8 aType, TUint8 aSizeDesc, const TDesC8& aData);
    1.60 -	IMPORT_C virtual MSdpElementBuilder* BuildNilL();
    1.61 -	IMPORT_C virtual MSdpElementBuilder* BuildUintL(const TDesC8& aUint);
    1.62 -	IMPORT_C virtual MSdpElementBuilder* BuildIntL(const TDesC8& aInt);
    1.63 -	IMPORT_C virtual MSdpElementBuilder* BuildUUIDL(const TUUID& aUUID);
    1.64 -	IMPORT_C virtual MSdpElementBuilder* BuildBooleanL(TBool aBool);
    1.65 -	IMPORT_C virtual MSdpElementBuilder* BuildStringL(const TDesC8& aString);
    1.66 -	IMPORT_C virtual MSdpElementBuilder* BuildDESL();
    1.67 -	IMPORT_C virtual MSdpElementBuilder* BuildDEAL();
    1.68 -	IMPORT_C virtual MSdpElementBuilder* StartListL();
    1.69 -	IMPORT_C virtual MSdpElementBuilder* EndListL();
    1.70 -	IMPORT_C virtual MSdpElementBuilder* BuildURLL(const TDesC8& aString);
    1.71 -	IMPORT_C virtual MSdpElementBuilder* BuildEncodedL(const TDesC8& aString);
    1.72 +	virtual MSdpElementBuilder* BuildUnknownL(TUint8 aType, TUint8 aSizeDesc, const TDesC8& aData);
    1.73 +	virtual MSdpElementBuilder* BuildNilL();
    1.74 +	virtual MSdpElementBuilder* BuildUintL(const TDesC8& aUint);
    1.75 +	virtual MSdpElementBuilder* BuildIntL(const TDesC8& aInt);
    1.76 +	virtual MSdpElementBuilder* BuildUUIDL(const TUUID& aUUID);
    1.77 +	virtual MSdpElementBuilder* BuildBooleanL(TBool aBool);
    1.78 +	virtual MSdpElementBuilder* BuildStringL(const TDesC8& aString);
    1.79 +	virtual MSdpElementBuilder* BuildDESL();
    1.80 +	virtual MSdpElementBuilder* BuildDEAL();
    1.81 +	virtual MSdpElementBuilder* StartListL();
    1.82 +	virtual MSdpElementBuilder* EndListL();
    1.83 +	virtual MSdpElementBuilder* BuildURLL(const TDesC8& aString);
    1.84 +	virtual MSdpElementBuilder* BuildEncodedL(const TDesC8& aString);
    1.85  
    1.86  protected:
    1.87  	CSdpAttrValueList(MSdpElementBuilder *aBuilder);
    1.88 @@ -1267,6 +1269,7 @@
    1.89  	void FindAttributesL(CSdpServRecord &aRec, MAttributeMatchHandler &aHandler) const;
    1.90  	
    1.91  	/**
    1.92 +	This method is for internal sub-system use only, it is not to be used otherwise.
    1.93  	@internalTechnology
    1.94  	@released
    1.95  	*/