projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rolling in Ians and other changes
[yaffs2.git]
/
yaffs_nand.c
diff --git
a/yaffs_nand.c
b/yaffs_nand.c
index cd39d516066564bd452bafd9e48e2a7da82e67c6..c33483c3599b8caadd5dd459514ac355ef96bb82 100644
(file)
--- a/
yaffs_nand.c
+++ b/
yaffs_nand.c
@@
-1,7
+1,7
@@
/*
/*
- * YAFFS: Yet
another FFS. A NAND-flash specific file system.
+ * YAFFS: Yet
Another Flash File System. A NAND-flash specific file system.
*
*
- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002
-2007
Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@
-9,11
+9,10
@@
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
* This program is free software; you can redistribute it and/or modify
* 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.
1 2006-05-08 10:13:34 charles
Exp $";
+ "$Id: yaffs_nand.c,v 1.
7 2007-02-14 01:09:06 wookey
Exp $";
#include "yaffs_nand.h"
#include "yaffs_tagscompat.h"
#include "yaffs_nand.h"
#include "yaffs_tagscompat.h"
@@
-24,16
+23,31
@@
int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
__u8 * buffer,
yaffs_ExtendedTags * tags)
{
__u8 * buffer,
yaffs_ExtendedTags * tags)
{
- chunkInNAND -= dev->chunkOffset;
+ int result;
+ yaffs_ExtendedTags localTags;
+
+ int realignedChunkInNAND = chunkInNAND - dev->chunkOffset;
+
+ /* If there are no tags provided, use local tags to get prioritised gc working */
+ if(!tags)
+ tags = &localTags;
if (dev->readChunkWithTagsFromNAND)
if (dev->readChunkWithTagsFromNAND)
- re
turn dev->readChunkWithTagsFromNAND(dev, c
hunkInNAND, buffer,
+ re
sult = dev->readChunkWithTagsFromNAND(dev, realignedC
hunkInNAND, buffer,
tags);
else
tags);
else
- re
turn
yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
-
c
hunkInNAND,
+ re
sult =
yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
+
realignedC
hunkInNAND,
buffer,
buffer,
- tags);
+ tags);
+ if(tags &&
+ tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
+
+ yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
+ yaffs_HandleChunkError(dev,bi);
+ }
+
+ return result;
}
int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
}
int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
@@
-108,9
+122,6
@@
int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
dev->nBlockErasures++;
result = dev->eraseBlockInNAND(dev, blockInNAND);
dev->nBlockErasures++;
result = dev->eraseBlockInNAND(dev, blockInNAND);
- /* If at first we don't succeed, try again *once*.*/
- if (!result)
- result = dev->eraseBlockInNAND(dev, blockInNAND);
return result;
}
return result;
}