--- a/accesssec_plat/eap_type_api/inc/EapType.h	Thu Aug 19 09:58:27 2010 +0300
+++ b/accesssec_plat/eap_type_api/inc/EapType.h	Tue Aug 31 15:16:37 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 18.1.3 %
+* %version: 33 %
 */
 
 #ifndef _EAPTYPE_H_
@@ -27,6 +27,7 @@
 #include <ecom/ecom.h> 
 
 #include <EapSettings.h>
+#include <EapTypeDefinitions.h>
 
 // FORWARD DECLARATIONS
 class abs_eap_am_tools_c;
@@ -39,101 +40,38 @@
 class abs_eap_configuration_if_c;
 #endif
 
-// LOCAL DATA
-// The UID for EAP plugin interface. ECom uses this.
-const TUid KEapTypeInterfaceUid = {0x101f8e4a};
-
-/// Possible services.
-enum TIndexType
-{
-	EDialoutISP,
-	EDialinISP,
-	EOutgoingGPRS,
-	ELan,
-	EVpn
-};
-
-struct SIapInfo {
-	TIndexType indexType;
-	TInt index;
-}; 
-
 // CLASS DECLARATION
 
 /**
 * The base interface class for EAP plug-in access.
 * Includes methods to create either the configuration interface or the EAP protocol interface.
 */
-class CEapType : public CBase  
+class CEapType
+: public CBase
 {
 public:
 
-	/**
-	* Factory function that loads the EAP type implementation DLL (plug-in).
-	* Uses ECom architecture to load the correct EAP type DLL. Calls the initialization
-	* function of the EAP type
-	* @param aCue EAP type id that specifies which plugin is loaded.
-	* @param aIndexType Indicates the bearer used for this connection.
-	* @param aIndex Index for the connection. aIndexType and aIndex uniquely specify the connection.
-	* @return Pointer to the implementation.
-	*/
-	inline static CEapType* NewL(const TDesC8& aCue, TIndexType aIndexType, TInt aIndex);	
-	
+    /**
+    * Factory function that loads the Generic EAP type implementation DLL (plug-in).
+    * @param aIndexType Indicates the bearer used for this connection.
+    * @param aIndex Index for the connection. aIndexType and aIndex uniquely specify the connection.
+    * @return Pointer to the implementation.
+    */
+	inline static CEapType* NewL(const TIndexType aIndexType, const TInt aIndex, const TEapExpandedType aEapType);
+
 	/**
 	* Unloads the implementation DLL.
 	*/
 	inline virtual ~CEapType();
 
-#ifndef RD_WLAN_3_1_BACKPORTING
-
-	/**
-	* Creates EAP protocol interface implementation. Instances an object that
-	* has been derived from eap_base_type_c that handles the communication 
-	* with EAP stack. 
-	* @param aTools Pointer to tools class.
-	* @param aPartner Used for callbacks to the stack.
-	* @param is_client_when_true Specifies whether the EAP type acts as a client or server.
-	* @param receive_network_id Network addresses
-	* @param eap_config_if Pointer used for call back to creater of stack (eapol_am_wlan_authentication_symbian_c class).
-	* @return Pointer to the implementation.
-	*/		
-	virtual eap_base_type_c* GetStackInterfaceL(abs_eap_am_tools_c* const aTools, 
-											   abs_eap_base_type_c* const aPartner,
-											   const bool is_client_when_true,
-											   const eap_am_network_id_c * const receive_network_id,
-											   abs_eap_configuration_if_c * const configuration_if) = 0;
-
-#else
 
-	/**
-	* Creates EAP protocol interface implementation. Instances an object that
-	* has been derived from eap_base_type_c that handles the communication 
-	* with EAP stack. 
-	* @param aTools Pointer to tools class.
-	* @param aPartner Used for callbacks to the stack.
-	* @param is_client_when_true Specifies whether the EAP type acts as a client or server.
-	* @param receive_network_id Network addresses
-	* @return Pointer to the implementation.
-	*/		
 
-	virtual eap_base_type_c* GetStackInterfaceL(abs_eap_am_tools_c* const aTools, 
-											   abs_eap_base_type_c* const aPartner,
-											   const bool is_client_when_true,
-											   const eap_am_network_id_c * const receive_network_id) = 0;
-	
-#endif // #ifndef RD_WLAN_3_1_BACKPORTING
-
-	/**
-	* Invokes the configuration UI. Displays a dialog for configuring the EAP type settings.
-	*/
-	virtual TInt InvokeUiL() = 0;
-	
 	/**
 	* Gets information about EAP type. 
 	* @return Pointer to a class that contains the EAP type information. Also pushed to cleanup stack.
 	*/
-	virtual CEapTypeInfo* GetInfoLC() = 0;
-	
+	virtual CEapTypeInfo* GetInfoL() = 0;
+
 	/**
 	* Deletes EAP type configuration
 	*/	
@@ -150,35 +88,11 @@
 	virtual TUint GetInterfaceVersion() = 0;
 
 	/**
-	* Parses the opaque_data field in CImplementationInformation and returns true if
-	* string NOT_OUTSIDE_PEAP is found.
-	* @param aImplInfo Implementation info returned by ListImplementations call
-	* @return Boolean
-	*/
-	inline static TBool IsDisallowedOutsidePEAP(const CImplementationInformation& aImplInfo);
-
-	/**
-	* Parses the opaque_data field in CImplementationInformation and returns true if
-	* string NOT_INSIDE_PEAP is found.
-	* @param aImplInfo Implementation info returned by ListImplementations call
-	* @return Boolean
-	*/	
-	inline static TBool IsDisallowedInsidePEAP(const CImplementationInformation& aImplInfo);
-
-	/**
-	* Parses the opaque_data field in CImplementationInformation and returns true if
-	* string NOT_INSIDE_TTLS is found.
-	* @param aImplInfo Implementation info returned by ListImplementations call
-	* @return Boolean
-	*/	
-	inline static TBool IsDisallowedInsideTTLS(const CImplementationInformation& aImplInfo);
-
-	/**
 	* Sets the tunneling type. This is used to indicate that this type is run inside another 
 	* EAP type. 
 	* @param aTunnelingType Type number for the tunneling type
 	*/	
-	virtual void SetTunnelingType(const TInt aTunnelingType) = 0;
+	virtual void SetTunnelingType(const TEapExpandedType aTunnelingType) = 0;
 	
 	/**
 	* Changes the index of the saved parameters.