From 2fe41b1b4071f30aff9a60507d8fb8e6ab041b23 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 8 Feb 2022 17:13:30 +0100 Subject: [PATCH 1/3] drivers/mtd_flashpage: add mtd_flashpage_t type --- drivers/include/mtd_flashpage.h | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/include/mtd_flashpage.h b/drivers/include/mtd_flashpage.h index 0c6d4ac8a49f..905fbe06969f 100644 --- a/drivers/include/mtd_flashpage.h +++ b/drivers/include/mtd_flashpage.h @@ -34,10 +34,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, \ + }, \ } /** @@ -45,6 +47,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 From 574dc8671678e265b85c136041af0d427f06f855 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 8 Feb 2022 17:14:34 +0100 Subject: [PATCH 2/3] sys/fido2: make use of mtd_flashpage_t --- sys/fido2/ctap/ctap_mem.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/sys/fido2/ctap/ctap_mem.c b/sys/fido2/ctap/ctap_mem.c index 1db6c94b24d2..525dc6abcd03 100644 --- a/sys/fido2/ctap/ctap_mem.c +++ b/sys/fido2/ctap/ctap_mem.c @@ -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; From fe4efcacfb9ee9b90b8009a0c51169a0449cad6d Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 8 Feb 2022 17:14:56 +0100 Subject: [PATCH 3/3] tests/mtd_flashpage: make use of mtd_flashpage_t --- tests/mtd_flashpage/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/mtd_flashpage/main.c b/tests/mtd_flashpage/main.c index 74846673acc1..ed95100d406b 100644 --- a/tests/mtd_flashpage/main.c +++ b/tests/mtd_flashpage/main.c @@ -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) {