Skip to content

Commit ef32802

Browse files
committed
Merge branch 'bugfix/fix_rom_api_violation' into 'master'
fix rom api usage violation See merge request espressif/esp-idf!9848
2 parents e7b89e6 + c359d9a commit ef32802

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

components/esp32s3/clk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ int IRAM_ATTR esp_clk_xtal_freq(void)
4444

4545
void IRAM_ATTR ets_update_cpu_frequency(uint32_t ticks_per_us)
4646
{
47-
/* Update scale factors used by ets_delay_us */
47+
/* Update scale factors used by esp_rom_delay_us */
4848
g_ticks_per_us_pro = ticks_per_us;
4949
#ifndef CONFIG_FREERTOS_UNICORE
5050
g_ticks_per_us_app = ticks_per_us;

components/esp32s3/sleep_modes.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#include "esp_spi_flash.h"
2525
#include "esp32s3/rom/cache.h"
2626
#include "esp32s3/rom/rtc.h"
27-
#include "esp32s3/rom/ets_sys.h"
2827
#include "esp_rom_uart.h"
28+
#include "esp_rom_sys.h"
2929
#include "soc/cpu.h"
3030
#include "soc/rtc.h"
3131
#include "soc/spi_periph.h"
@@ -286,7 +286,7 @@ static esp_err_t esp_light_sleep_inner(uint32_t pd_flags,
286286
// If SPI flash was powered down, wait for it to become ready
287287
if (pd_flags & RTC_SLEEP_PD_VDDSDIO) {
288288
// Wait for the flash chip to start up
289-
ets_delay_us(flash_enable_time_us);
289+
esp_rom_delay_us(flash_enable_time_us);
290290
}
291291
return err;
292292
}

0 commit comments

Comments
 (0)