RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #17627 from benpicco/mtd_flashpage_t

Browse Source 
drivers/mtd_flashpage: add mtd_flashpage_t type
This commit is contained in:
Francisco 2022-03-25 16:24:04 +01:00 committed by GitHub
commit a10b1572aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/include/mtd_flashpage.h
View File

@ -38,10 +38,12 @@ extern "C"
* @brief Macro helper to initialize a mtd_t with flash-age driver
*/
#define MTD_FLASHPAGE_INIT_VAL(_pages_per_sector) { \
.driver = &mtd_flashpage_driver, \
.sector_count = FLASHPAGE_NUMOF, \
.pages_per_sector = _pages_per_sector,\
.page_size = FLASHPAGE_SIZE / _pages_per_sector,\
.base = { \
.driver = &mtd_flashpage_driver, \
.sector_count = FLASHPAGE_NUMOF, \
.pages_per_sector = _pages_per_sector, \
.page_size = FLASHPAGE_SIZE / _pages_per_sector, \
}, \
}
/**
@ -49,6 +51,13 @@ extern "C"
*/
extern const mtd_desc_t mtd_flashpage_driver;
/**
* @brief MTD flashpage descriptor
*/
typedef struct {
mtd_dev_t base; /**< MTD generic device */
} mtd_flashpage_t;
#ifdef __cplusplus
}
#endif

13
sys/fido2/ctap/ctap_mem.c
View File

@ -28,7 +28,8 @@
/**
* @brief MTD device descriptor initialized with flash-page driver
*/
static mtd_dev_t _mtd_dev = MTD_FLASHPAGE_INIT_VAL(CTAP_FLASH_PAGES_PER_SECTOR);
static mtd_flashpage_t _mtd_flash_dev = MTD_FLASHPAGE_INIT_VAL(CTAP_FLASH_PAGES_PER_SECTOR);
static mtd_dev_t *_mtd_dev = &_mtd_flash_dev.base;
/**
* @brief Max amount of resident keys that can be stored
@ -49,7 +50,7 @@ int fido2_ctap_mem_init(void)
{
int ret;
ret = mtd_init(&_mtd_dev);
ret = mtd_init(_mtd_dev);
if (ret < 0) {
return ret;
@ -64,7 +65,7 @@ int fido2_ctap_mem_init(void)
static unsigned _amount_of_flashpages(void)
{
return _mtd_dev.sector_count * _mtd_dev.pages_per_sector;
return _mtd_dev->sector_count * _mtd_dev->pages_per_sector;
}
int fido2_ctap_mem_read(void *buf, uint32_t page, uint32_t offset, uint32_t len)
@ -73,7 +74,7 @@ int fido2_ctap_mem_read(void *buf, uint32_t page, uint32_t offset, uint32_t len)
int ret;
ret = mtd_read_page(&_mtd_dev, buf, page, offset, len);
ret = mtd_read_page(_mtd_dev, buf, page, offset, len);
if (ret < 0) {
return CTAP1_ERR_OTHER;
@ -89,14 +90,14 @@ int fido2_ctap_mem_write(const void *buf, uint32_t page, uint32_t offset, uint32
int ret;
if (!_flash_is_erased(page, offset, len)) {
ret = mtd_write_page(&_mtd_dev, buf, page, offset, len);
ret = mtd_write_page(_mtd_dev, buf, page, offset, len);
if (ret < 0) {
return CTAP1_ERR_OTHER;
}
}
else {
ret = mtd_write_page_raw(&_mtd_dev, buf, page, offset, len);
ret = mtd_write_page_raw(_mtd_dev, buf, page, offset, len);
if (ret < 0) {
return CTAP1_ERR_OTHER;

4
tests/mtd_flashpage/main.c
View File

@ -36,8 +36,8 @@
#endif
#define TEST_ADDRESS0 (FLASHPAGE_NUMOF - 1)
static mtd_dev_t _dev = MTD_FLASHPAGE_INIT_VAL(8);
static mtd_dev_t *dev = &_dev;
static mtd_flashpage_t _dev = MTD_FLASHPAGE_INIT_VAL(8);
static mtd_dev_t *dev = &_dev.base;
static void setup(void)
{