UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion/external_flash] Take absolute address for WriteMemory

Browse Source
This commit is contained in:
M4x1m3
2022-02-27 14:59:34 +01:00
parent dee783065b
commit 88b4e904c0
4 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ion/src/device/bootloader/drivers/external_flash.cpp
View File

@@ -471,6 +471,7 @@ void __attribute__((noinline)) WriteMemory(uint8_t * destination, const uint8_t
if (Config::NumberOfSectors == 0) {
return;
}
destination -= ExternalFlash::Config::StartAddress;
unset_memory_mapped_mode();
/* Each 256-byte page of the external flash memory (contained in a previously erased area)
* may be programmed in burst mode with a single Page Program instruction.

2
ion/src/device/bootloader/drivers/external_flash_tramp.cpp
View File

@@ -371,7 +371,7 @@ void MassErase() {
void WriteMemory(uint8_t * destination, const uint8_t * source, size_t length) {
asm("cpsid if");
reinterpret_cast<void(*)(uint8_t*, const uint8_t*, size_t)>(Ion::Device::Trampoline::address(Ion::Device::Trampoline::ExternalFlashWriteMemory))(destination + ExternalFlash::Config::StartAddress, source, length);
reinterpret_cast<void(*)(uint8_t*, const uint8_t*, size_t)>(Ion::Device::Trampoline::address(Ion::Device::Trampoline::ExternalFlashWriteMemory))(destination, source, length);
asm("cpsie if");
}

1
ion/src/device/n0110/drivers/external_flash.cpp
View File

@@ -471,6 +471,7 @@ void __attribute__((noinline)) WriteMemory(uint8_t * destination, const uint8_t
if (Config::NumberOfSectors == 0) {
return;
}
destination -= ExternalFlash::Config::StartAddress;
unset_memory_mapped_mode();
/* Each 256-byte page of the external flash memory (contained in a previously erased area)
* may be programmed in burst mode with a single Page Program instruction.

2
ion/src/device/shared/drivers/flash.cpp
View File

@@ -46,7 +46,7 @@ void WriteMemory(uint8_t * destination, uint8_t * source, size_t length) {
if (SectorAtAddress((uint32_t)destination) < InternalFlash::Config::NumberOfSectors) {
InternalFlash::WriteMemory(destination, source, length);
} else {
ExternalFlash::WriteMemory(destination - ExternalFlash::Config::StartAddress, source, length);
ExternalFlash::WriteMemory(destination, source, length);
}
}