espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 21:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/remove-IRAM_ATTR-from-decls' into 'master'

Browse Source 
Remove IRAM_ATTR from any function declarations

Closes GCC-223

See merge request espressif/esp-idf!17440
This commit is contained in:
Anton Maklakov
2022-03-23 11:49:22 +08:00
parent 95b3dad771 68e5d9d585
commit 118d39c8fe
21 changed files with 90 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bootloader_support/bootloader_flash/include/bootloader_flash.h
View File

@@ -47,7 +47,7 @@ esp_err_t bootloader_flash_xmc_startup(void);
* *
* @note This can be overridden because it's attribute weak. * @note This can be overridden because it's attribute weak.
*/ */
esp_err_t IRAM_ATTR __attribute__((weak)) bootloader_flash_unlock(void); esp_err_t __attribute__((weak)) bootloader_flash_unlock(void);
#ifdef __cplusplus #ifdef __cplusplus

2
components/bootloader_support/bootloader_flash/include/bootloader_flash_override.h
View File

@@ -107,7 +107,7 @@ extern const bootloader_qio_info_t __attribute__((weak)) bootloader_flash_qe_sup
* *
* @note This can be overridden because it's attribute weak. * @note This can be overridden because it's attribute weak.
*/ */
esp_err_t IRAM_ATTR __attribute__((weak)) bootloader_flash_unlock(void); esp_err_t __attribute__((weak)) bootloader_flash_unlock(void);
#ifdef __cplusplus #ifdef __cplusplus
} }

50
components/bt/controller/esp32/bt.c
View File

