espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-06-27 20:27:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(wps): modify CPU CLK APIs

Browse Source
This commit is contained in:
Chen Wen
2019-09-23 16:05:03 +08:00
parent 8254a61e73
commit 4a4291f198
6 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp8266/lib/VERSION
View File

@ -4,7 +4,7 @@ gwen:
pp: 6a32b9b
wpa: 743c778
espnow: 743c778
wps: 866fcf9
wps: 44eada6
smartconfig: 2.8.2
phy: 1149

BIN
components/esp8266/lib/libwps.a
View File

Binary file not shown.

BIN
components/esp8266/lib/libwps_dbg.a
View File

Binary file not shown.

1
components/wpa_supplicant/include/wps/wps.h
View File

@ -11,6 +11,7 @@
#include "wps/wps_defs.h"
#include "esp_wifi_types.h"
#include "esp_system.h"
/**
* enum wsc_op_code - EAP-WSC OP-Code values

6
components/wpa_supplicant/src/wps/wps_attr_build.c
View File

@ -26,8 +26,6 @@
#define API_MUTEX_TAKE(t) local_irq_save(t)
#define API_MUTEX_GIVE(t) local_irq_restore(t)
extern bool system_overclock(void);
extern bool system_restoreclock(void);
#endif
int wps_build_public_key(struct wps_data* wps, struct wpabuf* msg, wps_key_mode_t mode)
@ -63,13 +61,13 @@ int wps_build_public_key(struct wps_data* wps, struct wpabuf* msg, wps_key_mode_
API_MUTEX_DECLARE(c_tmp);
API_MUTEX_TAKE(c_tmp);
//pp_soft_wdt_stop();
system_overclock();
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
system_restoreclock();
esp_set_cpu_freq(ESP_CPU_FREQ_80M);
//REG_CLR_BIT(0x3ff00014, BIT(0)); //change CPU to 80Mhz
//ets_update_cpu_frequency(80);

8
components/wpa_supplicant/src/wps/wps_enrollee.c
View File

@ -29,8 +29,6 @@ static const char mem_debug_file[] ICACHE_RODATA_ATTR = __FILE__;
#define API_MUTEX_TAKE(t) local_irq_save(t)
#define API_MUTEX_GIVE(t) local_irq_restore(t)
extern bool system_overclock(void);
extern bool system_restoreclock(void);
#endif
@ -608,17 +606,17 @@ static int wps_process_pubkey(struct wps_data* wps, const u8* pk,
//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));
system_overclock();
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);
system_restoreclock();
esp_set_cpu_freq(ESP_CPU_FREQ_80M);
//pp_soft_wdt_restart();
API_MUTEX_GIVE(c_tmp);
return -1;
}
system_restoreclock();
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);