[brcm63xx] a couple of more fixes to get 6345 booting up to the console handover

[openwrt.git] / target / linux / generic-2.6 / files / fs / yaffs2 / yaffs_nand.c

diff --git a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nand.c b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nand.c
index db5ac8e..4e25033 100644 (file)
--- a/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nand.c
+++ b/target/linux/generic-2.6/files/fs/yaffs2/yaffs_nand.c
@@ -10,9 +10,9 @@
  * 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$";
+    "$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"


@@ -25,9 +25,9 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
 {
        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(!tags)
                tags = &localTags;
        /* If there are no tags provided, use local tags to get prioritised gc working */
        if(!tags)
                tags = &localTags;


@@ -39,14 +39,14 @@ int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
                result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
                                                                        realignedChunkInNAND,
                                                                        buffer,
                result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
                                                                        realignedChunkInNAND,
                                                                        buffer,

-                                                                       tags);  
-       if(tags && 
+                                                                       tags);
+       if(tags &&

           tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){
           tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR){

-       
+

                yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
                 yaffs_HandleChunkError(dev,bi);
        }
                yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
                 yaffs_HandleChunkError(dev,bi);
        }

-                                                               
+

        return result;
 }
 
        return result;
 }
 


@@ -57,7 +57,7 @@ int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
 {
        chunkInNAND -= dev->chunkOffset;
 
 {
        chunkInNAND -= dev->chunkOffset;
 

-       
+

        if (tags) {
                tags->sequenceNumber = dev->sequenceNumber;
                tags->chunkUsed = 1;
        if (tags) {
                tags->sequenceNumber = dev->sequenceNumber;
                tags->chunkUsed = 1;


@@ -131,4 +131,4 @@ int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
 }
 
 
 }
 
 

- 
+