Merge pull request #17627 from benpicco/mtd_flashpage_t

drivers/mtd_flashpage: add mtd_flashpage_t type
RIOT-OS · Mar 25, 2022 · a10b157 · a10b157
2 parents 844279f + fe4efca
commit a10b157
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/drivers/include/mtd_flashpage.h b/drivers/include/mtd_flashpage.h
@@ -38,17 +38,26 @@ 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, \
+    },                                              \
 }
 
 /**
  * @brief   Flashpage MTD device operations table
  */
 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

diff --git 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;

diff --git 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)
 {