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

drivers/mtd/ftl.c: Make READAHEAD and WRITEBUFFER work independently of each other. There have cases we use writebuffer but not readbuffer, so the write buffer must be flushed before read. Let rwb driver do it.

This commit is contained in:
zhuyanlin 2018-11-09 08:18:46 -06:00 committed by Gregory Nutt
parent 65177b3344
commit e9000df50c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mtd/ftl.c
View File

@ -206,7 +206,7 @@ static ssize_t ftl_read(FAR struct inode *inode, unsigned char *buffer,
DEBUGASSERT(inode && inode->i_private); DEBUGASSERT(inode && inode->i_private);
dev = (FAR struct ftl_struct_s *)inode->i_private; dev = (FAR struct ftl_struct_s *)inode->i_private;
#ifdef CONFIG_FTL_READAHEAD #ifdef FTL_HAVE_RWBUFFER
return rwb_read(&dev->rwb, start_sector, nsectors, buffer); return rwb_read(&dev->rwb, start_sector, nsectors, buffer);
#else #else
return ftl_reload(dev, buffer, start_sector, nsectors); return ftl_reload(dev, buffer, start_sector, nsectors);
@ -407,7 +407,7 @@ static ssize_t ftl_write(FAR struct inode *inode, const unsigned char *buffer,
DEBUGASSERT(inode && inode->i_private); DEBUGASSERT(inode && inode->i_private);
dev = (struct ftl_struct_s *)inode->i_private; dev = (struct ftl_struct_s *)inode->i_private;
#ifdef CONFIG_FTL_WRITEBUFFER #ifdef FTL_HAVE_RWBUFFER
return rwb_write(&dev->rwb, start_sector, nsectors, buffer); return rwb_write(&dev->rwb, start_sector, nsectors, buffer);
#else #else
return ftl_flush(dev, buffer, start_sector, nsectors); return ftl_flush(dev, buffer, start_sector, nsectors);
@ -588,15 +588,15 @@ int ftl_initialize_by_path(FAR const char *path, FAR struct mtd_dev_s *mtd)
dev->rwb.blocksize = dev->geo.blocksize; dev->rwb.blocksize = dev->geo.blocksize;
dev->rwb.nblocks = dev->geo.neraseblocks * dev->blkper; dev->rwb.nblocks = dev->geo.neraseblocks * dev->blkper;
dev->rwb.dev = (FAR void *)dev; dev->rwb.dev = (FAR void *)dev;
dev->rwb.wrflush = ftl_flush;
dev->rwb.rhreload = ftl_reload;
#if defined(CONFIG_FS_WRITABLE) && defined(CONFIG_FTL_WRITEBUFFER) #if defined(CONFIG_FS_WRITABLE) && defined(CONFIG_FTL_WRITEBUFFER)
dev->rwb.wrmaxblocks = dev->blkper; dev->rwb.wrmaxblocks = dev->blkper;
dev->rwb.wrflush = ftl_flush;
#endif #endif
#ifdef CONFIG_FTL_READAHEAD #ifdef CONFIG_FTL_READAHEAD
dev->rwb.rhmaxblocks = dev->blkper; dev->rwb.rhmaxblocks = dev->blkper;
dev->rwb.rhreload = ftl_reload;
#endif #endif
ret = rwb_initialize(&dev->rwb); ret = rwb_initialize(&dev->rwb);