diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-10-30 14:58:13 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-10-30 14:58:13 +0000 |
| commit | 56190ed0fcdb453b218be4fcefa938850a81c83e (patch) | |
| tree | e9ea299478862360b7ec361c7d80f9fb9f4deddf /target/linux/generic/files/fs/yaffs2/yaffs_nand.c | |
| parent | 73c75e0dd862a8898bcf377aa265574c6a7f3c81 (diff) | |
| download | master-31e0f0ae-56190ed0fcdb453b218be4fcefa938850a81c83e.tar.gz master-31e0f0ae-56190ed0fcdb453b218be4fcefa938850a81c83e.tar.bz2 master-31e0f0ae-56190ed0fcdb453b218be4fcefa938850a81c83e.zip | |
generic: fold yaffs_cvs_2009_04_24 patch to generic/files
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34012
Diffstat (limited to 'target/linux/generic/files/fs/yaffs2/yaffs_nand.c')
| -rw-r--r-- | target/linux/generic/files/fs/yaffs2/yaffs_nand.c | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/target/linux/generic/files/fs/yaffs2/yaffs_nand.c b/target/linux/generic/files/fs/yaffs2/yaffs_nand.c index 4e250338d7..bd815cb7af 100644 --- a/target/linux/generic/files/fs/yaffs2/yaffs_nand.c +++ b/target/linux/generic/files/fs/yaffs2/yaffs_nand.c @@ -12,16 +12,17 @@ */ const char *yaffs_nand_c_version = - "$Id: yaffs_nand.c,v 1.7 2007-02-14 01:09:06 wookey Exp $"; + "$Id: yaffs_nand.c,v 1.10 2009-03-06 17:20:54 wookey Exp $"; #include "yaffs_nand.h" #include "yaffs_tagscompat.h" #include "yaffs_tagsvalidity.h" +#include "yaffs_getblockinfo.h" -int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND, - __u8 * buffer, - yaffs_ExtendedTags * tags) +int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND, + __u8 *buffer, + yaffs_ExtendedTags *tags) { int result; yaffs_ExtendedTags localTags; @@ -29,7 +30,7 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND, int realignedChunkInNAND = chunkInNAND - dev->chunkOffset; /* If there are no tags provided, use local tags to get prioritised gc working */ - if(!tags) + if (!tags) tags = &localTags; if (dev->readChunkWithTagsFromNAND) @@ -40,20 +41,20 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND, realignedChunkInNAND, buffer, tags); - if(tags && - tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){ + if (tags && + tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) { yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock); - yaffs_HandleChunkError(dev,bi); + yaffs_HandleChunkError(dev, bi); } return result; } -int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev, +int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev, int chunkInNAND, - const __u8 * buffer, - yaffs_ExtendedTags * tags) + const __u8 *buffer, + yaffs_ExtendedTags *tags) { chunkInNAND -= dev->chunkOffset; @@ -84,7 +85,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev, tags); } -int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo) +int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo) { blockNo -= dev->blockOffset; @@ -95,10 +96,10 @@ int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo) return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo); } -int yaffs_QueryInitialBlockState(yaffs_Device * dev, +int yaffs_QueryInitialBlockState(yaffs_Device *dev, int blockNo, - yaffs_BlockState * state, - unsigned *sequenceNumber) + yaffs_BlockState *state, + __u32 *sequenceNumber) { blockNo -= dev->blockOffset; |