diff options
| author | Bernard Xiong <[email protected]> | 2013-12-30 18:14:09 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2013-12-30 18:14:09 +0800 |
| commit | ec7fada97ef4c0dde6c9621397a9fcdda3469dd1 (patch) | |
| tree | ddc2448e43c267b9e820604f97c9e64a602c2e3e /components | |
| parent | a93251ae2b61e7a48c2168e08e81dc15f42a92e2 (diff) | |
[Drivers] Fix the block start issue in MTD Nand operators
Diffstat (limited to 'components')
| -rw-r--r-- | components/drivers/mtd/mtd_nand.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/components/drivers/mtd/mtd_nand.c b/components/drivers/mtd/mtd_nand.c index e09be4e1c3..8511dca120 100644 --- a/components/drivers/mtd/mtd_nand.c +++ b/components/drivers/mtd/mtd_nand.c @@ -155,7 +155,8 @@ int mtd_nand_read(const char* name, int block, int page) oob_ptr = page_ptr + nand->page_size; rt_memset(page_ptr, 0xff, nand->page_size + nand->oob_size); - page = (block + nand->block_start) * nand->pages_per_block + page; + /* calculate the page number */ + page = block * nand->pages_per_block + page; result = rt_mtd_nand_read(nand, page, page_ptr, nand->page_size, oob_ptr, nand->oob_size); @@ -187,7 +188,8 @@ int mtd_nand_readoob(const char* name, int block, int page) return -RT_ENOMEM; } - page = (block + nand->block_start) * nand->pages_per_block + page; + /* calculate the page number */ + page = block * nand->pages_per_block + page; rt_mtd_nand_read(nand, page, RT_NULL, nand->page_size, oob_ptr, nand->oob_size); mtd_dump_hex(oob_ptr, nand->oob_size); @@ -231,7 +233,8 @@ int mtd_nand_write(const char* name, int block, int page) oob_ptr[index] = index & 0xff; } - page = (block + nand->block_start) * nand->pages_per_block + page; + /* calculate the page number */ + page = block * nand->pages_per_block + page; result = rt_mtd_nand_write(nand, page, page_ptr, nand->page_size, oob_ptr, nand->oob_size); if (result != RT_MTD_EOK) @@ -254,8 +257,6 @@ int mtd_nand_erase(const char* name, int block) return -RT_ERROR; } - block += nand->block_start; - return rt_mtd_nand_erase_block(nand, block); } FINSH_FUNCTION_EXPORT_ALIAS(mtd_nand_erase, nand_erase, nand_erase(name, block)); @@ -272,7 +273,7 @@ int mtd_nand_erase_all(const char* name) return -RT_ERROR; } - for (index = nand->block_start; index < nand->block_end; index ++) + for (index = 0; index < (nand->block_end - nand->block_start); index ++) { rt_mtd_nand_erase_block(nand, index); } @@ -280,8 +281,6 @@ int mtd_nand_erase_all(const char* name) return 0; } FINSH_FUNCTION_EXPORT_ALIAS(mtd_nand_erase_all, nand_erase_all, erase all of nand device - nand_erase_all(name, block)); - #endif #endif - |