wlan_bearer/wlanengine/wlan_common/wlanengine_common_3.1/src/core_operation_scan.cpp
equal
deleted
inserted
replaced
14 * |
14 * |
15 * Description: Statemachine for scanning |
15 * Description: Statemachine for scanning |
16 * |
16 * |
17 */ |
17 */ |
18 |
18 |
|
19 /* |
|
20 * %version: 28 % |
|
21 */ |
19 |
22 |
20 #include "core_operation_scan.h" |
23 #include "core_operation_scan.h" |
21 #include "core_server.h" |
24 #include "core_server.h" |
22 #include "core_tools.h" |
25 #include "core_tools.h" |
23 #include "core_frame_beacon.h" |
26 #include "core_frame_beacon.h" |
80 { |
83 { |
81 operation_state_m = core_state_scan_start; |
84 operation_state_m = core_state_scan_start; |
82 |
85 |
83 u32_t min_ch_time( server_m->get_device_settings().active_scan_min_ch_time ); |
86 u32_t min_ch_time( server_m->get_device_settings().active_scan_min_ch_time ); |
84 u32_t max_ch_time( server_m->get_device_settings().active_scan_max_ch_time ); |
87 u32_t max_ch_time( server_m->get_device_settings().active_scan_max_ch_time ); |
85 if ( scan_mode_m == core_scan_mode_passive ) |
88 if ( scan_mode_m == core_scan_mode_active && |
|
89 !scan_ssid_m.length && |
|
90 !server_m->get_core_settings().is_connected() ) |
|
91 { |
|
92 min_ch_time = server_m->get_device_settings().active_broadcast_scan_min_ch_time; |
|
93 max_ch_time = server_m->get_device_settings().active_broadcast_scan_max_ch_time; |
|
94 } |
|
95 else if ( scan_mode_m == core_scan_mode_passive ) |
86 { |
96 { |
87 min_ch_time = server_m->get_device_settings().passive_scan_min_ch_time; |
97 min_ch_time = server_m->get_device_settings().passive_scan_min_ch_time; |
88 max_ch_time = server_m->get_device_settings().passive_scan_max_ch_time; |
98 max_ch_time = server_m->get_device_settings().passive_scan_max_ch_time; |
89 } |
99 } |
90 |
100 |