nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 08:38:38 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs/mount and fs/romfs: Add support to mount a ROMFS volume using an MTD driver interface using the standard mount() operation.

Browse source
This commit is contained in:
Xiang Xiao 2019-01-27 12:07:37 -06:00 committed by Gregory Nutt
parent d53a5381f0
commit 5708a1ac73
3 changed files with 90 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/mount/fs_mount.c
View file

@ -136,22 +136,28 @@ static const struct fsmap_t g_bdfsmap[] =
#ifdef MDFS_SUPPORT
/* File systems that require MTD drivers */
#ifdef CONFIG_FS_ROMFS
extern const struct mountpt_operations romfs_operations;
#endif
#ifdef CONFIG_FS_SPIFFS
extern const struct mountpt_operations spiffs_operations;
#endif
#ifdef CONFIG_FS_LITTLEFS
extern const struct mountpt_operations littlefs_operations;
#endif
static const struct fsmap_t g_mdfsmap[] =
{
#ifdef CONFIG_FS_ROMFS
{ "romfs", &romfs_operations },
#endif
#ifdef CONFIG_FS_SPIFFS
{ "spiffs", &spiffs_operations },
#endif
#ifdef CONFIG_FS_LITTLEFS
{ "littlefs", &littlefs_operations },
#endif
{ NULL, NULL },
};
#endif /* MDFS_SUPPORT */

8
fs/romfs/fs_romfs.c
View file

