X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=yaffs_nand.c;h=38989851ed7f24f4267f74a7fccd6af8a1e8327d;hb=02d566cf1ffdd2d91d4abbaf106ef4fb3affbdc6;hp=14ae3308a79333f419d5ae6e5800237c2b5e77b2;hpb=ffc75c3d0b5d9b3544c9fef3bcd8c0c0ae0bb6ad;p=yaffs2.git diff --git a/yaffs_nand.c b/yaffs_nand.c index 14ae330..3898985 100644 --- 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 @@ -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. - * */ - + const char *yaffs_nand_c_version = - "$Id: yaffs_nand.c,v 1.5 2006-11-08 09:52:12 charles Exp $"; + "$Id: yaffs_nand.c,v 1.8 2007-12-13 15:35:18 wookey Exp $"; #include "yaffs_nand.h" #include "yaffs_tagscompat.h" @@ -26,9 +25,9 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND, { 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; @@ -40,14 +39,14 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND, result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer, - tags); - if(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; } @@ -58,7 +57,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev, { chunkInNAND -= dev->chunkOffset; - + if (tags) { tags->sequenceNumber = dev->sequenceNumber; tags->chunkUsed = 1; @@ -132,4 +131,4 @@ int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev) } - +