@@ -273,15 +273,15 @@ static bool btdm_queue_generic_deregister(btdm_queue_item_t *queue);
#if CONFIG_BTDM_CTRL_HLI #if CONFIG_BTDM_CTRL_HLI
static xt_handler set_isr_hlevel_wrapper(int n, xt_handler f, void *arg); static xt_handler set_isr_hlevel_wrapper(int n, xt_handler f, void *arg);
static void IRAM_ATTR interrupt_hlevel_disable(void); static void interrupt_hlevel_disable(void);
static void IRAM_ATTR interrupt_hlevel_restore(void); static void interrupt_hlevel_restore(void);
#endif /* CONFIG_BTDM_CTRL_HLI */ #endif /* CONFIG_BTDM_CTRL_HLI */
static void IRAM_ATTR task_yield(void); static void task_yield(void);
static void IRAM_ATTR task_yield_from_isr(void); static void task_yield_from_isr(void);
static void *semphr_create_wrapper(uint32_t max, uint32_t init); static void *semphr_create_wrapper(uint32_t max, uint32_t init);
static void semphr_delete_wrapper(void *semphr); static void semphr_delete_wrapper(void *semphr);
static int32_t IRAM_ATTR semphr_take_from_isr_wrapper(void *semphr, void *hptw); static int32_t semphr_take_from_isr_wrapper(void *semphr, void *hptw);
static int32_t IRAM_ATTR semphr_give_from_isr_wrapper(void *semphr, void *hptw); static int32_t semphr_give_from_isr_wrapper(void *semphr, void *hptw);
static int32_t semphr_take_wrapper(void *semphr, uint32_t block_time_ms); static int32_t semphr_take_wrapper(void *semphr, uint32_t block_time_ms);
static int32_t semphr_give_wrapper(void *semphr); static int32_t semphr_give_wrapper(void *semphr);
static void *mutex_create_wrapper(void); static void *mutex_create_wrapper(void);
@@ -291,30 +291,30 @@ static int32_t mutex_unlock_wrapper(void *mutex);
#if CONFIG_BTDM_CTRL_HLI #if CONFIG_BTDM_CTRL_HLI
static void *queue_create_hlevel_wrapper(uint32_t queue_len, uint32_t item_size); static void *queue_create_hlevel_wrapper(uint32_t queue_len, uint32_t item_size);
static void queue_delete_hlevel_wrapper(void *queue); static void queue_delete_hlevel_wrapper(void *queue);
static int32_t IRAM_ATTR queue_send_hlevel_wrapper(void *queue, void *item, uint32_t block_time_ms); static int32_t queue_send_hlevel_wrapper(void *queue, void *item, uint32_t block_time_ms);
static int32_t IRAM_ATTR queue_send_from_isr_hlevel_wrapper(void *queue, void *item, void *hptw); static int32_t queue_send_from_isr_hlevel_wrapper(void *queue, void *item, void *hptw);
static int32_t IRAM_ATTR queue_recv_hlevel_wrapper(void *queue, void *item, uint32_t block_time_ms); static int32_t queue_recv_hlevel_wrapper(void *queue, void *item, uint32_t block_time_ms);
static int32_t IRAM_ATTR queue_recv_from_isr_hlevel_wrapper(void *queue, void *item, void *hptw); static int32_t queue_recv_from_isr_hlevel_wrapper(void *queue, void *item, void *hptw);
#else #else
static void *queue_create_wrapper(uint32_t queue_len, uint32_t item_size); static void *queue_create_wrapper(uint32_t queue_len, uint32_t item_size);
static void queue_delete_wrapper(void *queue); static void queue_delete_wrapper(void *queue);
static int32_t IRAM_ATTR queue_send_wrapper(void *queue, void *item, uint32_t block_time_ms); static int32_t queue_send_wrapper(void *queue, void *item, uint32_t block_time_ms);
static int32_t IRAM_ATTR queue_send_from_isr_wrapper(void *queue, void *item, void *hptw); static int32_t queue_send_from_isr_wrapper(void *queue, void *item, void *hptw);
static int32_t IRAM_ATTR queue_recv_wrapper(void *queue, void *item, uint32_t block_time_ms); static int32_t queue_recv_wrapper(void *queue, void *item, uint32_t block_time_ms);
static int32_t IRAM_ATTR queue_recv_from_isr_wrapper(void *queue, void *item, void *hptw); static int32_t queue_recv_from_isr_wrapper(void *queue, void *item, void *hptw);
#endif /* CONFIG_BTDM_CTRL_HLI */ #endif /* CONFIG_BTDM_CTRL_HLI */
static int32_t task_create_wrapper(void *task_func, const char *name, uint32_t stack_depth, void *param, uint32_t prio, void *task_handle, uint32_t core_id); static int32_t task_create_wrapper(void *task_func, const char *name, uint32_t stack_depth, void *param, uint32_t prio, void *task_handle, uint32_t core_id);
static void task_delete_wrapper(void *task_handle); static void task_delete_wrapper(void *task_handle);
static bool IRAM_ATTR is_in_isr_wrapper(void); static bool is_in_isr_wrapper(void);
static void IRAM_ATTR cause_sw_intr(void *arg); static void cause_sw_intr(void *arg);
static int IRAM_ATTR cause_sw_intr_to_core_wrapper(int core_id, int intr_no); static int cause_sw_intr_to_core_wrapper(int core_id, int intr_no);
static void *malloc_internal_wrapper(size_t size); static void *malloc_internal_wrapper(size_t size);
static int32_t IRAM_ATTR read_mac_wrapper(uint8_t mac[6]); static int32_t read_mac_wrapper(uint8_t mac[6]);
static void IRAM_ATTR srand_wrapper(unsigned int seed); static void srand_wrapper(unsigned int seed);
static int IRAM_ATTR rand_wrapper(void); static int rand_wrapper(void);
static uint32_t IRAM_ATTR btdm_lpcycles_2_us(uint32_t cycles); static uint32_t btdm_lpcycles_2_us(uint32_t cycles);
static uint32_t IRAM_ATTR btdm_us_2_lpcycles(uint32_t us); static uint32_t btdm_us_2_lpcycles(uint32_t us);
static bool IRAM_ATTR btdm_sleep_check_duration(uint32_t *slot_cnt); static bool btdm_sleep_check_duration(uint32_t *slot_cnt);
static void btdm_sleep_enter_phase1_wrapper(uint32_t lpcycles); static void btdm_sleep_enter_phase1_wrapper(uint32_t lpcycles);
static void btdm_sleep_enter_phase2_wrapper(void); static void btdm_sleep_enter_phase2_wrapper(void);
static void btdm_sleep_exit_phase3_wrapper(void); static void btdm_sleep_exit_phase3_wrapper(void);
@@ -336,8 +336,8 @@ static int coex_register_wifi_channel_change_callback_wrapper(void *cb);
#if CONFIG_BTDM_CTRL_HLI #if CONFIG_BTDM_CTRL_HLI
static void *customer_queue_create_hlevel_wrapper(uint32_t queue_len, uint32_t item_size); static void *customer_queue_create_hlevel_wrapper(uint32_t queue_len, uint32_t item_size);
#endif /* CONFIG_BTDM_CTRL_HLI */ #endif /* CONFIG_BTDM_CTRL_HLI */
static void IRAM_ATTR interrupt_l3_disable(void); static void interrupt_l3_disable(void);
static void IRAM_ATTR interrupt_l3_restore(void); static void interrupt_l3_restore(void);
/* Local variable definition /* Local variable definition
*************************************************************************** ***************************************************************************

30
components/bt/controller/esp32c3/bt.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -272,13 +272,13 @@ extern char _bt_tmp_bss_end;
static void interrupt_set_wrapper(int cpu_no, int intr_source, int intr_num, int intr_prio); static void interrupt_set_wrapper(int cpu_no, int intr_source, int intr_num, int intr_prio);
static void interrupt_clear_wrapper(int intr_source, int intr_num); static void interrupt_clear_wrapper(int intr_source, int intr_num);
static void interrupt_handler_set_wrapper(int n, intr_handler_t fn, void *arg); static void interrupt_handler_set_wrapper(int n, intr_handler_t fn, void *arg);
static void IRAM_ATTR interrupt_disable(void); static void interrupt_disable(void);
static void IRAM_ATTR interrupt_restore(void); static void interrupt_restore(void);
static void IRAM_ATTR task_yield_from_isr(void); static void task_yield_from_isr(void);
static void *semphr_create_wrapper(uint32_t max, uint32_t init); static void *semphr_create_wrapper(uint32_t max, uint32_t init);
static void semphr_delete_wrapper(void *semphr); static void semphr_delete_wrapper(void *semphr);
static int IRAM_ATTR semphr_take_from_isr_wrapper(void *semphr, void *hptw); static int semphr_take_from_isr_wrapper(void *semphr, void *hptw);
static int IRAM_ATTR semphr_give_from_isr_wrapper(void *semphr, void *hptw); static int semphr_give_from_isr_wrapper(void *semphr, void *hptw);
static int semphr_take_wrapper(void *semphr, uint32_t block_time_ms); static int semphr_take_wrapper(void *semphr, uint32_t block_time_ms);
static int semphr_give_wrapper(void *semphr); static int semphr_give_wrapper(void *semphr);
static void *mutex_create_wrapper(void); static void *mutex_create_wrapper(void);
@@ -288,19 +288,19 @@ static int mutex_unlock_wrapper(void *mutex);
static void *queue_create_wrapper(uint32_t queue_len, uint32_t item_size); static void *queue_create_wrapper(uint32_t queue_len, uint32_t item_size);
static void queue_delete_wrapper(void *queue); static void queue_delete_wrapper(void *queue);
static int queue_send_wrapper(void *queue, void *item, uint32_t block_time_ms); static int queue_send_wrapper(void *queue, void *item, uint32_t block_time_ms);
static int IRAM_ATTR queue_send_from_isr_wrapper(void *queue, void *item, void *hptw); static int queue_send_from_isr_wrapper(void *queue, void *item, void *hptw);
static int queue_recv_wrapper(void *queue, void *item, uint32_t block_time_ms); static int queue_recv_wrapper(void *queue, void *item, uint32_t block_time_ms);
static int IRAM_ATTR queue_recv_from_isr_wrapper(void *queue, void *item, void *hptw); static int queue_recv_from_isr_wrapper(void *queue, void *item, void *hptw);
static int task_create_wrapper(void *task_func, const char *name, uint32_t stack_depth, void *param, uint32_t prio, void *task_handle, uint32_t core_id); static int task_create_wrapper(void *task_func, const char *name, uint32_t stack_depth, void *param, uint32_t prio, void *task_handle, uint32_t core_id);
static void task_delete_wrapper(void *task_handle); static void task_delete_wrapper(void *task_handle);
static bool IRAM_ATTR is_in_isr_wrapper(void); static bool is_in_isr_wrapper(void);
static void *malloc_internal_wrapper(size_t size); static void *malloc_internal_wrapper(size_t size);
static int IRAM_ATTR read_mac_wrapper(uint8_t mac[6]); static int read_mac_wrapper(uint8_t mac[6]);
static void IRAM_ATTR srand_wrapper(unsigned int seed); static void srand_wrapper(unsigned int seed);
static int IRAM_ATTR rand_wrapper(void); static int rand_wrapper(void);
static uint32_t IRAM_ATTR btdm_lpcycles_2_hus(uint32_t cycles, uint32_t *error_corr); static uint32_t btdm_lpcycles_2_hus(uint32_t cycles, uint32_t *error_corr);
static uint32_t IRAM_ATTR btdm_hus_2_lpcycles(uint32_t hus); static uint32_t btdm_hus_2_lpcycles(uint32_t hus);
static bool IRAM_ATTR btdm_sleep_check_duration(int32_t *slot_cnt); static bool btdm_sleep_check_duration(int32_t *slot_cnt);
static void btdm_sleep_enter_phase1_wrapper(uint32_t lpcycles); static void btdm_sleep_enter_phase1_wrapper(uint32_t lpcycles);
static void btdm_sleep_enter_phase2_wrapper(void); static void btdm_sleep_enter_phase2_wrapper(void);
static void btdm_sleep_exit_phase3_wrapper(void); static void btdm_sleep_exit_phase3_wrapper(void);

30
components/bt/controller/esp32s3/bt.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -271,13 +271,13 @@ extern char _bt_tmp_bss_end;
static void interrupt_set_wrapper(int32_t cpu_no, int32_t intr_source, int32_t intr_num, int32_t intr_prio); static void interrupt_set_wrapper(int32_t cpu_no, int32_t intr_source, int32_t intr_num, int32_t intr_prio);
static void interrupt_clear_wrapper(int32_t intr_source, int32_t intr_num); static void interrupt_clear_wrapper(int32_t intr_source, int32_t intr_num);
static void interrupt_handler_set_wrapper(int n, void *fn, void *arg); static void interrupt_handler_set_wrapper(int n, void *fn, void *arg);
static void IRAM_ATTR interrupt_disable(void); static void interrupt_disable(void);
static void IRAM_ATTR interrupt_restore(void); static void interrupt_restore(void);
static void IRAM_ATTR task_yield_from_isr(void); static void task_yield_from_isr(void);
static void *semphr_create_wrapper(uint32_t max, uint32_t init); static void *semphr_create_wrapper(uint32_t max, uint32_t init);
static void semphr_delete_wrapper(void *semphr); static void semphr_delete_wrapper(void *semphr);
static int32_t IRAM_ATTR semphr_take_from_isr_wrapper(void *semphr, void *hptw); static int32_t semphr_take_from_isr_wrapper(void *semphr, void *hptw);
static int32_t IRAM_ATTR semphr_give_from_isr_wrapper(void *semphr, void *hptw); static int32_t semphr_give_from_isr_wrapper(void *semphr, void *hptw);
static int32_t semphr_take_wrapper(void *semphr, uint32_t block_time_ms); static int32_t semphr_take_wrapper(void *semphr, uint32_t block_time_ms);
static int32_t semphr_give_wrapper(void *semphr); static int32_t semphr_give_wrapper(void *semphr);
static void *mutex_create_wrapper(void); static void *mutex_create_wrapper(void);
@@ -287,19 +287,19 @@ static int32_t mutex_unlock_wrapper(void *mutex);
static void *queue_create_wrapper(uint32_t queue_len, uint32_t item_size); static void *queue_create_wrapper(uint32_t queue_len, uint32_t item_size);
static void queue_delete_wrapper(void *queue); static void queue_delete_wrapper(void *queue);
static int32_t queue_send_wrapper(void *queue, void *item, uint32_t block_time_ms); static int32_t queue_send_wrapper(void *queue, void *item, uint32_t block_time_ms);
static int32_t IRAM_ATTR queue_send_from_isr_wrapper(void *queue, void *item, void *hptw); static int32_t queue_send_from_isr_wrapper(void *queue, void *item, void *hptw);
static int32_t queue_recv_wrapper(void *queue, void *item, uint32_t block_time_ms); static int32_t queue_recv_wrapper(void *queue, void *item, uint32_t block_time_ms);
static int32_t IRAM_ATTR queue_recv_from_isr_wrapper(void *queue, void *item, void *hptw); static int32_t queue_recv_from_isr_wrapper(void *queue, void *item, void *hptw);
static int32_t task_create_wrapper(void *task_func, const char *name, uint32_t stack_depth, void *param, uint32_t prio, void *task_handle, uint32_t core_id); static int32_t task_create_wrapper(void *task_func, const char *name, uint32_t stack_depth, void *param, uint32_t prio, void *task_handle, uint32_t core_id);
static void task_delete_wrapper(void *task_handle); static void task_delete_wrapper(void *task_handle);
static bool IRAM_ATTR is_in_isr_wrapper(void); static bool is_in_isr_wrapper(void);
static void *malloc_internal_wrapper(size_t size); static void *malloc_internal_wrapper(size_t size);
static int32_t IRAM_ATTR read_mac_wrapper(uint8_t mac[6]); static int32_t read_mac_wrapper(uint8_t mac[6]);
static void IRAM_ATTR srand_wrapper(unsigned int seed); static void srand_wrapper(unsigned int seed);
static int IRAM_ATTR rand_wrapper(void); static int rand_wrapper(void);
static uint32_t IRAM_ATTR btdm_lpcycles_2_hus(uint32_t cycles, uint32_t *error_corr); static uint32_t btdm_lpcycles_2_hus(uint32_t cycles, uint32_t *error_corr);
static uint32_t IRAM_ATTR btdm_hus_2_lpcycles(uint32_t hus); static uint32_t btdm_hus_2_lpcycles(uint32_t hus);
static bool IRAM_ATTR btdm_sleep_check_duration(int32_t *slot_cnt); static bool btdm_sleep_check_duration(int32_t *slot_cnt);
static void btdm_sleep_enter_phase1_wrapper(uint32_t lpcycles); static void btdm_sleep_enter_phase1_wrapper(uint32_t lpcycles);
static void btdm_sleep_enter_phase2_wrapper(void); static void btdm_sleep_enter_phase2_wrapper(void);
static void btdm_sleep_exit_phase3_wrapper(void); static void btdm_sleep_exit_phase3_wrapper(void);

6
components/bt/esp_ble_mesh/mesh_common/include/mesh_common.h
View File

@@ -27,11 +27,11 @@
extern "C" { extern "C" {
#endif #endif
IRAM_ATTR void *bt_mesh_malloc(size_t size); void *bt_mesh_malloc(size_t size);
IRAM_ATTR void *bt_mesh_calloc(size_t size); void *bt_mesh_calloc(size_t size);
IRAM_ATTR void bt_mesh_free(void *ptr); void bt_mesh_free(void *ptr);
/** /**
* @brief This function allocates memory to store outgoing message. * @brief This function allocates memory to store outgoing message.

6
components/driver/adc.c
View File

@@ -109,12 +109,12 @@ uint32_t adc_get_calibration_offset(adc_unit_t adc_n, adc_channel_t chan, adc_at
ADC Continuous Read Mode (via DMA) ADC Continuous Read Mode (via DMA)
---------------------------------------------------------------*/ ---------------------------------------------------------------*/
//Function to address transaction //Function to address transaction
static IRAM_ATTR bool s_adc_dma_intr(adc_digi_context_t *adc_digi_ctx); static bool s_adc_dma_intr(adc_digi_context_t *adc_digi_ctx);
#if SOC_GDMA_SUPPORTED #if SOC_GDMA_SUPPORTED
static IRAM_ATTR bool adc_dma_in_suc_eof_callback(gdma_channel_handle_t dma_chan, gdma_event_data_t *event_data, void *user_data); static bool adc_dma_in_suc_eof_callback(gdma_channel_handle_t dma_chan, gdma_event_data_t *event_data, void *user_data);
#else #else
static IRAM_ATTR void adc_dma_intr_handler(void *arg); static void adc_dma_intr_handler(void *arg);
#endif #endif
static int8_t adc_digi_get_io_num(adc_unit_t adc_unit, uint8_t adc_channel) static int8_t adc_digi_get_io_num(adc_unit_t adc_unit, uint8_t adc_channel)

