epoc32/include/nifvar.h
branchSymbian3
changeset 4 837f303aceeb
parent 2 2fe1408b6811
     1.1 --- a/epoc32/include/nifvar.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/nifvar.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -2,9 +2,9 @@
     1.4  * Copyright (c) 1997-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 @@ -19,8 +19,6 @@
    1.16  
    1.17  
    1.18  
    1.19 -
    1.20 -
    1.21  /**
    1.22   @file NIFVAR.H
    1.23   @publishedAll
    1.24 @@ -32,6 +30,9 @@
    1.25  #define __NIFVAR_H__
    1.26  
    1.27  #include <e32std.h>
    1.28 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.29 +#include <nifvar_internal.h>
    1.30 +#endif
    1.31  
    1.32  /**
    1.33  Generic Progress Constant
    1.34 @@ -53,9 +54,17 @@
    1.35  const TInt KMaxAgtProgress           = 5500;
    1.36  
    1.37  const TInt KMinNifProgress           = 6000;
    1.38 +const TInt KMaxNifProgress           = 9000;
    1.39 +
    1.40 +/**
    1.41 +Do no use in new code. Use KConnectionUp or KConnectionDown
    1.42 +from es_sock.h instead.
    1.43 +
    1.44 +@publishedAll
    1.45 +@deprecated
    1.46 +*/
    1.47  const TInt KLinkLayerOpen            = 7000;           // From a NIF
    1.48  const TInt KLinkLayerClosed          = 8000;           // From a NIF
    1.49 -const TInt KMaxNifProgress           = 9000;
    1.50  
    1.51  /**
    1.52  Additional generic progress constantfrom an agent
    1.53 @@ -69,6 +78,7 @@
    1.54  const TInt KStartingConnection = 3000;				// from an agent
    1.55  const TInt KIncomingConnectionInProgress = 3350;	// from an agent
    1.56  const TInt KDataTransferTemporarilyBlocked = 4000;	// eg. suspended (GPRS); from an agent
    1.57 +//const TInt KDataTransferUnblocked = 4001;           // eg. resume (GPRS); from an agent - declared in nifvar_internal.h
    1.58  const TInt KConnectionStartingClose	= 4250;			// from an agent
    1.59  
    1.60  /**
    1.61 @@ -141,13 +151,6 @@
    1.62  const TInt KMaxConfigDaemonProgress = 8900;
    1.63   
    1.64  /**
    1.65 -Generic progress notifications from the null configuration daemon.
    1.66 -@internalComponent
    1.67 -@released
    1.68 -**/
    1.69 -const TInt KNullConfigDaemonConfigureNetwork = 8401;
    1.70 -
    1.71 -/**
    1.72  New software should use the progress ranges defined above
    1.73  
    1.74  @publishedAll
    1.75 @@ -160,24 +163,6 @@
    1.76  const TInt KMaxInterfaceProgress = 1999;
    1.77  
    1.78  /**
    1.79 -Callback actions
    1.80 -@internalComponent
    1.81 -*/
    1.82 -enum TCallbackAction
    1.83 -	{
    1.84 -	ECallbackActionIETFType0	=0,
    1.85 -	ECallbackActionIETFType1	=1,
    1.86 -	ECallbackActionIETFType2	=2,
    1.87 -	ECallbackActionIETFType3	=3,
    1.88 -	ECallbackActionIETFType4	=4,
    1.89 -	ECallbackActionIETFType5	=5,
    1.90 -	//
    1.91 -	ECallbackActionMSCBCPRequireClientSpecifiedNumber	= 1001,
    1.92 -	ECallbackActionMSCBCPAcceptServerSpecifiedNumber	= 1002,
    1.93 -	ECallbackActionMSCBCPOverrideServerSpecifiedNumber	= 1003
    1.94 -	};
    1.95 -
    1.96 -/**
    1.97  The type of connection provided by the network interface
    1.98  
    1.99  @publishedAll
   1.100 @@ -211,15 +196,6 @@
   1.101  	EConnectionGPRSRel4,
   1.102  	EConnectionGPRSRel5,
   1.103  
   1.104 -	/** Connection values 2500-2999 for subsets of CDMA
   1.105 -	@todo Check these CDMA values to find which ones affect the interface features
   1.106 -	*/
   1.107 -	EConnectionCDMA = 2500,
   1.108 -
   1.109 -	EConnectionCDMA20001xRTT,
   1.110 -	EConnectionCDMA20001xRTTDO,
   1.111 -	EConnectionCDMA20001xRTTDV,
   1.112 -	EConnectionCDMA20003xRTT,
   1.113  	/** Connection values 3000 for IEEE802.3 (Ethernet)
   1.114  	*/
   1.115  	EConnectionEthernet = 3000,
   1.116 @@ -237,20 +213,22 @@
   1.117  	};
   1.118  
   1.119  /**
   1.120 -The layer to which the call refers
   1.121 -@note Used by data sent and received to indicate to which layer the byte count refers
   1.122 -@todo Write about this, add appropriate arguments to interfaces
   1.123 -@internalTechnology
   1.124 +Callback actions
   1.125 +@publishedAll
   1.126 +@released
   1.127  */
   1.128 -enum TConnectionLayer
   1.129 +enum TCallbackAction
   1.130  	{
   1.131 -	EPhysicalLayer,
   1.132 -	EDataLinkLayer = 100,
   1.133 -	ENetworkLayer = 200,
   1.134 -	ETransportLayer = 300,
   1.135 -	ESessionLayer = 400,
   1.136 -	EPresentationLayer = 500,
   1.137 -	EApplicationLayer = 600
   1.138 +	ECallbackActionIETFType0	=0,
   1.139 +	ECallbackActionIETFType1	=1,
   1.140 +	ECallbackActionIETFType2	=2,
   1.141 +	ECallbackActionIETFType3	=3,
   1.142 +	ECallbackActionIETFType4	=4,
   1.143 +	ECallbackActionIETFType5	=5,
   1.144 +	//
   1.145 +	ECallbackActionMSCBCPRequireClientSpecifiedNumber	= 1001,
   1.146 +	ECallbackActionMSCBCPAcceptServerSpecifiedNumber	= 1002,
   1.147 +	ECallbackActionMSCBCPOverrideServerSpecifiedNumber	= 1003
   1.148  	};
   1.149  
   1.150  #endif