Skip to content

DRAFT: fix: read and write to correct bank when bank swap is active. #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Alexander Pärsch (uxitraAlex) wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

DRAFT: fix: read and write to correct bank when bank swap is active. #710

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions hal_st/stm32fxxx/FlashInternalHighCycleAreaStm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,19 @@ namespace
const ConstHalfWordRange bank1Range{ ptr<FLASH_EDATA_BASE>(), ptr<FLASH_EDATA_BASE + bankSize>() };
const ConstHalfWordRange bank2Range{ ptr<FLASH_EDATA_BASE + bankSize>(), ptr<FLASH_EDATA_BASE + fullSize>() };

bool IsBankSwapActive()
{
return (FLASH->OPTCR & FLASH_OPTCR_SWAP_BANK) != 0;
}

ConstHalfWordRange GetBankRange(uint32_t bank)
{
switch (bank)
{
case FLASH_BANK_1:
return bank1Range;
return IsBankSwapActive() ? bank2Range : bank1Range;
case FLASH_BANK_2:
return bank2Range;
return IsBankSwapActive() ? bank1Range : bank2Range;
default:
std::abort();
}
Expand Down
Loading