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

Merge pull request #14006 from benpicco/sdcard_fixes

Browse Source 
pkg/fs: initialize MTD device before accessing it's properties
This commit is contained in:
Koen Zandberg 2020-05-12 11:31:39 +02:00 committed by GitHub
commit adb46b9ee7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/littlefs/fs/littlefs_fs.c
View File

@ -124,6 +124,12 @@ static int prepare(littlefs_desc_t *fs)
mutex_init(&fs->lock); mutex_init(&fs->lock);
mutex_lock(&fs->lock); mutex_lock(&fs->lock);
int ret = mtd_init(fs->dev);
if (ret) {
return ret;
}
memset(&fs->fs, 0, sizeof(fs->fs)); memset(&fs->fs, 0, sizeof(fs->fs));
if (!fs->config.block_count) { if (!fs->config.block_count) {
@ -155,7 +161,7 @@ static int prepare(littlefs_desc_t *fs)
fs->config.prog_buffer = fs->prog_buf; fs->config.prog_buffer = fs->prog_buf;
#endif #endif
return mtd_init(fs->dev); return 0;
} }
static int _format(vfs_mount_t *mountp) static int _format(vfs_mount_t *mountp)

8
pkg/littlefs2/fs/littlefs2_fs.c
View File

@ -124,6 +124,12 @@ static int prepare(littlefs_desc_t *fs)
mutex_init(&fs->lock); mutex_init(&fs->lock);
mutex_lock(&fs->lock); mutex_lock(&fs->lock);
int ret = mtd_init(fs->dev);
if (ret) {
return ret;
}
memset(&fs->fs, 0, sizeof(fs->fs)); memset(&fs->fs, 0, sizeof(fs->fs));
if (!fs->config.block_count) { if (!fs->config.block_count) {
@ -161,7 +167,7 @@ static int prepare(littlefs_desc_t *fs)
fs->config.prog_buffer = fs->prog_buf; fs->config.prog_buffer = fs->prog_buf;
#endif #endif
return mtd_init(fs->dev); return 0;
} }
static int _format(vfs_mount_t *mountp) static int _format(vfs_mount_t *mountp)

8
pkg/spiffs/fs/spiffs_fs.c
View File

@ -109,6 +109,12 @@ static int prepare(spiffs_desc_t *fs_desc)
mtd_dev_t *dev = SPIFFS_MTD_DEV; mtd_dev_t *dev = SPIFFS_MTD_DEV;
#endif #endif
int res = mtd_init(dev);
if (res) {
return res;
}
fs_desc->config.hal_read_f = _dev_read; fs_desc->config.hal_read_f = _dev_read;
fs_desc->config.hal_write_f = _dev_write; fs_desc->config.hal_write_f = _dev_write;
fs_desc->config.hal_erase_f = _dev_erase; fs_desc->config.hal_erase_f = _dev_erase;
@ -129,7 +135,7 @@ static int prepare(spiffs_desc_t *fs_desc)
fs_desc->config.phys_erase_block = dev->page_size * dev->pages_per_sector; fs_desc->config.phys_erase_block = dev->page_size * dev->pages_per_sector;
#endif #endif
return mtd_init(dev); return 0;
} }
static int _format(vfs_mount_t *mountp) static int _format(vfs_mount_t *mountp)