diff -r 1c425781161e -r 3d23268b50f6 wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/inc/wlanscanresultcache.h --- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/inc/wlanscanresultcache.h Tue Jul 06 16:24:00 2010 +0300 +++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/inc/wlanscanresultcache.h Wed Aug 18 11:35:02 2010 +0300 @@ -15,6 +15,9 @@ * */ +/* +* %version: 13 % +*/ #ifndef WLANSCANRESULTCACHE_H #define WLANSCANRESULTCACHE_H @@ -33,6 +36,7 @@ TBuf8 ssid; EConnectionMode networkType; WlanSecurityMode securityMode; + TUint8 rcpi; }; /** @@ -75,7 +79,7 @@ /** * Updates the list of available networks (IAPs and SSIDs) - * @param aIapIdList List of available IAPs. + * @param aIapAvailabilityList List of available IAPs. * @param aNetworkList List of available networks. * @param aNewIapsAvailable is set to ETrue on completion if * new networks or IAPs were detected since the last update. @@ -83,7 +87,7 @@ * networks or IAPs have been lost since the last update. */ void UpdateAvailableNetworksList( - core_type_list_c& aIapIdList, + core_type_list_c& aIapAvailabilityList, RArray& aNetworkList, TBool& aNewIapsAvailable, TBool& aOldIapsLost ); @@ -96,7 +100,7 @@ * @return Pointer to list of available IAPs or NULL if they are not available * or they are too old. */ - RArray* AvailableIaps( + RArray* AvailableIaps( RArray& aIapList, TUint aCacheLifetime ); @@ -144,13 +148,23 @@ const TWlanAvailableNetwork& aSecond ); /** + * Method for determining whether two IAPs are equal. + * @param aFirst First IAP. + * @param aSecond Second IAP. + * @return Result of comparison. + */ + static TBool IsIapEqual( + const TWlmAvailabilityData& aFirst, + const TWlmAvailabilityData& aSecond ); + + /** * Check whether the given IAP list is equal with the given IAP data list. * * @param aIapList IAP list to compare. * @param aIapDataList IAP data list to compare against. * @return ETrue is the lists are equal, EFalse otherwise. */ - TBool IsIapListEqual( + static TBool IsIapListEqual( const RArray& aFirst, const RArray& aSecond ); @@ -177,7 +191,7 @@ RArray iIapList; /** Latest list of available IAPs */ - RArray iAvailableIapList; + RArray iAvailableIapList; /** Latest list of available networks */ RArray iAvailableNetworkList;