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

flashpage: Support non uniform flashpage sizes

Browse Source
This commit is contained in:
Koen Zandberg 2020-11-10 15:06:24 +01:00
parent 42ff2ab778
commit c93c3e46d6
No known key found for this signature in database
GPG Key ID: 0895A893E6D2985B
2 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/include/periph/flashpage.h
View File

@ -84,6 +84,27 @@ extern "C" {
#ifdef DOXYGEN #ifdef DOXYGEN
#define FLASHPAGE_WRITE_BLOCK_ALIGNMENT #define FLASHPAGE_WRITE_BLOCK_ALIGNMENT
#endif #endif
/**
* @def PERIPH_FLASHPAGE_CUSTOM_PAGESIZES
*
* @brief Defined to signal that the peripheral has non-uniform flash page
* sizes. These devices do not define FLASHPAGE_SIZE and do not
* implement the pagewise api.
*/
#ifdef DOXYGEN
#define PERIPH_FLASHPAGE_CUSTOM_PAGESIZES
#endif
/**
* @brief Return values used in this interface
*/
enum {
FLASHPAGE_OK = 0, /**< everything succeeded */
FLASHPAGE_NOMATCH = -1 /**< page differs from target data */
};
#if !defined(PERIPH_FLASHPAGE_CUSTOM_PAGESIZES) || defined(DOXYGEN)
/** /**
* @def FLASHPAGE_SIZE * @def FLASHPAGE_SIZE
* *
@ -97,12 +118,17 @@ extern "C" {
#endif #endif
/** /**
* @brief Return values used in this interface * @brief Get the page size of the given page number
*
* @param[in] page page number to get the size for
*
* @return Page size of the given page
*/ */
enum { static inline size_t flashpage_size(unsigned page)
FLASHPAGE_OK = 0, /**< everything succeeded */ {
FLASHPAGE_NOMATCH = -1 /**< page differs from target data */ (void)page;
}; return FLASHPAGE_SIZE;
}
/** /**
* @brief Translate the given page number into the page's starting address * @brief Translate the given page number into the page's starting address
@ -135,6 +161,15 @@ static inline unsigned flashpage_page(void *addr)
return (((intptr_t)addr - CPU_FLASH_BASE) / FLASHPAGE_SIZE); return (((intptr_t)addr - CPU_FLASH_BASE) / FLASHPAGE_SIZE);
} }
#else
/* Bare prototypes for the above functions. See above for the documentation */
size_t flashpage_size(unsigned page);
void *flashpage_addr(unsigned page);
unsigned flashpage_page(void *addr);
#endif
/** /**
* @brief Erase the given page * @brief Erase the given page
* *

4
drivers/periph_common/flashpage.c
View File

@ -37,7 +37,7 @@ void flashpage_read(unsigned page, void *data)
assert(page < (FLASH->SFR & FLASH_SFR_SFSA)); assert(page < (FLASH->SFR & FLASH_SFR_SFSA));
#endif #endif
memcpy(data, flashpage_addr(page), FLASHPAGE_SIZE); memcpy(data, flashpage_addr(page), flashpage_size(page));
} }
int flashpage_verify(unsigned page, const void *data) int flashpage_verify(unsigned page, const void *data)
@ -48,7 +48,7 @@ int flashpage_verify(unsigned page, const void *data)
assert(page < (int)(FLASH->SFR & FLASH_SFR_SFSA)); assert(page < (int)(FLASH->SFR & FLASH_SFR_SFSA));
#endif #endif
if (memcmp(flashpage_addr(page), data, FLASHPAGE_SIZE) == 0) { if (memcmp(flashpage_addr(page), data, flashpage_size(page)) == 0) {
return FLASHPAGE_OK; return FLASHPAGE_OK;
} }
else { else {