sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "mtd: Add MTDIOC_FLUSH IOCTL like MTDIOC_XIPBASE"

Browse Source 
to simplify flt and partion layer implementation

This reverts commit 2e49e1bc5c6a316e407c430596013fa3a5c13f84.
This commit is contained in:
Xiang Xiao 2021-08-11 14:07:58 +08:00 committed by Alan Carvalho de Assis
parent f4addbd640
commit 177e1ced3f
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mtd/ftl.c
View File

@ -535,10 +535,6 @@ static int ftl_ioctl(FAR struct inode *inode, int cmd, unsigned long arg)
#ifdef CONFIG_FTL_WRITEBUFFER #ifdef CONFIG_FTL_WRITEBUFFER
rwb_flush(&dev->rwb); rwb_flush(&dev->rwb);
#endif #endif
/* Change the BIOC_FLUSH command to the MTDIOC_FLUSH command. */
cmd = MTDIOC_FLUSH;
} }
/* No other block driver ioctl commands are not recognized by this /* No other block driver ioctl commands are not recognized by this

2
fs/littlefs/lfs_vfs.c
View File

@ -928,7 +928,7 @@ static int littlefs_sync_block(FAR const struct lfs_config *c)
if (INODE_IS_MTD(drv)) if (INODE_IS_MTD(drv))
{ {
ret = MTD_IOCTL(drv->u.i_mtd, MTDIOC_FLUSH, 0); ret = MTD_IOCTL(drv->u.i_mtd, BIOC_FLUSH, 0);
} }
else else
{ {

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

@ -41,9 +41,10 @@
/* Ioctl commands */ /* Ioctl commands */
/* Note, the following ioctl existed in the past and was removed: /* Note, the following ioctl existed in the past and was removed:
* #define MTDIOC_FLUSH _MTDIOC(0x0009)
* #define MTDIOC_PARTINFO _MTDIOC(0x000b) * #define MTDIOC_PARTINFO _MTDIOC(0x000b)
* try to avoid adding a new ioctl with the same ioctl number and * try to avoid adding a new ioctl with the same ioctl number and
* replace with BIOC_PARTINFO instead. * replace with BIOC_FLUSH and BIOC_PARTINFO instead.
*/ */
#define MTDIOC_GEOMETRY _MTDIOC(0x0001) /* IN: Pointer to write-able struct #define MTDIOC_GEOMETRY _MTDIOC(0x0001) /* IN: Pointer to write-able struct
@ -74,9 +75,6 @@
* OUT: None */ * OUT: None */
#define MTDIOC_ECCSTATUS _MTDIOC(0x0008) /* IN: Pointer to uint8_t #define MTDIOC_ECCSTATUS _MTDIOC(0x0008) /* IN: Pointer to uint8_t
* OUT: ECC status */ * OUT: ECC status */
#define MTDIOC_FLUSH _MTDIOC(0x0009) /* IN: None
* OUT: None (ioctl return value provides
* success/failure indication). */
#define MTDIOC_ERASESTATE _MTDIOC(0x000a) /* IN: Pointer to uint8_t #define MTDIOC_ERASESTATE _MTDIOC(0x000a) /* IN: Pointer to uint8_t
* OUT: Byte value that represents the * OUT: Byte value that represents the
* erased state of the MTD cell */ * erased state of the MTD cell */