OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "drivrs/mtd/filemtd.c: add block device MTD interface. Block MTD interface allows using block device directly as MTD instead of having to use file-system in between. NOTE that this provides the opposite capability of FTL which will let you use an MTD interface directly as a block device." 

since filemtd can handle not only char device, but also block device.
This reverts commit 5ef548677a.
This commit is contained in:
Xiang Xiao 2023-02-18 07:48:46 +08:00 committed by GUIDINGLI
parent a05ab2ab49
commit c54c9395a5
2 changed files with 30 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
drivers/mtd/filemtd.c
View File

@ -700,26 +700,44 @@ static int mtd_loop_ioctl(FAR struct file *filep, int cmd,
****************************************************************************/
/****************************************************************************
* Name: blockmtd_initialize
* Name: filemtd_initialize
*
* Description:
* Create and initialize a BLOCK MTD device instance.
* Create and initialize a FILE MTD device instance.
*
* Input Parameters:
* path - Path name of the block device backing the MTD device
* path - Path name of the file backing the MTD device
*
****************************************************************************/
FAR struct mtd_dev_s *blockmtd_initialize(FAR const char *path,
size_t offset, size_t mtdlen,
int16_t sectsize,
int32_t erasesize)
FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, size_t offset,
int16_t sectsize, int32_t erasesize)
{
FAR struct file_dev_s *priv;
struct stat sb;
size_t nblocks;
size_t filelen;
int mode;
int ret;
/* Stat the file */
ret = nx_stat(path, &sb, 1);
if (ret < 0)
{
ferr("ERROR: Failed to stat %s: %d\n", path, ret);
return NULL;
}
filelen = sb.st_size;
if (offset > filelen)
{
ferr("ERROR: Offset beyond end of file\n");
return NULL;
}
filelen = filelen - offset;
/* Create an instance of the FILE MTD device state structure */
priv = (FAR struct file_dev_s *)kmm_zalloc(sizeof(struct file_dev_s));
@ -778,7 +796,7 @@ FAR struct mtd_dev_s *blockmtd_initialize(FAR const char *path,
/* Force the size to be an even number of the erase block size */
nblocks = mtdlen / priv->erasesize;
nblocks = filelen / priv->erasesize;
if (nblocks < 3)
{
ferr("ERROR: Need to provide at least three full erase block\n");
@ -807,17 +825,17 @@ FAR struct mtd_dev_s *blockmtd_initialize(FAR const char *path,
}
/****************************************************************************
* Name: blockmtd_teardown
* Name: filemtd_teardown
*
* Description:
* Teardown a previously created blockmtd device.
* Teardown a previously created filemtd device.
*
* Input Parameters:
* dev - Pointer to the mtd driver instance.
*
****************************************************************************/
void blockmtd_teardown(FAR struct mtd_dev_s *dev)
void filemtd_teardown(FAR struct mtd_dev_s *dev)
{
FAR struct file_dev_s *priv = (FAR struct file_dev_s *)dev;
@ -836,66 +854,11 @@ void blockmtd_teardown(FAR struct mtd_dev_s *dev)
kmm_free(priv);
}
/****************************************************************************
* Name: filemtd_initialize
*
* Description:
* Create and initialize a FILE MTD device instance.
*
* Input Parameters:
* path - Path name of the file backing the MTD device
*
****************************************************************************/
FAR struct mtd_dev_s *filemtd_initialize(FAR const char *path, size_t offset,
int16_t sectsize, int32_t erasesize)
{
size_t filelen;
struct stat sb;
int ret;
/* Stat the file */
ret = nx_stat(path, &sb, 1);
if (ret < 0)
{
ferr("ERROR: Failed to stat %s: %d\n", path, ret);
return NULL;
}
filelen = sb.st_size;
if (offset > filelen)
{
ferr("ERROR: Offset beyond end of file\n");
return NULL;
}
return blockmtd_initialize(path, offset, filelen - offset, sectsize,
erasesize);
}
/****************************************************************************
* Name: filemtd_teardown
*
* Description:
* Teardown a previously created filemtd device.
*
* Input Parameters:
* dev - Pointer to the mtd driver instance.
*
****************************************************************************/
void filemtd_teardown(FAR struct mtd_dev_s *dev)
{
blockmtd_teardown(dev);
}
/****************************************************************************
* Name: filemtd_isfilemtd
*
* Description:
* Tests if the provided mtd is a filemtd or blockmtd device.
* Tests if the provided mtd is a filemtd device.
*
* Input Parameters:
* mtd - Pointer to the mtd.

29
include/nuttx/mtd/mtd.h
View File

@ -605,35 +605,6 @@ FAR struct mtd_dev_s *n25qxxx_initialize(FAR struct qspi_dev_s *qspi,
FAR struct mtd_dev_s *w25qxxxjv_initialize(FAR struct qspi_dev_s *qspi,
bool unprotect);
/****************************************************************************
* Name: blockmtd_initialize
*
* Description:
* Create and initialize a BLOCK MTD device instance.
*
* Input Parameters:
* path - Path name of the block device backing the MTD device
*
****************************************************************************/
FAR struct mtd_dev_s *blockmtd_initialize(FAR const char *path,
size_t offset, size_t mtdlen,
int16_t sectsize,
int32_t erasesize);
/****************************************************************************
* Name: blockmtd_teardown
*
* Description:
* Teardown a previously created blockmtd device.
*
* Input Parameters:
* dev - Pointer to the mtd driver instance.
*
****************************************************************************/
void blockmtd_teardown(FAR struct mtd_dev_s *dev);
/****************************************************************************
* Name: filemtd_initialize
*