From ae9dae0735bb0258a5c98ecb088c48b84e4c9d8e Mon Sep 17 00:00:00 2001 From: Chen Wen Date: Mon, 23 Sep 2019 16:46:54 +0800 Subject: [PATCH] feat(wps): delete some invalid comments --- components/esp8266/lib/VERSION | 2 +- components/esp8266/lib/libwps.a | Bin 51080 -> 51080 bytes components/esp8266/lib/libwps_dbg.a | Bin 67536 -> 67536 bytes .../wpa_supplicant/src/wps/wps_attr_build.c | 7 ------- .../wpa_supplicant/src/wps/wps_enrollee.c | 14 ++------------ 5 files changed, 3 insertions(+), 20 deletions(-) diff --git a/components/esp8266/lib/VERSION b/components/esp8266/lib/VERSION index 4fb627c8..8f837a43 100644 --- a/components/esp8266/lib/VERSION +++ b/components/esp8266/lib/VERSION @@ -4,7 +4,7 @@ gwen: pp: 6a32b9b wpa: 743c778 espnow: 743c778 - wps: 44eada6 + wps: 6a32b9b smartconfig: 2.8.2 phy: 1149 diff --git a/components/esp8266/lib/libwps.a b/components/esp8266/lib/libwps.a index 58a278e7fba3ce4edc776293cdafce62c790e235..fa62af0c7e6403cdc578a6707a5613b60012ac8e 100755 GIT binary patch delta 29 gcmeC^XYS}{o*>I=Y-(y@xlxIo1;W~_#}aiI0C{Bx=l}o! delta 29 gcmeC^XYS}{o*>I=WMW`wxKW9n1;W~_#}aiI0C!ObyZ`_I diff --git a/components/esp8266/lib/libwps_dbg.a b/components/esp8266/lib/libwps_dbg.a index c7e7d46e53226e6a8abfe2d0a3020fb80362cd92..e66fc94ffc77e456148ca31c8997c6cc1b6808c8 100755 GIT binary patch delta 31 jcmcc6&vK!kWr8e=v8kEiMnw)5Fr!(QWxFm5<6>q2mq2mqZ9J diff --git a/components/wpa_supplicant/src/wps/wps_attr_build.c b/components/wpa_supplicant/src/wps/wps_attr_build.c index e91374cc..7700694b 100644 --- a/components/wpa_supplicant/src/wps/wps_attr_build.c +++ b/components/wpa_supplicant/src/wps/wps_attr_build.c @@ -60,18 +60,11 @@ int wps_build_public_key(struct wps_data* wps, struct wpabuf* msg, wps_key_mode_ #ifdef CONFIG_IDF_TARGET_ESP8266 API_MUTEX_DECLARE(c_tmp); API_MUTEX_TAKE(c_tmp); - //pp_soft_wdt_stop(); esp_set_cpu_freq(ESP_CPU_FREQ_160M); - //REG_SET_BIT(0x3ff00014, BIT(0)); //change CPU to 160Mhz - //ets_update_cpu_frequency(160); #endif wps->dh_ctx = dh5_init(&wps->dh_privkey, &pubkey); #ifdef CONFIG_IDF_TARGET_ESP8266 esp_set_cpu_freq(ESP_CPU_FREQ_80M); - //REG_CLR_BIT(0x3ff00014, BIT(0)); //change CPU to 80Mhz - //ets_update_cpu_frequency(80); - - //pp_soft_wdt_restart(); API_MUTEX_GIVE(c_tmp); #endif wpa_printf(MSG_DEBUG, "build public key finish"); diff --git a/components/wpa_supplicant/src/wps/wps_enrollee.c b/components/wpa_supplicant/src/wps/wps_enrollee.c index e6e146f4..f6c0e409 100644 --- a/components/wpa_supplicant/src/wps/wps_enrollee.c +++ b/components/wpa_supplicant/src/wps/wps_enrollee.c @@ -601,26 +601,16 @@ static int wps_process_pubkey(struct wps_data* wps, const u8* pk, #ifdef CONFIG_IDF_TARGET_ESP8266 API_MUTEX_DECLARE(c_tmp); API_MUTEX_TAKE(c_tmp); - //pp_soft_wdt_stop(); - - //REG_SET_BIT(0x3ff00014, BIT(0)); //change CPU to 160Mhz - //ets_update_cpu_frequency(160); - //ets_printf("[%s]line:[%d]%d\r\n", __func__, __LINE__, REG_READ(0x3ff20c00)); esp_set_cpu_freq(ESP_CPU_FREQ_160M); + if (wps_derive_keys(wps) < 0) { - //REG_CLR_BIT(0x3ff00014, BIT(0)); //change CPU to 80Mhz - //ets_update_cpu_frequency(80); esp_set_cpu_freq(ESP_CPU_FREQ_80M); - //pp_soft_wdt_restart(); API_MUTEX_GIVE(c_tmp); return -1; } esp_set_cpu_freq(ESP_CPU_FREQ_80M); - //ets_printf("[%s]line:[%d]%d\r\n", __func__, __LINE__, REG_READ(0x3ff20c00)); - //REG_CLR_BIT(0x3ff00014, BIT(0)); //change CPU to 80Mhz - //ets_update_cpu_frequency(80); - //pp_soft_wdt_restart(); + API_MUTEX_GIVE(c_tmp); #else if (wps_derive_keys(wps) < 0) {