Mercurial Mercurial > oss > MCL > sf > os > wlan / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/src/wlanconversionutil.cpp
branchRCL_3
changeset 6 e0f767079796
parent 5 51a71243e562
child 7 0abc8c98be24
equal deleted inserted replaced
5:51a71243e562 6:e0f767079796 
    14 * Description:  Handles type conversion between adaptation and core layers
 
    14 * Description:  Handles type conversion between adaptation and core layers
 
    15 *
 
    15 *
 
    16 */
 
    16 */
 
    17 
    17 
    18 /*
 
    18 /*
 
    19 * %version: 84 %
 
    19 * %version: 84.1.2 %
 
    20 */
 
    20 */
 
    21 
    21 
    22 #include <in_sock.h>
 
    22 #include <in_sock.h>
 
    23 #include <e32math.h>
 
    23 #include <e32math.h>
 
    24 
    24 
   647     aCoreSettings.tx_power_level = TWlanConversionUtil::ConvertMilliwattsToDecibel( aAmSettings.txPowerLevel );    
   647     aCoreSettings.tx_power_level = TWlanConversionUtil::ConvertMilliwattsToDecibel( aAmSettings.txPowerLevel );    
   648 	aCoreSettings.scan_rate = static_cast<u32_t>( aAmSettings.scanRate ); // TRate -> u32_t
 
   648 	aCoreSettings.scan_rate = static_cast<u32_t>( aAmSettings.scanRate ); // TRate -> u32_t
 
   649 	aCoreSettings.rcpi_trigger = static_cast<u32_t>( aAmSettings.rcpiTrigger );
 
   649 	aCoreSettings.rcpi_trigger = static_cast<u32_t>( aAmSettings.rcpiTrigger );
 
   650 	aCoreSettings.active_scan_min_ch_time = static_cast<u32_t>( aAmSettings.minActiveChannelTime );
 
   650 	aCoreSettings.active_scan_min_ch_time = static_cast<u32_t>( aAmSettings.minActiveChannelTime );
 
   651 	aCoreSettings.active_scan_max_ch_time = static_cast<u32_t>( aAmSettings.maxActiveChannelTime );
 
   651 	aCoreSettings.active_scan_max_ch_time = static_cast<u32_t>( aAmSettings.maxActiveChannelTime );
 
       
   652 	aCoreSettings.active_broadcast_scan_min_ch_time = static_cast<u32_t>( aAmSettings.minActiveBroadcastChannelTime );
 
       
   653 	aCoreSettings.active_broadcast_scan_max_ch_time = static_cast<u32_t>( aAmSettings.maxActiveBroadcastChannelTime );	
   652 	aCoreSettings.passive_scan_min_ch_time = static_cast<u32_t>( aAmSettings.minPassiveChannelTime );
 
   654 	aCoreSettings.passive_scan_min_ch_time = static_cast<u32_t>( aAmSettings.minPassiveChannelTime );
 
   653 	aCoreSettings.passive_scan_max_ch_time = static_cast<u32_t>( aAmSettings.maxPassiveChannelTime );
 
   655 	aCoreSettings.passive_scan_max_ch_time = static_cast<u32_t>( aAmSettings.maxPassiveChannelTime );
 
   654     aCoreSettings.max_tx_msdu_life_time = static_cast<u32_t>( aAmSettings.maxTxMSDULifeTime );
 
   656     aCoreSettings.max_tx_msdu_life_time = static_cast<u32_t>( aAmSettings.maxTxMSDULifeTime );
 
   655     aCoreSettings.unload_driver_timer = static_cast<u32_t>( aAmSettings.unloadDriverTimer );
 
   657     aCoreSettings.unload_driver_timer = static_cast<u32_t>( aAmSettings.unloadDriverTimer );
 
   656     aCoreSettings.roam_timer = static_cast<u32_t>( aAmSettings.roamTimer );
 
   658     aCoreSettings.roam_timer = static_cast<u32_t>( aAmSettings.roamTimer );
 
   851     if ( aAmSettings.EnableWpaPsk )
 
   853     if ( aAmSettings.EnableWpaPsk )
 
   852         {
 
   854         {
 
   853         Mem::Copy(
 
   855         Mem::Copy(
 
   854             aCoreSettings.wpa_preshared_key.key_data,
 
   856             aCoreSettings.wpa_preshared_key.key_data,
 
   855             aAmSettings.WPAPreSharedKey.Ptr(),
 
   857             aAmSettings.WPAPreSharedKey.Ptr(),
 
   856             aAmSettings.WPAKeyLength );
 
   858             aAmSettings.WPAPreSharedKey.Length() );
 
   857         aCoreSettings.wpa_preshared_key.key_length = aAmSettings.WPAKeyLength;
 
   859         aCoreSettings.wpa_preshared_key.key_length = aAmSettings.WPAPreSharedKey.Length();
 
   858         }
 
   860         }
 
   859 
   861 
   860     // Handle
 
   862     // Handle
 
   861     // EOverrideWpaPskMask
 
   863     // EOverrideWpaPskMask
 
   862     if ( aOverrideSettings.settingsMask & EOverrideWpaPskMask )
 
   864     if ( aOverrideSettings.settingsMask & EOverrideWpaPskMask )
MCL/sf/os/wlan