Skip to content
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

fix(BLE,Build): Fix default PAL_NVM_SIZE, add compiler checks for NVM erase functions #776

Merged
merged 5 commits into from
Oct 24, 2023
Merged

fix(BLE,Build): Fix default PAL_NVM_SIZE, add compiler checks for NVM erase functions #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9561b56
Fix PalFlashEraseSector underflowing size
EdwinFairchild Oct 23, 2023
1d2b921
Adds compiler checks to PalFlashEraseSector
EdwinFairchild Oct 23, 2023
07a7b12
Makes default PAL_NVM_SIZE a multiple of MXC_FLASH_PAGE_SIZE
EdwinFairchild Oct 23, 2023
4d191e5
Add compiler checks for PalFlashEraseChip
EdwinFairchild Oct 23, 2023
a5396ed
Fix indent
EdwinFairchild Oct 23, 2023
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
2 changes: 1 addition & 1 deletion Libraries/Cordio/platform/targets/maxim/build/cordio.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ PLATFORM := maxim
RTOS ?= baremetal

# Used for storing pairing/bonding information
PAL_NVM_SIZE ?= 0x2000
PAL_NVM_SIZE ?= 0x4000

CFG_DEV := BT_VER=$(BT_VER)
CFG_DEV += SCH_CHECK_LIST_INTEGRITY=1
Expand Down
26 changes: 22 additions & 4 deletions Libraries/Cordio/platform/targets/maxim/max32655/sources/pal_flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ void PalFlashWrite(void *pBuf, uint32_t size, uint32_t dstAddr)
/*!
* \brief Erase sector.
*
* \param[in] size Data size in bytes to be erased.
* \param[in] size Data size in sectors to be erased.
* \param[in] startAddr Word aligned address.
*
* \return None.
Expand All @@ -195,18 +195,25 @@ void PalFlashWrite(void *pBuf, uint32_t size, uint32_t dstAddr)
void PalFlashEraseSector(uint32_t size, uint32_t startAddr)
{
if(!PAL_NVM_IS_SECTOR_ALIGNED(startAddr)) {
WSF_ASSERT(FALSE);
PalSysAssertTrap();
}

/* Offset the address into flash */
#if defined (__GNUC__)
startAddr += (uint32_t)&__pal_nvm_db_start__;
#elif defined (__CC_ARM)
startAddr += (uint32_t)__pal_nvm_db_start__;
#elif defined (__ICCARM__)
startAddr += (uint32_t)__pal_nvm_db_start__;
#endif

while(size) {
WsfCsEnter();
MXC_FLC_PageErase(startAddr);
WsfCsExit();

startAddr += MXC_FLASH_PAGE_SIZE;
size -= MXC_FLASH_PAGE_SIZE;
size --;
}
}

Expand All @@ -221,15 +228,26 @@ void PalFlashEraseChip(void)
{
uint32_t startAddr, size;

#if defined (__GNUC__)
/* Offset the address into flash */
startAddr = (uint32_t)&__pal_nvm_db_start__;
size = (uint32_t)&__pal_nvm_db_end__ - (uint32_t)&__pal_nvm_db_start__;
#elif defined (__CC_ARM)
/* Offset the address into flash */
startAddr = (uint32_t)__pal_nvm_db_start__;
size = (uint32_t)__pal_nvm_db_end__ - (uint32_t)__pal_nvm_db_start__;
#elif defined (__ICCARM__)
/* Offset the address into flash */
startAddr = (uint32_t)__pal_nvm_db_start__;
size = (uint32_t)__pal_nvm_db_end__ - (uint32_t)__pal_nvm_db_start__ -1;
#endif

while(size) {
WsfCsEnter();
MXC_FLC_PageErase(startAddr);
WsfCsExit();

startAddr += MXC_FLASH_PAGE_SIZE;
size -= MXC_FLASH_PAGE_SIZE;
}
}
}
22 changes: 22 additions & 0 deletions Libraries/Cordio/platform/targets/maxim/max32665/sources/pal_flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,10 +197,19 @@ void PalFlashEraseSector(uint32_t size, uint32_t startAddr)
}

/* Offset the address into flash */
#if defined (__GNUC__)
startAddr += (uint32_t)&__pal_nvm_db_start__;
#elif defined (__CC_ARM)
startAddr += (uint32_t)__pal_nvm_db_start__;
#elif defined (__ICCARM__)
startAddr += (uint32_t)__pal_nvm_db_start__;
#endif

while(size) {
WsfCsEnter();
MXC_FLC_PageErase(startAddr);
WsfCsExit();

startAddr += MXC_FLASH_PAGE_SIZE;
size --;
}
Expand All @@ -217,12 +226,25 @@ void PalFlashEraseChip(void)
{
uint32_t startAddr, size;

#if defined (__GNUC__)
/* Offset the address into flash */
startAddr = (uint32_t)&__pal_nvm_db_start__;
size = (uint32_t)&__pal_nvm_db_end__ - (uint32_t)&__pal_nvm_db_start__;
#elif defined (__CC_ARM)
/* Offset the address into flash */
startAddr = (uint32_t)__pal_nvm_db_start__;
size = (uint32_t)__pal_nvm_db_end__ - (uint32_t)__pal_nvm_db_start__;
#elif defined (__ICCARM__)
/* Offset the address into flash */
startAddr = (uint32_t)__pal_nvm_db_start__;
size = (uint32_t)__pal_nvm_db_end__ - (uint32_t)__pal_nvm_db_start__ -1;
#endif

while(size) {
WsfCsEnter();
MXC_FLC_PageErase(startAddr);
WsfCsExit();

startAddr += MXC_FLASH_PAGE_SIZE;
size -= MXC_FLASH_PAGE_SIZE;
}
Expand Down
4 changes: 2 additions & 2 deletions Libraries/Cordio/platform/targets/maxim/max32690/sources/pal_flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ void PalFlashWrite(void *pBuf, uint32_t size, uint32_t dstAddr)
/*!
* \brief Erase sector.
*
* \param[in] size Data size in bytes to be erased.
* \param[in] size Data size in sectors to be erased.
* \param[in] startAddr Word aligned address.
*
* \return None.
Expand All @@ -246,7 +246,7 @@ void PalFlashEraseSector(uint32_t size, uint32_t startAddr)
WsfCsExit();

startAddr += MXC_FLASH_PAGE_SIZE;
size -= MXC_FLASH_PAGE_SIZE;
size --;
}
}

Expand Down