Mercurial > yaffs-ecoscentric
changeset 338:138c9338c4cc
Update for changes to NAND interface
| author | Ross Younger <wry@ecoscentric.com> |
|---|---|
| date | Thu, 12 Nov 2009 13:42:03 +0000 |
| parents | b254764fbeac |
| children | 73b6efce8c58 |
| files | packages/fs/yaffs/current/ChangeLog packages/fs/yaffs/current/src/ecos-yaffs-nand.c packages/fs/yaffs/current/tests/yaffs5.c |
| diffstat | 3 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/fs/yaffs/current/ChangeLog +++ b/packages/fs/yaffs/current/ChangeLog @@ -1,3 +1,7 @@ +2009-11-09 Ross Younger <wry@ecoscentric.com> + + * ecos-yaffs-nand.c: Update for changes to NAND interface. + 2009-11-03 Ross Younger <wry@ecoscentric.com> * tests: Import from eCosPro: mounttime, yaffs1, yaffs2,
--- a/packages/fs/yaffs/current/src/ecos-yaffs-nand.c +++ b/packages/fs/yaffs/current/src/ecos-yaffs-nand.c @@ -94,7 +94,7 @@ int eyaffs_writeChunkWithTagsToNAND (str yaffs_PackTags1(&pt1, tags); yaffs_CalcTagsECC((yaffs_Tags *)&pt1); } - rv = cyg_nand_write_page(part, chunkInNAND, data, data ? dev->nDataBytesPerChunk : 0, &pt1, PACKEDTAGS1_OOBSIZE); + rv = cyg_nand_write_page(part, chunkInNAND, data, &pt1, PACKEDTAGS1_OOBSIZE); #endif } else { #ifdef CYGSEM_FS_YAFFS_OMIT_YAFFS2_CODE @@ -115,12 +115,12 @@ int eyaffs_writeChunkWithTagsToNAND (str yaffs_PackedTags2TagsPart *pt2tp; pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->nDataBytesPerChunk); yaffs_PackTags2TagsPart(pt2tp, tags); - rv = cyg_nand_write_page(part, chunkInNAND, data, dev->totalBytesPerChunk, 0, 0); + rv = cyg_nand_write_page(part, chunkInNAND, data, 0, 0); } else { yaffs_PackedTags2 pt; void *packed_tags_ptr = dev->noTagsECC ? (void*) &pt.t : (void*) &pt; yaffs_PackTags2(dev, &pt, tags); - rv = cyg_nand_write_page(part, chunkInNAND, data, dev->nDataBytesPerChunk, packed_tags_ptr, PACKEDTAGS2_OOBSIZE(dev)); + rv = cyg_nand_write_page(part, chunkInNAND, data, packed_tags_ptr, PACKEDTAGS2_OOBSIZE(dev)); } #endif } @@ -144,7 +144,7 @@ int eyaffs_readChunkWithTagsFromNAND (st yaffs_PackedTags1 pt1; memset(&pt1, 0xff, sizeof(yaffs_PackedTags1)); - rv = cyg_nand_read_page(part, chunkInNAND, data, data ? dev->nDataBytesPerChunk : 0, &pt1, PACKEDTAGS1_OOBSIZE); + rv = cyg_nand_read_page(part, chunkInNAND, data, &pt1, PACKEDTAGS1_OOBSIZE); if (rv == 0) { if (yaffs_CheckFF((CYG_BYTE*)&pt1, 8)) { @@ -195,7 +195,7 @@ int eyaffs_readChunkWithTagsFromNAND (st data = yaffs_GetTempBuffer(dev, __LINE__); } - rv = cyg_nand_read_page(part, chunkInNAND, data, data ? dev->totalBytesPerChunk : 0, 0, 0); + rv = cyg_nand_read_page(part, chunkInNAND, data, 0, 0); if (tags) { yaffs_PackedTags2TagsPart *pt2tp; pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->nDataBytesPerChunk]; @@ -204,7 +204,7 @@ int eyaffs_readChunkWithTagsFromNAND (st } else { yaffs_PackedTags2 pt; void *packed_tags_ptr = dev->noTagsECC ? (void*) &pt.t : (void*) &pt; - rv = cyg_nand_read_page(part, chunkInNAND, data, data ? dev->nDataBytesPerChunk : 0, packed_tags_ptr, tags ? PACKEDTAGS2_OOBSIZE(dev) : 0); + rv = cyg_nand_read_page(part, chunkInNAND, data, packed_tags_ptr, tags ? PACKEDTAGS2_OOBSIZE(dev) : 0); if (tags) yaffs_UnpackTags2(dev, tags, &pt); }
--- a/packages/fs/yaffs/current/tests/yaffs5.c +++ b/packages/fs/yaffs/current/tests/yaffs5.c @@ -780,11 +780,14 @@ void yaffs5_main( CYG_ADDRESS id ) err = umount( TEST_MOUNTPOINT ); if( err < 0 ) SHOW_RESULT( umount, err ); -#endif +#else + // don't sync if not mounted diag_printf("<INFO>: syncing\n"); err = cyg_fs_setinfo(TEST_MOUNTPOINT, FS_INFO_SYNC, 0, 0); if (err != 0) SHOW_RESULT(sync, err); + +#endif CYG_TEST_PASS_FINISH("yaffs5"); }