2
components/driver/i2c.c
View File

@@ -213,7 +213,7 @@ static i2c_clk_alloc_t i2c_clk_alloc[I2C_SCLK_MAX] = {
static i2c_obj_t *p_i2c_obj[I2C_NUM_MAX] = {0}; static i2c_obj_t *p_i2c_obj[I2C_NUM_MAX] = {0};
static void i2c_isr_handler_default(void *arg); static void i2c_isr_handler_default(void *arg);
static void IRAM_ATTR i2c_master_cmd_begin_static(i2c_port_t i2c_num); static void i2c_master_cmd_begin_static(i2c_port_t i2c_num);
static esp_err_t i2c_hw_fsm_reset(i2c_port_t i2c_num); static esp_err_t i2c_hw_fsm_reset(i2c_port_t i2c_num);
static void i2c_hw_disable(i2c_port_t i2c_num) static void i2c_hw_disable(i2c_port_t i2c_num)

4
components/driver/spi_slave.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -69,7 +69,7 @@ typedef struct {
static spi_slave_t *spihost[SOC_SPI_PERIPH_NUM]; static spi_slave_t *spihost[SOC_SPI_PERIPH_NUM];
static void SPI_SLAVE_ISR_ATTR spi_intr(void *arg); static void spi_intr(void *arg);
static inline bool is_valid_host(spi_host_device_t host) static inline bool is_valid_host(spi_host_device_t host)
{ {

4
components/esp_hw_support/port/esp32/spiram_psram.c
View File

@@ -3,7 +3,7 @@
*/ */
/* /*
* SPDX-FileCopyrightText: 2013-2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2013-2022 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -198,7 +198,7 @@ typedef struct {
uint32_t dummyBitLen; uint32_t dummyBitLen;
} psram_cmd_t; } psram_cmd_t;
static void IRAM_ATTR psram_cache_init(psram_cache_mode_t psram_cache_mode, psram_vaddr_mode_t vaddrmode); static void psram_cache_init(psram_cache_mode_t psram_cache_mode, psram_vaddr_mode_t vaddrmode);
static uint8_t s_psram_cs_io = (uint8_t)-1; static uint8_t s_psram_cs_io = (uint8_t)-1;

2
components/esp_hw_support/port/esp32s2/spiram_psram.c
View File

@@ -158,7 +158,7 @@ typedef enum {
typedef esp_rom_spi_cmd_t psram_cmd_t; typedef esp_rom_spi_cmd_t psram_cmd_t;
static uint32_t s_psram_id = 0; static uint32_t s_psram_id = 0;
static void IRAM_ATTR psram_cache_init(psram_cache_mode_t psram_cache_mode, psram_vaddr_mode_t vaddrmode); static void psram_cache_init(psram_cache_mode_t psram_cache_mode, psram_vaddr_mode_t vaddrmode);
extern void esp_rom_spi_set_op_mode(int spi_num, esp_rom_spiflash_read_mode_t mode); extern void esp_rom_spi_set_op_mode(int spi_num, esp_rom_spiflash_read_mode_t mode);
static uint8_t s_psram_cs_io = (uint8_t)-1; static uint8_t s_psram_cs_io = (uint8_t)-1;

2
components/esp_hw_support/sleep_modes.c
View File

@@ -358,7 +358,7 @@ inline static void IRAM_ATTR misc_modules_wake_prepare(void)
#endif #endif
} }
inline static uint32_t IRAM_ATTR call_rtc_sleep_start(uint32_t reject_triggers, uint32_t lslp_mem_inf_fpu); inline static uint32_t call_rtc_sleep_start(uint32_t reject_triggers, uint32_t lslp_mem_inf_fpu);
static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags) static uint32_t IRAM_ATTR esp_sleep_start(uint32_t pd_flags)
{ {

20
components/esp_system/include/esp_debug_helpers.h
View File

@@ -1,16 +1,8 @@
// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#pragma once #pragma once
@@ -104,7 +96,7 @@ bool esp_backtrace_get_next_frame(esp_backtrace_frame_t *frame);
* - ESP_OK Backtrace successfully printed to completion or to depth limit * - ESP_OK Backtrace successfully printed to completion or to depth limit
* - ESP_FAIL Backtrace is corrupted * - ESP_FAIL Backtrace is corrupted
*/ */
esp_err_t IRAM_ATTR esp_backtrace_print_from_frame(int depth, const esp_backtrace_frame_t* frame, bool panic); esp_err_t esp_backtrace_print_from_frame(int depth, const esp_backtrace_frame_t* frame, bool panic);
/** /**
* @brief Print the backtrace of the current stack * @brief Print the backtrace of the current stack

2
components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h
View File

@@ -269,7 +269,7 @@ void vPortYieldOtherCore(BaseType_t coreid);
* @return true Core can yield * @return true Core can yield
* @return false Core cannot yield * @return false Core cannot yield
*/ */
static inline bool IRAM_ATTR xPortCanYield(void); static inline bool xPortCanYield(void);
// ------------------- Hook Functions ---------------------- // ------------------- Hook Functions ----------------------

4
components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro.h
View File

@@ -359,7 +359,7 @@ void vPortYieldOtherCore(BaseType_t coreid);
* @return true Core can yield * @return true Core can yield
* @return false Core cannot yield * @return false Core cannot yield
*/ */
static inline bool IRAM_ATTR xPortCanYield(void); static inline bool xPortCanYield(void);
// ------------------- Hook Functions ---------------------- // ------------------- Hook Functions ----------------------
@@ -398,7 +398,7 @@ void vPortSetStackWatchpoint( void *pxStackStart );
* @note [refactor-todo] IDF should call a FreeRTOS like macro instead of port function directly * @note [refactor-todo] IDF should call a FreeRTOS like macro instead of port function directly
* @return BaseType_t Core ID * @return BaseType_t Core ID
*/ */
static inline BaseType_t IRAM_ATTR xPortGetCoreID(void); static inline BaseType_t xPortGetCoreID(void);
/** /**
* @brief Wrapper for atomic compare-and-set instruction * @brief Wrapper for atomic compare-and-set instruction

4
components/heap/heap_caps.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -17,7 +17,7 @@
// forward declaration // forward declaration
IRAM_ATTR static void *heap_caps_realloc_base( void *ptr, size_t size, uint32_t caps); static void *heap_caps_realloc_base( void *ptr, size_t size, uint32_t caps);
/* /*
This file, combined with a region allocator that supports multiple heaps, solves the problem that the ESP32 has RAM This file, combined with a region allocator that supports multiple heaps, solves the problem that the ESP32 has RAM

2
components/pthread/pthread.c
View File

@@ -59,7 +59,7 @@ static SLIST_HEAD(esp_thread_list_head, esp_pthread_entry) s_threads_list
static pthread_key_t s_pthread_cfg_key; static pthread_key_t s_pthread_cfg_key;
static int IRAM_ATTR pthread_mutex_lock_internal(esp_pthread_mutex_t *mux, TickType_t tmo); static int pthread_mutex_lock_internal(esp_pthread_mutex_t *mux, TickType_t tmo);
static void esp_pthread_cfg_key_destructor(void *value) static void esp_pthread_cfg_key_destructor(void *value)
{ {

4
components/spi_flash/cache_utils.c
View File

@@ -63,8 +63,8 @@ static __attribute__((unused)) const char *TAG = "cache";
#define DPORT_CACHE_GET_VAL(cpuid) (cpuid == 0) ? DPORT_CACHE_VAL(PRO) : DPORT_CACHE_VAL(APP) #define DPORT_CACHE_GET_VAL(cpuid) (cpuid == 0) ? DPORT_CACHE_VAL(PRO) : DPORT_CACHE_VAL(APP)
#define DPORT_CACHE_GET_MASK(cpuid) (cpuid == 0) ? DPORT_CACHE_MASK(PRO) : DPORT_CACHE_MASK(APP) #define DPORT_CACHE_GET_MASK(cpuid) (cpuid == 0) ? DPORT_CACHE_MASK(PRO) : DPORT_CACHE_MASK(APP)
static void IRAM_ATTR spi_flash_disable_cache(uint32_t cpuid, uint32_t *saved_state); static void spi_flash_disable_cache(uint32_t cpuid, uint32_t *saved_state);
static void IRAM_ATTR spi_flash_restore_cache(uint32_t cpuid, uint32_t saved_state); static void spi_flash_restore_cache(uint32_t cpuid, uint32_t saved_state);
static uint32_t s_flash_op_cache_state[2]; static uint32_t s_flash_op_cache_state[2];

10
components/spi_flash/spi_flash_os_func_app.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -52,10 +52,10 @@ typedef struct {
uint32_t released_since_us; // Time since last end() (implicit yield) uint32_t released_since_us; // Time since last end() (implicit yield)
} spi1_app_func_arg_t; } spi1_app_func_arg_t;
static inline IRAM_ATTR void on_spi1_released(spi1_app_func_arg_t* ctx); static inline void on_spi1_released(spi1_app_func_arg_t* ctx);
static inline IRAM_ATTR void on_spi1_acquired(spi1_app_func_arg_t* ctx); static inline void on_spi1_acquired(spi1_app_func_arg_t* ctx);
static inline IRAM_ATTR void on_spi1_yielded(spi1_app_func_arg_t* ctx); static inline void on_spi1_yielded(spi1_app_func_arg_t* ctx);
static inline IRAM_ATTR bool on_spi1_check_yield(spi1_app_func_arg_t* ctx); static inline bool on_spi1_check_yield(spi1_app_func_arg_t* ctx);
IRAM_ATTR static void cache_enable(void* arg) IRAM_ATTR static void cache_enable(void* arg)
{ {

2
examples/bluetooth/esp_ble_mesh/common_components/light_driver/iot_led.c
View File

@@ -48,7 +48,7 @@ static DRAM_ATTR iot_light_t *g_light_config = NULL;
static DRAM_ATTR uint16_t *g_gamma_table = NULL; static DRAM_ATTR uint16_t *g_gamma_table = NULL;
static DRAM_ATTR bool g_hw_timer_started = false; static DRAM_ATTR bool g_hw_timer_started = false;
static IRAM_ATTR bool fade_timercb(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_ctx); static bool fade_timercb(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_ctx);
static void iot_timer_start(gptimer_handle_t gptimer) static void iot_timer_start(gptimer_handle_t gptimer)
{ {

1
tools/ci/check_copyright_ignore.txt
View File

@@ -676,7 +676,6 @@ components/esp_serial_slave_link/include/essl_spi/esp32s3_defs.h
components/esp_system/esp_err.c components/esp_system/esp_err.c
components/esp_system/freertos_hooks.c components/esp_system/freertos_hooks.c
components/esp_system/include/eh_frame_parser.h components/esp_system/include/eh_frame_parser.h
components/esp_system/include/esp_debug_helpers.h
components/esp_system/include/esp_expression_with_stack.h components/esp_system/include/esp_expression_with_stack.h
components/esp_system/include/esp_freertos_hooks.h components/esp_system/include/esp_freertos_hooks.h
components/esp_system/include/esp_int_wdt.h components/esp_system/include/esp_int_wdt.h