squash rename mtdi -> mtd update spiffs

Author: Vincent Dupont

pkg/spiffs/fs/spiffs_fs.c

@@ -22,29 +22,29 @@ static int spiffs_err_to_errno(s32_t err);
 #if SPIFFS_HAL_CALLBACK_EXTRA
 static int32_t _dev_read(struct spiffs_t *fs, u32_t addr, u32_t size, u8_t *dst)
 {
-    mtdi_dev_t *dev = (mtdi_dev_t *)fs->user_data;
+    mtd_dev_t *dev = (mtd_dev_t *)fs->user_data;
 
     //DEBUG("spiffs: read: from addr 0x%x size 0x%x\n", addr, size);
 
-    return dev->driver->mtdi_read(dev, dst, addr, size);
+    return dev->driver->read(dev, dst, addr, size);
 }
 
 static int32_t _dev_write(struct spiffs_t *fs, u32_t addr, u32_t size, u8_t *src)
 {
-    mtdi_dev_t *dev = (mtdi_dev_t *)fs->user_data;
+    mtd_dev_t *dev = (mtd_dev_t *)fs->user_data;
 
     DEBUG("spiffs: write: from addr 0x%x size 0x%x\n", addr, size);
 
-    return dev->driver->mtdi_write(dev, src, addr, size);
+    return dev->driver->write(dev, src, addr, size);
 }
 
 static int32_t _dev_erase(struct spiffs_t *fs, u32_t addr, u32_t size)
 {
-    mtdi_dev_t *dev = (mtdi_dev_t *)fs->user_data;
+    mtd_dev_t *dev = (mtd_dev_t *)fs->user_data;
 
     DEBUG("spiffs: erase: from addr 0x%x size 0x%x\n", addr, size);
 
-    return dev->driver->mtdi_erase(dev, addr, size);
+    return dev->driver->erase(dev, addr, size);
 }
 #else
 #error "SPIFFS needs SPIFFS_HAL_CALLBACK_EXTRA"
@@ -68,30 +68,22 @@ void spiffs_unlock(struct spiffs_t *fs)
 static int _mount(vfs_mount_t *mountp)
 {
     spiffs_desc_t *fs_desc = mountp->private_data;
-    mtdi_dev_t *dev = fs_desc->dev;
+    mtd_dev_t *dev = fs_desc->dev;
     fs_desc->fs.user_data = dev;
 
     DEBUG("spiffs: mount: private_data = 0x%p\n", mountp->private_data);
 
-    unsigned long sect_size;
-    unsigned long sect_count;
-    unsigned long page_size;
-    dev->driver->mtdi_ioctl(dev, MTDI_GET_SECTOR_SIZE, &sect_size);
-    dev->driver->mtdi_ioctl(dev, MTDI_GET_SECTOR_COUNT, &sect_count);
-    dev->driver->mtdi_ioctl(dev, MTDI_GET_PAGE_SIZE, &page_size);
-
-
     fs_desc->config.hal_read_f = _dev_read;
     fs_desc->config.hal_write_f = _dev_write;
     fs_desc->config.hal_erase_f = _dev_erase;
-    fs_desc->config.phys_size = sect_size * sect_count;
-    fs_desc->config.log_block_size = sect_size;
-    fs_desc->config.log_page_size = page_size;
+    fs_desc->config.phys_size = dev->page_size * dev->pages_per_sector * dev->sector_count;
+    fs_desc->config.log_block_size = dev->page_size * dev->pages_per_sector;
+    fs_desc->config.log_page_size = dev->page_size;
     fs_desc->config.phys_addr = 0;
-    fs_desc->config.phys_erase_block = sect_size;
+    fs_desc->config.phys_erase_block = dev->page_size * dev->pages_per_sector;
 
-    if (dev->driver->mtdi_init) {
-        dev->driver->mtdi_init(dev);
+    if (dev->driver->init) {
+        dev->driver->init(dev);
     }
 
     s32_t ret = SPIFFS_mount(&fs_desc->fs,

sys/include/fs/spiffs_fs.h

@@ -16,7 +16,7 @@ extern "C" {
 #include "spiffs.h"
 #include "spiffs_config.h"
 #include "vfs.h"
-#include "mtdi.h"
+#include "mtd.h"
 #include "mutex.h"
 
 #ifndef SPIFFS_FS_CACHE_SIZE
@@ -46,7 +46,7 @@ typedef struct spiffs_desc {
     spiffs_config config;                       /**< SPIFFS config, filled at mount time depending
                                                  *  on the underlying mtdi_dev_t @p dev */
     mutex_t lock;                               /**< A lock for SPIFFS internal use */
-    mtdi_dev_t *dev;                            /**< The underlying mtdi device, must be set by user */
+    mtd_dev_t *dev;                            /**< The underlying mtdi device, must be set by user */
 } spiffs_desc_t;
 
 /** The SPIFFS vfs driver, a pointer to a spiffs_desc_t must be provided as vfs_mountp::private_data */

tests/unittests/tests-spiffs/tests-spiffs.c

@@ -13,18 +13,16 @@
  */
 #include "fs/spiffs_fs.h"
 #include "vfs.h"
-#include "mtdi.h"
-#include "native_mtdi.h"
+#include "mtd.h"
+#include "mtd_native.h"
 
 #include <fcntl.h>
 
 #include "embUnit/embUnit.h"
 
 #include "tests-spiffs.h"
 
-static mtdi_dev_t _dev = {
-    .driver = &native_flash_driver,
-};
+MTD_NATIVE_DESC(_dev);
 
 static struct spiffs_desc spiffs_desc = {
     .lock = MUTEX_INIT,