yaffs: Remove tags validity checking code.

[yaffs2.git] / direct / basic-test / yaffs_fileem2k.c

diff --git a/direct/basic-test/yaffs_fileem2k.c b/direct/basic-test/yaffs_fileem2k.c
index 06e41e54d2c3282acce8b2fc31543d0f3b9d4913..17eb9089004b225206bc45945716e2210653042f 100644 (file)
--- a/direct/basic-test/yaffs_fileem2k.c
+++ b/direct/basic-test/yaffs_fileem2k.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -26,7 +26,6 @@ const char *yaffs_flashif2_c_version = "$Id: yaffs_fileem2k.c,v 1.24 2010-02-18
 #include "yaffs_guts.h"
 #include "yaffs_fileem2k.h"
 #include "yaffs_packedtags2.h"
-#include "yaffs_tagsvalidity.h"
 
 
 #include <sys/types.h>
@@ -179,7 +178,7 @@ int yflash2_WriteChunkWithTagsToNAND(struct yaffs_dev *dev,int nand_chunk,const
        int nRead;
        int error;
        
-       T(YAFFS_TRACE_MTD,(TSTR("write chunk %d data %p tags %p" TENDSTR),nand_chunk, data, tags));
+       yaffs_trace(YAFFS_TRACE_MTD, "write chunk %d data %p tags %p",nand_chunk, data, tags);
 
        CheckInit();
        
@@ -396,7 +395,7 @@ int yflash2_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *
        int retval = YAFFS_OK;
        int nRead;
        
-       T(YAFFS_TRACE_MTD,(TSTR("read chunk %d data %p tags %p" TENDSTR),nand_chunk, data, tags));
+       yaffs_trace(YAFFS_TRACE_MTD,"read chunk %d data %p tags %p",nand_chunk, data, tags);
        
        CheckInit();
        
@@ -460,14 +459,10 @@ int yflash2_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *
                                nread= read(h,tags,sizeof(struct yaffs_ext_tags));
                                if(nread != sizeof(struct yaffs_ext_tags))
                                         retval =  YAFFS_FAIL;
-                               if(yaffs_check_all_ff((u8 *)tags,sizeof(struct yaffs_ext_tags)))
-                               {
-                                       yaffs_init_tags(tags);
-                               }
+                               if(yaffs_check_all_ff((u8 *)tags, sizeof(struct yaffs_ext_tags)))
+                                       memset(tags, 0, sizeof(struct yaffs_ext_tags));
                                else
-                               {
                                        tags->chunk_used = 1;
-                               }
                        }
                        else
                        {
@@ -536,14 +531,14 @@ int yflash2_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber)
                
        CheckInit();
        
-       printf("erase block %d\n",blockNumber);
+       //printf("erase block %d\n",blockNumber);
        
        if(blockNumber == 320)
                fail320 = 1;
        
        if(blockNumber < 0 || blockNumber >= filedisk.nBlocks)
        {
-               T(YAFFS_TRACE_ALWAYS,("Attempt to erase non-existant block %d\n",blockNumber));
+               yaffs_trace(YAFFS_TRACE_ALWAYS,"Attempt to erase non-existant block %d",blockNumber);
                return YAFFS_FAIL;
        }
        else
@@ -599,7 +594,7 @@ int yflash2_QueryNANDBlock(struct yaffs_dev *dev, int block_no, enum yaffs_block
        }
        else if(tags.chunk_used)
        {
-               *state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
+               *state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
                *seq_number = tags.seq_number;
        }
        return YAFFS_OK;