projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only subtract softDeletions once ber block gc.
[yaffs2.git]
/
yaffs_nand.c
diff --git
a/yaffs_nand.c
b/yaffs_nand.c
index af4215772482a2b11db0c77ad1885f75180f0712..bd815cb7af92b7dea0940e25ecd0daf9c19ebb58 100644
(file)
--- a/
yaffs_nand.c
+++ b/
yaffs_nand.c
@@
-12,7
+12,7
@@
*/
const char *yaffs_nand_c_version =
*/
const char *yaffs_nand_c_version =
-
"$Id: yaffs_nand.c,v 1.9 2008-05-05 07:58:58 charles
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_nand.h"
#include "yaffs_tagscompat.h"
@@
-20,9
+20,9
@@
const char *yaffs_nand_c_version =
#include "yaffs_getblockinfo.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;
{
int result;
yaffs_ExtendedTags localTags;
@@
-30,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 */
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)
tags = &localTags;
if (dev->readChunkWithTagsFromNAND)
@@
-41,20
+41,20
@@
int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
realignedChunkInNAND,
buffer,
tags);
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_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
-
yaffs_HandleChunkError(dev,
bi);
+
yaffs_HandleChunkError(dev,
bi);
}
return result;
}
}
return result;
}
-int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *
dev,
+int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
int chunkInNAND,
int chunkInNAND,
- const __u8 *
buffer,
- yaffs_ExtendedTags *
tags)
+ const __u8 *buffer,
+ yaffs_ExtendedTags *tags)
{
chunkInNAND -= dev->chunkOffset;
{
chunkInNAND -= dev->chunkOffset;
@@
-85,7
+85,7
@@
int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
tags);
}
tags);
}
-int yaffs_MarkBlockBad(yaffs_Device *
dev, int blockNo)
+int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
{
blockNo -= dev->blockOffset;
{
blockNo -= dev->blockOffset;
@@
-96,9
+96,9
@@
int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo)
return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
}
return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
}
-int yaffs_QueryInitialBlockState(yaffs_Device *
dev,
+int yaffs_QueryInitialBlockState(yaffs_Device *dev,
int blockNo,
int blockNo,
- yaffs_BlockState *
state,
+ yaffs_BlockState *state,
__u32 *sequenceNumber)
{
blockNo -= dev->blockOffset;
__u32 *sequenceNumber)
{
blockNo -= dev->blockOffset;