Skip to content

Commit dcdd431

Browse files
Clean up ICACHE_RAM_ATTR in VM PR (#7924)
1 parent 55cee05 commit dcdd431

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

cores/esp8266/core_esp8266_vm.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ static void spi_init(spi_regs *spi1)
181181
// So using the command portion of the cycle will not work. Comcatenate the address
182182
// and command into a single 32-bit chunk "address" which will be sent across both bits.
183183

184-
inline ICACHE_RAM_ATTR void spi_writetransaction(spi_regs *spi1, int addr, int addr_bits, int dummy_bits, int data_bits, iotype dual)
184+
inline IRAM_ATTR void spi_writetransaction(spi_regs *spi1, int addr, int addr_bits, int dummy_bits, int data_bits, iotype dual)
185185
{
186186
// Ensure no writes are still ongoing
187187
while (spi1->spi_cmd & SPIBUSY) { /* busywait */ }
@@ -198,7 +198,7 @@ inline ICACHE_RAM_ATTR void spi_writetransaction(spi_regs *spi1, int addr, int a
198198
}
199199
}
200200

201-
inline ICACHE_RAM_ATTR uint32_t spi_readtransaction(spi_regs *spi1, int addr, int addr_bits, int dummy_bits, int data_bits, iotype dual)
201+
inline IRAM_ATTR uint32_t spi_readtransaction(spi_regs *spi1, int addr, int addr_bits, int dummy_bits, int data_bits, iotype dual)
202202
{
203203
// Ensure no writes are still ongoing
204204
while (spi1->spi_cmd & SPIBUSY) { /* busywait */ }
@@ -214,7 +214,7 @@ inline ICACHE_RAM_ATTR uint32_t spi_readtransaction(spi_regs *spi1, int addr, in
214214
return spi1->spi_w[0];
215215
}
216216

217-
static inline ICACHE_RAM_ATTR void cache_flushrefill(spi_regs *spi1, int addr)
217+
static inline IRAM_ATTR void cache_flushrefill(spi_regs *spi1, int addr)
218218
{
219219
addr &= addrmask;
220220
struct cache_line *way = __vm_cache;
@@ -263,7 +263,7 @@ static inline ICACHE_RAM_ATTR void cache_flushrefill(spi_regs *spi1, int addr)
263263
last->addr = addr;
264264
}
265265

266-
static inline ICACHE_RAM_ATTR void spi_ramwrite(spi_regs *spi1, int addr, int data_bits, uint32_t val)
266+
static inline IRAM_ATTR void spi_ramwrite(spi_regs *spi1, int addr, int data_bits, uint32_t val)
267267
{
268268
if (cache_ways == 0) {
269269
spi1->spi_w[0] = val;
@@ -280,7 +280,7 @@ static inline ICACHE_RAM_ATTR void spi_ramwrite(spi_regs *spi1, int addr, int da
280280
}
281281
}
282282

283-
static inline ICACHE_RAM_ATTR uint32_t spi_ramread(spi_regs *spi1, int addr, int data_bits)
283+
static inline IRAM_ATTR uint32_t spi_ramread(spi_regs *spi1, int addr, int data_bits)
284284
{
285285
if (cache_ways == 0) {
286286
spi1->spi_w[0] = 0;
@@ -298,7 +298,7 @@ static inline ICACHE_RAM_ATTR uint32_t spi_ramread(spi_regs *spi1, int addr, int
298298

299299
static void (*__old_handler)(struct __exception_frame *ef, int cause);
300300

301-
static ICACHE_RAM_ATTR void loadstore_exception_handler(struct __exception_frame *ef, int cause)
301+
static IRAM_ATTR void loadstore_exception_handler(struct __exception_frame *ef, int cause)
302302
{
303303
uint32_t excvaddr;
304304
uint32_t insn;

0 commit comments

Comments
 (0)