1.1 --- a/epoc32/include/ip_subconparams.h Wed Mar 31 12:27:01 2010 +0100
1.2 +++ b/epoc32/include/ip_subconparams.h Wed Mar 31 12:33:34 2010 +0100
1.3 @@ -1,10 +1,10 @@
1.4 /**
1.5 -* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
1.6 +* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
1.7 * All rights reserved.
1.8 * This component and the accompanying materials are made available
1.9 -* 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.10 +* under the terms of "Eclipse Public License v1.0"
1.11 * which accompanies this distribution, and is available
1.12 -* at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
1.13 +* at the URL "http://www.eclipse.org/legal/epl-v10.html".
1.14 *
1.15 * Initial Contributors:
1.16 * Nokia Corporation - initial contribution.
1.17 @@ -19,8 +19,6 @@
1.18
1.19
1.20
1.21 -
1.22 -
1.23 /**
1.24 @file ip_subconparams.h
1.25 */
1.26 @@ -29,54 +27,46 @@
1.27 #define __IP_SUBCONPARAMS_H__
1.28
1.29 #include <es_sock.h>
1.30 -#include <comms-infras/metadata.h>
1.31 -#include <comms-infras/metatype.h>
1.32 -#include <etelqos.h>
1.33 +#include <networking/Qos3GPP_subconparams.h>
1.34
1.35 -
1.36 +
1.37 // NOTE: This Uid may be changed - See #ifdef at bottom of the file
1.38 const TInt KSubConIPParamsUid = 0x10204309;
1.39 +
1.40 const TInt KSubConQosIPLinkR99ParamsType = 1;
1.41
1.42 -
1.43 #ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
1.44 #include <networking/qos3gpp_subconparams.h>
1.45
1.46 #else
1.47 const TInt KSubConnSBLPR5ExtensionParamsType = 2;
1.48
1.49 -
1.50 /** Constant definitions particular to the Generic Parameters. */
1.51 const TInt KMAuthTokenLength = 255;
1.52 /** Typedef for the AuthToken Holder. */
1.53 typedef TBuf8<KMAuthTokenLength> TAuthToken;
1.54 -
1.55 -#if defined(SYMBIAN_NETWORKING_UMTSR5) && !defined(SYMBIAN_NETWORKING_3GPPDEFAULTQOS)
1.56 -#pragma message("SYMBIAN_NETWORKING_UMTSR5 cannot be defined without SYMBIAN_NETWORKING_3GPPDEFAULTQOS")
1.57 #endif
1.58 -// SYMBIAN_NETWORKING_UMTSR5
1.59 -
1.60 -
1.61 -#endif
1.62 -
1.63
1.64 #ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
1.65 /** Provides Implementation of IP QoS Parameters
1.66
1.67 @publishedAll
1.68 @released since v9.1
1.69 -@deprecated from v9.2 onwards. Use CSubConQosR99ParamSet from Qos3GPP_Subconparams.h instead.
1.70 +@deprecated Since Intulo. Use CSubConQosR99ParamSet from Qos3GPP_Subconparams.h instead.
1.71 */
1.72 #else
1.73 /** Provides Implementation of IP QoS Parameters
1.74
1.75 @publishedAll
1.76 @released since v9.1
1.77 -*/#endif
1.78 +*/
1.79 +#endif
1.80 +
1.81 class CSubConQosIPLinkR99ParamSet : public CSubConExtensionParameterSet
1.82 {
1.83 public:
1.84 inline static CSubConQosIPLinkR99ParamSet* NewL(CSubConParameterFamily& aFamily, CSubConParameterFamily::TParameterSetType aType);
1.85 + inline static CSubConQosIPLinkR99ParamSet* NewL(RParameterFamily& aFamily, RParameterFamily::TParameterSetType aType);
1.86 inline static CSubConQosIPLinkR99ParamSet* NewL();
1.87
1.88 inline CSubConQosIPLinkR99ParamSet();
1.89 @@ -125,9 +115,10 @@
1.90 TInt iGuaBitrateDownlink; // Guaranteed bit rate for downlink
1.91 };
1.92
1.93 +
1.94 +
1.95 #ifndef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
1.96
1.97 -
1.98 /** Flow Identifires
1.99 ECOM Implementation Id for SBLP Extension parameters.
1.100
1.101 @@ -158,6 +149,7 @@
1.102 {
1.103 public:
1.104 inline static CSubConSBLPR5ExtensionParamSet* NewL(CSubConParameterFamily& aFamily, CSubConParameterFamily::TParameterSetType aType);
1.105 + inline static CSubConSBLPR5ExtensionParamSet* NewL(RParameterFamily& aFamily, RParameterFamily::TParameterSetType aType);
1.106 inline static CSubConSBLPR5ExtensionParamSet* NewL();
1.107
1.108 /** Media Authorization Token setter and getter functions. */
1.109 @@ -186,10 +178,6 @@
1.110 };
1.111 #endif
1.112
1.113 -
1.114 -
1.115 -
1.116 -
1.117 /**
1.118 Factory used to create instances of IP SubConnection Parameters.
1.119
1.120 @@ -204,8 +192,6 @@
1.121
1.122 #include <ip_subconparams.inl>
1.123
1.124 -
1.125 -
1.126 #ifdef SYMBIAN_NETWORKING_3GPPDEFAULTQOS
1.127 /*
1.128 Umts QoS extension classes have been relocated to the UmtsGprsSCPR component.
1.129 @@ -218,6 +204,5 @@
1.130 #endif
1.131 // SYMBIAN_NETWORKING_3GPPDEFAULTQOS
1.132
1.133 -
1.134 #endif
1.135 // __IP_SUBCONPARAMS_H__