Skip to content

Commit bc816c6

Browse files
authored
Updated HWDT to use IRAM_ATTR instead of ICACHE_RAM_ATTR. (#8013)
1 parent 5704bf2 commit bc816c6

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

cores/esp8266/hwdt_app_entry.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ extern uint32_t stack_thunk_get_stack_bot() __attribute__((weak, alias("__zero_r
300300
#ifdef USE_IRAM
301301
#undef USE_IRAM
302302
#define USE_IRAM 1
303-
#define IRAM_MAYBE ICACHE_RAM_ATTR
303+
#define IRAM_MAYBE IRAM_ATTR
304304

305305
#else
306306
#undef USE_IRAM
@@ -441,8 +441,8 @@ extern "C" {
441441

442442
extern cont_t * get_noextra4k_g_pcont(void);
443443

444-
cont_t * ICACHE_RAM_ATTR get_noextra4k_g_pcont(void) __attribute__((weak));
445-
cont_t * ICACHE_RAM_ATTR get_noextra4k_g_pcont(void) {
444+
cont_t * IRAM_ATTR get_noextra4k_g_pcont(void) __attribute__((weak));
445+
cont_t * IRAM_ATTR get_noextra4k_g_pcont(void) {
446446
return NULL;
447447
}
448448

@@ -1027,7 +1027,7 @@ extern "C" void Cache_Read_Disable(void);
10271027
extern "C" void Cache_Read_Enable(uint8_t map, uint8_t p, uint8_t v);
10281028

10291029
#ifndef USE_IRAM
1030-
static void ICACHE_RAM_ATTR __attribute__((noinline)) handle_hwdt_icache() __attribute__((used));
1030+
static void IRAM_ATTR __attribute__((noinline)) handle_hwdt_icache() __attribute__((used));
10311031
void handle_hwdt_icache() {
10321032
Cache_Read_Enable(0, 0, ICACHE_SIZE_16);
10331033
handle_hwdt();
@@ -1055,7 +1055,7 @@ void hwdt_pre_sdk_init(void) {
10551055
#endif
10561056
}
10571057

1058-
static void ICACHE_RAM_ATTR __attribute__((noinline)) hwdt_pre_sdk_init_icache(void) __attribute__((used));
1058+
static void IRAM_ATTR __attribute__((noinline)) hwdt_pre_sdk_init_icache(void) __attribute__((used));
10591059
void hwdt_pre_sdk_init_icache(void) {
10601060
Cache_Read_Enable(0, 0, ICACHE_SIZE_16);
10611061
#ifdef DEBUG_ESP_HWDT_UART_SPEED
@@ -1154,7 +1154,7 @@ asm (
11541154
);
11551155

11561156
#else
1157-
void ICACHE_RAM_ATTR app_entry_start(void) {
1157+
void IRAM_ATTR app_entry_start(void) {
11581158
11591159
#ifdef USE_IRAM
11601160
handle_hwdt();
@@ -1191,7 +1191,7 @@ void ICACHE_RAM_ATTR app_entry_start(void) {
11911191
__builtin_unreachable();
11921192
}
11931193
1194-
void ICACHE_RAM_ATTR app_entry_redefinable(void) {
1194+
void IRAM_ATTR app_entry_redefinable(void) {
11951195
/*
11961196
* There are 4 sections of code that share the stack starting near
11971197
* 0x40000000.

0 commit comments

Comments
 (0)