projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More formatting
[yaffs2.git]
/
yaffs_nand.c
diff --git
a/yaffs_nand.c
b/yaffs_nand.c
index c33483c3599b8caadd5dd459514ac355ef96bb82..bd815cb7af92b7dea0940e25ecd0daf9c19ebb58 100644
(file)
--- a/
yaffs_nand.c
+++ b/
yaffs_nand.c
@@
-10,26
+10,27
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-
+
const char *yaffs_nand_c_version =
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_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;
{
int result;
yaffs_ExtendedTags localTags;
-
+
int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
-
+
/* If there are no tags provided, use local tags to get prioritised gc working */
/* 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)
@@
-39,25
+40,25
@@
int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
realignedChunkInNAND,
buffer,
result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
realignedChunkInNAND,
buffer,
- tags);
- if
(tags &&
- tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
-
+ tags);
+ 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;
-
+
if (tags) {
tags->sequenceNumber = dev->sequenceNumber;
tags->chunkUsed = 1;
if (tags) {
tags->sequenceNumber = dev->sequenceNumber;
tags->chunkUsed = 1;
@@
-84,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;
@@
-95,10
+96,10
@@
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,
-
unsigned
*sequenceNumber)
+ yaffs_BlockState *state,
+
__u32
*sequenceNumber)
{
blockNo -= dev->blockOffset;
{
blockNo -= dev->blockOffset;
@@
-131,4
+132,4
@@
int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
}
}
-
+