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

tests/periph_flashpage: ensure page_mem is correctly aligned

Browse Source
This commit is contained in:
Alexandre Abadie 2018-05-16 09:32:49 +02:00
parent e19f6463c0
commit faa65f34bd
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/periph_flashpage/main.c
View File

@ -27,25 +27,28 @@
#define LINE_LEN (16) #define LINE_LEN (16)
/** /* When writing raw bytes on flash, data must be correctly aligned. */
* @brief Allocate space for 1 flash page in RAM
*/
static uint8_t page_mem[FLASHPAGE_SIZE];
#ifdef MODULE_PERIPH_FLASHPAGE_RAW #ifdef MODULE_PERIPH_FLASHPAGE_RAW
#define ALIGNMENT_ATTR __attribute__ ((aligned (FLASHPAGE_RAW_ALIGNMENT)))
/* /*
* @brief Allocate an aligned buffer for raw writings * @brief Allocate an aligned buffer for raw writings
*/ */
static char raw_buf[64] __attribute__ ((aligned (FLASHPAGE_RAW_ALIGNMENT))); static char raw_buf[64] ALIGNMENT_ATTR;
#else
static uint32_t getaddr(const char *str) #define ALIGNMENT_ATTR
{
uint32_t addr = strtol(str, NULL, 16);
return addr;
}
#endif #endif
/**
* @brief Allocate space for 1 flash page in RAM
*
* @note The flash page in RAM must be correctly aligned, even in RAM, when
* using flashpage_raw. This is because some architecture uses
* 32 bit alignment implicitly and there are cases (stm32l4) that
* requires 64 bit alignment.
*/
static uint8_t page_mem[FLASHPAGE_SIZE] ALIGNMENT_ATTR;
static int getpage(const char *str) static int getpage(const char *str)
{ {
int page = atoi(str); int page = atoi(str);
@ -179,6 +182,13 @@ static int cmd_write(int argc, char **argv)
} }
#ifdef MODULE_PERIPH_FLASHPAGE_RAW #ifdef MODULE_PERIPH_FLASHPAGE_RAW
static uint32_t getaddr(const char *str)
{
uint32_t addr = strtol(str, NULL, 16);
return addr;
}
static int cmd_write_raw(int argc, char **argv) static int cmd_write_raw(int argc, char **argv)
{ {
uint32_t addr; uint32_t addr;