feedc0de/espwifistack
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fixed compilation with newer esp-idf versions

Browse Source
This commit is contained in:
0xFEEDC0DE64
2022-01-11 20:50:55 +01:00
parent 55b4078e28
commit 25bb86f9eb
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/espwifistack.cpp
View File

@@ -28,6 +28,7 @@
#include <esp_eth_com.h> #include <esp_eth_com.h>
#include <soc/emac_ext_struct.h> #include <soc/emac_ext_struct.h>
#include <soc/rtc.h> #include <soc/rtc.h>
#include <soc/io_mux_reg.h>
#endif #endif
#ifdef CONFIG_ETH_ENABLED #ifdef CONFIG_ETH_ENABLED
@@ -2920,9 +2921,15 @@ esp_err_t eth_on_lowlevel_init_done(esp_eth_handle_t eth_handle)
#if CONFIG_ETH_RMII_CLK_INPUT #if CONFIG_ETH_RMII_CLK_INPUT
void emac_config_apll_clock() void emac_config_apll_clock()
{ {
constexpr auto rtc_clk_apll_enable = [](bool enable, uint32_t sdm0, uint32_t sdm1, uint32_t sdm2, uint32_t o_div){
rtc_clk_apll_coeff_set(o_div, sdm0, sdm1, sdm2);
::rtc_clk_apll_enable(enable);
};
/* apll_freq = xtal_freq * (4 + sdm2 + sdm1/256 + sdm0/65536)/((o_div + 2) * 2) */ /* apll_freq = xtal_freq * (4 + sdm2 + sdm1/256 + sdm0/65536)/((o_div + 2) * 2) */
rtc_xtal_freq_t rtc_xtal_freq = rtc_clk_xtal_freq_get(); rtc_xtal_freq_t rtc_xtal_freq = rtc_clk_xtal_freq_get();
switch (rtc_xtal_freq) { switch (rtc_xtal_freq)
{
case RTC_XTAL_FREQ_40M: // Recommended case RTC_XTAL_FREQ_40M: // Recommended
/* 50 MHz = 40MHz * (4 + 6) / (2 * (2 + 2) = 50.000 */ /* 50 MHz = 40MHz * (4 + 6) / (2 * (2 + 2) = 50.000 */
/* sdm0 = 0, sdm1 = 0, sdm2 = 6, o_div = 2 */ /* sdm0 = 0, sdm1 = 0, sdm2 = 6, o_div = 2 */