Skip to content

Commit 8c3378a

Browse files
authored
[ion/bootloader] Fixed wrong trampoline call.
1 parent 126bdd6 commit 8c3378a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

ion/src/device/bootloader/drivers/external_flash_tramp.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,13 +371,13 @@ void MassErase() {
371371

372372
void WriteMemory(uint8_t * destination, const uint8_t * source, size_t length) {
373373
asm("cpsid if");
374-
reinterpret_cast<void(*)(uint8_t*, const uint8_t*, size_t)>(Ion::Device::Trampoline::address(Ion::Device::Trampoline::ExternalFlashWriteMemory))(destination, source, length);
374+
(*reinterpret_cast<void(**)(uint8_t*, const uint8_t*, size_t)>(Ion::Device::Trampoline::address(Ion::Device::Trampoline::ExternalFlashWriteMemory)))(destination, source, length);
375375
asm("cpsie if");
376376
}
377377

378378
void EraseSector(int i) {
379379
asm("cpsid if");
380-
reinterpret_cast<void(*)(int)>(Ion::Device::Trampoline::address(Ion::Device::Trampoline::ExternalFlashEraseSector))(i);
380+
(*reinterpret_cast<void(**)(int)>(Ion::Device::Trampoline::address(Ion::Device::Trampoline::ExternalFlashEraseSector)))(i);
381381
asm("cpsie if");
382382
}
383383

ion/src/device/bootloader/drivers/power.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void __attribute__((noinline)) internalFlashStandby() {
7979
}
8080

8181
void enterLowPowerMode() {
82-
reinterpret_cast<void(*)(void)>(Ion::Device::Trampoline::address(Ion::Device::Trampoline::Suspend))();
82+
(*reinterpret_cast<void(**)(void)>(Ion::Device::Trampoline::address(Ion::Device::Trampoline::Suspend)))();
8383
}
8484

8585
}

0 commit comments

Comments
 (0)