@ -61,6 +61,7 @@
#include <nuttx/fs/fs.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/fs/dirent.h>
#include <nuttx/mtd/mtd.h>
#include "fs_romfs.h"
@ -967,13 +968,14 @@ static int romfs_bind(FAR struct inode *blkdriver, FAR const void *data,
/* Open the block driver */
if (!blkdriver || !blkdriver->u.i_bops)
if (blkdriver == NULL)
{
ferr("ERROR: No block driver/ops\n");
return -ENODEV;
}
if (blkdriver->u.i_bops->open &&
if (INODE_IS_BLOCK(blkdriver) &&
blkdriver->u.i_bops->open != NULL &&
blkdriver->u.i_bops->open(blkdriver) != OK)
{
ferr("ERROR: No open method\n");
@ -1082,7 +1084,7 @@ static int romfs_unbind(FAR void *handle, FAR struct inode **blkdriver,
struct inode *inode = rm->rm_blkdriver;
if (inode)
{
if (inode->u.i_bops && inode->u.i_bops->close)
if (INODE_IS_BLOCK(inode) && inode->u.i_bops->close != NULL)
{
(void)inode->u.i_bops->close(inode);
}

114
fs/romfs/fs_romfsutil.c
View file

@ -54,6 +54,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/fs/ioctl.h>
#include <nuttx/fs/dirent.h>
#include <nuttx/mtd/mtd.h>
#include "fs_romfs.h"
@ -367,7 +368,7 @@ void romfs_semgive(struct romfs_mountpt_s *rm)
int romfs_hwread(struct romfs_mountpt_s *rm, uint8_t *buffer, uint32_t sector,
unsigned int nsectors)
{
int ret = -ENODEV;
int ret = OK;
/* Check the access mode */
@ -378,29 +379,33 @@ int romfs_hwread(struct romfs_mountpt_s *rm, uint8_t *buffer, uint32_t sector,
memcpy(buffer,
rm->rm_xipbase + sector*rm->rm_hwsectorsize,
nsectors*rm->rm_hwsectorsize);
ret = OK;
}
else
{
/* In non-XIP mode, we have to read the data from the device */
struct inode *inode = rm->rm_blkdriver;
ssize_t nsectorsread;
ssize_t nsectorsread = -ENODEV;
DEBUGASSERT(inode);
if (inode->u.i_bops && inode->u.i_bops->read)
if (INODE_IS_MTD(inode))
{
nsectorsread =
MTD_BREAD(inode->u.i_mtd, sector, nsectors, buffer);
}
else if (inode->u.i_bops->read)
{
nsectorsread =
inode->u.i_bops->read(inode, buffer, sector, nsectors);
}
if (nsectorsread == (ssize_t)nsectors)
{
ret = OK;
}
else if (nsectorsread < 0)
{
ret = nsectorsread;
}
if (nsectorsread == (ssize_t)nsectors)
{
ret = OK;
}
else if (nsectorsread < 0)
{
ret = nsectorsread;
}
}
@ -477,52 +482,83 @@ int romfs_filecacheread(struct romfs_mountpt_s *rm, struct romfs_file_s *rf,
int romfs_hwconfigure(struct romfs_mountpt_s *rm)
{
struct inode *inode = rm->rm_blkdriver;
struct geometry geo;
int ret;
/* Get the underlying device geometry */
#ifdef CONFIG_DEBUG_FEATURES
if (!inode || !inode->u.i_bops || !inode->u.i_bops->geometry)
if (inode == NULL)
{
return -ENODEV;
}
#endif
ret = inode->u.i_bops->geometry(inode, &geo);
if (ret != OK)
if (INODE_IS_MTD(inode))
{
return ret;
}
struct mtd_geometry_s mgeo;
if (!geo.geo_available)
ret = MTD_IOCTL(inode->u.i_mtd, MTDIOC_GEOMETRY,
(unsigned long)&mgeo);
if (ret != OK)
{
return ret;
}
/* Save that information in the mount structure */
rm->rm_hwsectorsize = mgeo.blocksize;
rm->rm_hwnsectors = mgeo.neraseblocks *
(mgeo.erasesize / mgeo.blocksize);
}
else
{
return -EBUSY;
struct geometry geo;
ret = inode->u.i_bops->geometry(inode, &geo);
if (ret != OK)
{
return ret;
}
if (!geo.geo_available)
{
return -EBUSY;
}
/* Save that information in the mount structure */
rm->rm_hwsectorsize = geo.geo_sectorsize;
rm->rm_hwnsectors = geo.geo_nsectors;
}
/* Save that information in the mount structure */
rm->rm_hwsectorsize = geo.geo_sectorsize;
rm->rm_hwnsectors = geo.geo_nsectors;
/* Determine if block driver supports the XIP mode of operation */
rm->rm_cachesector = (uint32_t)-1;
if (inode->u.i_bops->ioctl)
if (INODE_IS_MTD(inode))
{
ret = MTD_IOCTL(inode->u.i_mtd, MTDIOC_XIPBASE,
(unsigned long)&rm->rm_xipbase);
}
else if (inode->u.i_bops->ioctl != NULL)
{
ret = inode->u.i_bops->ioctl(inode, BIOC_XIPBASE,
(unsigned long)&rm->rm_xipbase);
if (ret == OK && rm->rm_xipbase)
{
/* Yes.. Then we will directly access the media (vs.
* copying into an allocated sector buffer.
*/
}
else
{
ret = -ENOTSUP;
}
rm->rm_buffer = rm->rm_xipbase;
rm->rm_cachesector = 0;
return OK;
}
if (ret == OK && rm->rm_xipbase)
{
/* Yes.. Then we will directly access the media (vs.
* copying into an allocated sector buffer.
*/
rm->rm_buffer = rm->rm_xipbase;
rm->rm_cachesector = 0;
return OK;
}
/* Allocate the device cache buffer for normal sector accesses */
@ -652,7 +688,13 @@ int romfs_checkmount(struct romfs_mountpt_s *rm)
*/
inode = rm->rm_blkdriver;
if (inode->u.i_bops && inode->u.i_bops->geometry)
if (INODE_IS_MTD(inode))
{
/* It is impossible to remove MTD device */
return OK;
}
else if (inode->u.i_bops->geometry)
{
ret = inode->u.i_bops->geometry(inode, &geo);
if (ret == OK && geo.geo_available && !geo.geo_mediachanged)