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

Merge branch 'bugfix/esp_get_random_return_zero' into 'master'

Browse source 
Do not disable clock for generating random number.

1. Do not disable clock for generating random number.
2. And fix the bug that system crashes if call esp_wifi_stop() twice.

See merge request !534
This commit is contained in:
Wu Jian Gang 2017-02-28 14:35:22 +08:00
commit 8f43567a68
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/esp32/lib

@ -1 +1 @@
Subproject commit 28c6ee924ca6efc71bb77dcb040efd07d4d8a000 Subproject commit 7b06303c0fa416aea7f86b7596e84db367189066

8
components/esp32/phy_init.c
View file

@ -82,10 +82,10 @@ esp_err_t esp_phy_rf_deinit(void)
_lock_acquire(&s_phy_rf_init_lock); _lock_acquire(&s_phy_rf_init_lock);
if (s_phy_rf_init_count == 1) { if (s_phy_rf_init_count == 1) {
// Disable PHY and RF. TODO: convert this function to another one. // Disable PHY and RF.
pm_close_rf(); phy_close_rf();
// Disable WiFi peripheral clock // Disable WiFi peripheral clock. Do not disable clock for generating random number.
CLEAR_PERI_REG_MASK(DPORT_WIFI_CLK_EN_REG, 0x87cf); CLEAR_PERI_REG_MASK(DPORT_WIFI_CLK_EN_REG, 0x874f);
} else { } else {
#if CONFIG_SW_COEXIST_ENABLE #if CONFIG_SW_COEXIST_ENABLE
coex_deinit(); coex_deinit();

2
components/esp32/rtc.h
View file

@ -138,7 +138,7 @@ uint32_t rtc_sleep(uint32_t cycles_h, uint32_t cycles_l, uint32_t wakeup_opt, ui
/** /**
* @brief Shutdown PHY and RF. TODO: convert this function to another one. * @brief Shutdown PHY and RF. TODO: convert this function to another one.
*/ */
void pm_close_rf(void); void phy_close_rf(void);
#ifdef __cplusplus #ifdef __cplusplus
} }