You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/09/15 02:21:53 UTC
(nuttx) 02/03: Revert "driver/ftl: Read the current eraseblock only"
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit a6080e4502c74ed55c30cecced0f06a76c66e67f
Author: wangjianyu3 <wa...@xiaomi.com>
AuthorDate: Wed Feb 7 15:37:43 2024 +0800
Revert "driver/ftl: Read the current eraseblock only"
Signed-off-by: wangjianyu3 <wa...@xiaomi.com>
---
drivers/mtd/ftl.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index 4fdcb6fba1..5ec0a68462 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -287,7 +287,6 @@ static ssize_t ftl_mtd_bread(FAR struct ftl_struct_s *dev, off_t startblock,
{
off_t startphysicalblock;
off_t starteraseblock;
- size_t erase;
size_t count;
starteraseblock = startblock / dev->blkper;
@@ -297,14 +296,9 @@ static ssize_t ftl_mtd_bread(FAR struct ftl_struct_s *dev, off_t startblock,
break;
}
- erase = ftl_get_cblock(dev, starteraseblock,
+ count = ftl_get_cblock(dev, starteraseblock,
(nblocks + mask) / dev->blkper);
- count = MIN(erase * dev->blkper, nblocks);
- if (erase == 1)
- {
- count -= startblock & mask;
- }
-
+ count = MIN(count * dev->blkper, nblocks);
startphysicalblock = dev->lptable[starteraseblock] *
dev->blkper + (startblock & mask);
ret = MTD_BREAD(dev->mtd, startphysicalblock, count, buffer);