Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

esp32: wait uart tx finish before cpu freq change

Browse source
This commit is contained in:
Wu Jian Gang 2016-09-21 16:15:42 +08:00
parent 4f93b49e0a
commit 835cc55138
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
components/esp32/cpu_freq.c
View file

@ -14,6 +14,7 @@
#include <stdint.h> #include <stdint.h>
#include "rom/ets_sys.h" #include "rom/ets_sys.h"
#include "rom/uart.h"
#include "sdkconfig.h" #include "sdkconfig.h"
typedef enum{ typedef enum{
@ -42,10 +43,15 @@ extern void rtc_set_cpu_freq(xtal_freq_t xtal_freq, cpu_freq_t cpu_freq);
* components which want to be notified of CPU frequency * components which want to be notified of CPU frequency
* changes. * changes.
*/ */
void esp_set_cpu_freq() void esp_set_cpu_freq(void)
{ {
uint32_t freq_mhz = CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ; uint32_t freq_mhz = CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ;
phy_get_romfunc_addr(); phy_get_romfunc_addr();
// freq will be changed to 40MHz in rtc_init_lite,
// wait uart tx finish, otherwise some uart output will be lost
uart_tx_wait_idle(0);
rtc_init_lite(); rtc_init_lite();
cpu_freq_t freq = CPU_80M; cpu_freq_t freq = CPU_80M;
switch(freq_mhz) { switch(freq_mhz) {
@ -62,6 +68,11 @@ void esp_set_cpu_freq()
freq = CPU_80M; freq = CPU_80M;
break; break;
} }
// freq will be changed to freq in rtc_set_cpu_freq,
// wait uart tx finish, otherwise some uart output will be lost
uart_tx_wait_idle(0);
rtc_set_cpu_freq(XTAL_AUTO, freq); rtc_set_cpu_freq(XTAL_AUTO, freq);
ets_update_cpu_frequency(freq_mhz); ets_update_cpu_frequency(freq_mhz);
} }

2
components/esp32/include/soc/cpu.h
View file

@ -76,6 +76,6 @@ static inline void cpu_configure_region_protection()
* This is a temporary function which will be replaced once dynamic * This is a temporary function which will be replaced once dynamic
* CPU frequency changing is implemented. * CPU frequency changing is implemented.
*/ */
void esp_set_cpu_freq(); void esp_set_cpu_freq(void);
#endif #endif