kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-26 23:11:19 +01:00
Code Releases Activity

cpu/sam0_common: flashpage: clean up helper function

Browse Source
This commit is contained in:
Benjamin Valentin 2020-07-12 17:12:33 +02:00
parent 651b506fd4
commit 48340f971f
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cpu/sam0_common/periph/flashpage.c
View File

@ -44,10 +44,9 @@
#define _NVMCTRL NVMCTRL
#endif
static inline void wait_nvm_is_ready(void) __attribute__((always_inline));
static inline void wait_nvm_is_ready(void)
{
#if defined(CPU_SAML1X) || defined(CPU_SAMD5X)
#ifdef NVMCTRL_STATUS_READY
while (!_NVMCTRL->STATUS.bit.READY) {}
#else
while (!_NVMCTRL->INTFLAG.bit.READY) {}
@ -60,9 +59,7 @@ static void _unlock(void)
#ifdef REG_PAC_WRCTRL
PAC->WRCTRL.reg = (PAC_WRCTRL_KEY_CLR | ID_NVMCTRL);
#else
if (PAC1->WPSET.reg & NVMCTRL_PAC_BIT) {
PAC1->WPCLR.reg = NVMCTRL_PAC_BIT;
}
PAC1->WPCLR.reg = NVMCTRL_PAC_BIT;
#endif
}
@ -72,9 +69,7 @@ static void _lock(void)
#ifdef REG_PAC_WRCTRL
PAC->WRCTRL.reg = (PAC_WRCTRL_KEY_SET | ID_NVMCTRL);
#else
if (PAC1->WPCLR.reg & NVMCTRL_PAC_BIT) {
PAC1->WPSET.reg = NVMCTRL_PAC_BIT;
}
PAC1->WPSET.reg = NVMCTRL_PAC_BIT;
#endif
}