riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpu/efm32: add flashpage_raw

Browse Source
This commit is contained in:
fjmolinas 2019-08-04 12:32:54 +02:00 committed by Francisco Molina
parent abf4d60286
commit e1576c986c
3 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu/efm32/Makefile.features
View File

@ -2,6 +2,7 @@ include $(RIOTCPU)/efm32/efm32-features.mk
FEATURES_PROVIDED += periph_cpuid FEATURES_PROVIDED += periph_cpuid
FEATURES_PROVIDED += periph_flashpage FEATURES_PROVIDED += periph_flashpage
FEATURES_PROVIDED += periph_flashpage_raw
FEATURES_CONFLICT += periph_rtc:periph_rtt FEATURES_CONFLICT += periph_rtc:periph_rtt
FEATURES_CONFLICT_MSG += "On the EFM32, the RTC and RTT map to the same hardware peripheral." FEATURES_CONFLICT_MSG += "On the EFM32, the RTC and RTT map to the same hardware peripheral."

6
cpu/efm32/include/cpu_conf.h
View File

@ -45,6 +45,12 @@ extern "C" {
*/ */
#define FLASHPAGE_SIZE (FLASH_PAGE_SIZE) #define FLASHPAGE_SIZE (FLASH_PAGE_SIZE)
#define FLASHPAGE_NUMOF (FLASH_SIZE / FLASH_PAGE_SIZE) #define FLASHPAGE_NUMOF (FLASH_SIZE / FLASH_PAGE_SIZE)
/* The minimum block size which can be written is 4B. However, the erase
* block is always FLASHPAGE_SIZE.
*/
#define FLASHPAGE_RAW_BLOCKSIZE (4U)
/* Writing should be always 4 bytes aligned */
#define FLASHPAGE_RAW_ALIGNMENT (4U)
/** @} */ /** @} */
#ifdef __cplusplus #ifdef __cplusplus

34
cpu/efm32/periph/flashpage.c
View File

@ -26,19 +26,41 @@
#include "em_msc.h" #include "em_msc.h"
void flashpage_write_raw(void *target_addr, const void *data, size_t len)
{
/* assert multiples of FLASHPAGE_RAW_BLOCKSIZE are written and no less of
that length. */
assert(!(len % FLASHPAGE_RAW_BLOCKSIZE));
/* ensure writes are aligned */
assert(!(((unsigned)target_addr % FLASHPAGE_RAW_ALIGNMENT) ||
((unsigned)data % FLASHPAGE_RAW_ALIGNMENT)));
/* ensure the length doesn't exceed the actual flash size */
assert(((unsigned)target_addr + len) <
(CPU_FLASH_BASE + (FLASHPAGE_SIZE * FLASHPAGE_NUMOF)) + 1);
uint32_t *page_addr = target_addr;
const uint32_t *data_addr = data;
MSC_Init();
MSC_WriteWord(page_addr, data_addr, len);
MSC_Deinit();
}
void flashpage_write(int page, const void *data) void flashpage_write(int page, const void *data)
{ {
assert(page < (int)FLASHPAGE_NUMOF); assert(page < (int)FLASHPAGE_NUMOF);
uint32_t *page_addr = (uint32_t *)flashpage_addr(page); uint32_t *page_addr = (uint32_t *)flashpage_addr(page);
const uint32_t *data_addr = data;
/* erase given page */
MSC_Init(); MSC_Init();
MSC_ErasePage(page_addr); MSC_ErasePage(page_addr);
if (data != NULL) {
MSC_WriteWord(page_addr, data_addr, FLASHPAGE_SIZE);
}
MSC_Deinit(); MSC_Deinit();
/* write data to page */
if (data != NULL) {
flashpage_write_raw(page_addr, data, FLASHPAGE_SIZE);
}
} }