alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-01 06:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

esp_wifi: wifi support new event mechanism

Browse Source 
1. WiFi support new event mechanism
2. Update examples to use new event mechanism
This commit is contained in:
liu zhifu
2019-07-05 16:58:04 +08:00
committed by bot
parent 5944f575cf
commit 003a9872b7
44 changed files with 425 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/wpa_supplicant/src/esp_supplicant/esp_wifi_driver.h
View File

@@ -213,7 +213,6 @@ bool esp_wifi_get_sniffer_internal(void);
int esp_wifi_set_wps_cb_internal(struct wps_funcs *wps_cb);
bool esp_wifi_enable_sta_privacy_internal(void);
uint8_t esp_wifi_get_user_init_flag_internal(void);
esp_err_t esp_wifi_send_event_internal(system_event_t *evt);
esp_err_t esp_wifi_internal_supplicant_header_md5_check(const char *md5);
int esp_wifi_sta_update_ap_info_internal(void);
uint8_t *esp_wifi_sta_get_ap_info_prof_pmk_internal(void);

36
components/wpa_supplicant/src/esp_supplicant/esp_wps.c
View File

@@ -413,10 +413,9 @@ struct wps_data *wps_init(void)
os_bzero(tmpp, 9);
memcpy(tmpp, data->dev_password, 8);
wpa_printf(MSG_DEBUG, "WPS PIN [%s]", tmpp);
system_event_t evt;
evt.event_id = SYSTEM_EVENT_STA_WPS_ER_PIN;
memcpy(evt.event_info.sta_er_pin.pin_code, data->dev_password, 8);
esp_wifi_send_event_internal(&evt);
wifi_event_sta_wps_er_pin_t evt;
memcpy(evt.pin_code, data->dev_password, 8);
esp_event_send_internal(WIFI_EVENT, WIFI_EVENT_STA_WPS_ER_PIN, &evt, sizeof(evt), portMAX_DELAY);
} while (0);
} else if (wps_get_type() == WPS_TYPE_PBC) {
data->pbc = 1;
@@ -931,7 +930,7 @@ int wps_start_pending(void)
return wps_tx_start();
}
int wps_stop_process(system_event_sta_wps_fail_reason_t reason_code)
int wps_stop_process(wifi_event_sta_wps_fail_reason_t reason_code)
{
struct wps_sm *sm = gWpsSm;
@@ -955,10 +954,8 @@ int wps_stop_process(system_event_sta_wps_fail_reason_t reason_code)
esp_wifi_disconnect();
wpa_printf(MSG_DEBUG, "Write wps_fail_information");
system_event_t evt;
evt.event_id = SYSTEM_EVENT_STA_WPS_ER_FAILED;
evt.event_info.sta_er_fail_reason = reason_code;
esp_wifi_send_event_internal(&evt);
esp_event_send_internal(WIFI_EVENT, WIFI_EVENT_STA_WPS_ER_FAILED, &reason_code, sizeof(reason_code), portMAX_DELAY);
return ESP_OK;
}
@@ -976,9 +973,7 @@ int wps_finish(void)
wifi_config_t *config = (wifi_config_t *)os_zalloc(sizeof(wifi_config_t));
if (config == NULL) {
system_event_t evt;
evt.event_id = SYSTEM_EVENT_STA_WPS_ER_FAILED;
esp_wifi_send_event_internal(&evt);
esp_event_send_internal(WIFI_EVENT, WIFI_EVENT_STA_WPS_ER_FAILED, 0, 0, portMAX_DELAY);
return ESP_FAIL;
}
@@ -1251,9 +1246,7 @@ out:
esp_wifi_disarm_sta_connection_timer_internal();
ets_timer_disarm(&sm->wps_timeout_timer);
system_event_t evt;
evt.event_id = SYSTEM_EVENT_STA_WPS_ER_FAILED;
esp_wifi_send_event_internal(&evt);
esp_event_send_internal(WIFI_EVENT, WIFI_EVENT_STA_WPS_ER_FAILED, 0, 0, portMAX_DELAY);
return ret;
}
@@ -1456,9 +1449,7 @@ wifi_station_wps_timeout_internal(void)
wps_set_status(WPS_STATUS_DISABLE);
system_event_t evt;
evt.event_id = SYSTEM_EVENT_STA_WPS_ER_TIMEOUT;
esp_wifi_send_event_internal(&evt);
esp_event_send_internal(WIFI_EVENT, WIFI_EVENT_STA_WPS_ER_TIMEOUT, 0, 0, portMAX_DELAY);
}
void wifi_station_wps_timeout(void)
@@ -1503,9 +1494,7 @@ void wifi_station_wps_msg_timeout(void)
void wifi_station_wps_success_internal(void)
{
system_event_t evt;
evt.event_id = SYSTEM_EVENT_STA_WPS_ER_SUCCESS;
esp_wifi_send_event_internal(&evt);
esp_event_send_internal(WIFI_EVENT, WIFI_EVENT_STA_WPS_ER_SUCCESS, 0, 0, portMAX_DELAY);
}
void wifi_station_wps_success(void)
@@ -1780,10 +1769,7 @@ wifi_wps_scan_done(void *arg, STATUS status)
} else {
wpa_printf(MSG_INFO, "PBC session overlap!");
wps_set_status(WPS_STATUS_DISABLE);
system_event_t evt;
evt.event_id = SYSTEM_EVENT_STA_WPS_ER_PBC_OVERLAP;
esp_wifi_send_event_internal(&evt);
esp_event_send_internal(WIFI_EVENT, WIFI_EVENT_STA_WPS_ER_PBC_OVERLAP, 0, 0, portMAX_DELAY);
}
wpa_printf(MSG_DEBUG, "wps scan_done discover_ssid_cnt = %d", sm->discover_ssid_cnt);