blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 09:39:10 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/fix_rom_api_violation' into 'master'

Browse Source 
fix rom api usage violation

See merge request espressif/esp-idf!9848
This commit is contained in:
Ivan Grokhotkov 2020-07-29 18:34:28 +08:00
commit ef3280295d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp32s3/clk.c
View File

@ -44,7 +44,7 @@ int IRAM_ATTR esp_clk_xtal_freq(void)
void IRAM_ATTR ets_update_cpu_frequency(uint32_t ticks_per_us) void IRAM_ATTR ets_update_cpu_frequency(uint32_t ticks_per_us)
{ {
/* Update scale factors used by ets_delay_us */ /* Update scale factors used by esp_rom_delay_us */
g_ticks_per_us_pro = ticks_per_us; g_ticks_per_us_pro = ticks_per_us;
#ifndef CONFIG_FREERTOS_UNICORE #ifndef CONFIG_FREERTOS_UNICORE
g_ticks_per_us_app = ticks_per_us; g_ticks_per_us_app = ticks_per_us;

4
components/esp32s3/sleep_modes.c
View File

@ -24,8 +24,8 @@
#include "esp_spi_flash.h" #include "esp_spi_flash.h"
#include "esp32s3/rom/cache.h" #include "esp32s3/rom/cache.h"
#include "esp32s3/rom/rtc.h" #include "esp32s3/rom/rtc.h"
#include "esp32s3/rom/ets_sys.h"
#include "esp_rom_uart.h" #include "esp_rom_uart.h"
#include "esp_rom_sys.h"
#include "soc/cpu.h" #include "soc/cpu.h"
#include "soc/rtc.h" #include "soc/rtc.h"
#include "soc/spi_periph.h" #include "soc/spi_periph.h"
@ -286,7 +286,7 @@ static esp_err_t esp_light_sleep_inner(uint32_t pd_flags,
// If SPI flash was powered down, wait for it to become ready // If SPI flash was powered down, wait for it to become ready
if (pd_flags & RTC_SLEEP_PD_VDDSDIO) { if (pd_flags & RTC_SLEEP_PD_VDDSDIO) {
// Wait for the flash chip to start up // Wait for the flash chip to start up
ets_delay_us(flash_enable_time_us); esp_rom_delay_us(flash_enable_time_us);
} }
return err; return err;
} }