@@ -59,8 +59,8 @@ int FlashIAP::init()
59
59
int ret = 0 ;
60
60
_mutex->lock ();
61
61
{
62
- ScopedMpuXnLock xn ;
63
- ScopedMpuWnLock wn ;
62
+ ScopedMpuXnLock make_ram_executable ;
63
+ ScopedMpuWnLock make_rom_writable ;
64
64
if (flash_init (&_flash)) {
65
65
ret = -1 ;
66
66
}
@@ -77,8 +77,8 @@ int FlashIAP::deinit()
77
77
int ret = 0 ;
78
78
_mutex->lock ();
79
79
{
80
- ScopedMpuXnLock xn ;
81
- ScopedMpuWnLock wn ;
80
+ ScopedMpuXnLock make_ram_executable ;
81
+ ScopedMpuWnLock make_rom_writable ;
82
82
if (flash_free (&_flash)) {
83
83
ret = -1 ;
84
84
}
@@ -94,8 +94,8 @@ int FlashIAP::read(void *buffer, uint32_t addr, uint32_t size)
94
94
int32_t ret = -1 ;
95
95
_mutex->lock ();
96
96
{
97
- ScopedMpuXnLock xn ;
98
- ScopedMpuWnLock wn ;
97
+ ScopedMpuXnLock make_ram_executable ;
98
+ ScopedMpuWnLock make_rom_writable ;
99
99
ret = flash_read (&_flash, addr, (uint8_t *) buffer, size);
100
100
}
101
101
_mutex->unlock ();
@@ -141,8 +141,8 @@ int FlashIAP::program(const void *buffer, uint32_t addr, uint32_t size)
141
141
prog_size = chunk;
142
142
}
143
143
{
144
- ScopedMpuXnLock xn ;
145
- ScopedMpuWnLock wn ;
144
+ ScopedMpuXnLock make_ram_executable ;
145
+ ScopedMpuWnLock make_rom_writable ;
146
146
if (flash_program_page (&_flash, addr, prog_buf, prog_size)) {
147
147
ret = -1 ;
148
148
break ;
@@ -189,8 +189,8 @@ int FlashIAP::erase(uint32_t addr, uint32_t size)
189
189
_mutex->lock ();
190
190
while (size) {
191
191
{
192
- ScopedMpuXnLock xn ;
193
- ScopedMpuWnLock wn ;
192
+ ScopedMpuXnLock make_ram_executable ;
193
+ ScopedMpuWnLock make_rom_writable ;
194
194
ret = flash_erase_sector (&_flash, addr);
195
195
}
196
196
if (ret != 0 ) {
0 commit comments