X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2Fyaffs_fileem2k.c;h=52f1e1114ffcb8f67e7a600022cf508a6fc0b574;hp=4667142ceee1699d49f0992c84b8942ab78aaea1;hb=137f935f6d622bffdef2fece0c5194e85f5174e9;hpb=976dbeae825b18e6759f3903073a6784248cc244

diff --git a/direct/basic-test/yaffs_fileem2k.c b/direct/basic-test/yaffs_fileem2k.c
index 4667142..52f1e11 100644
--- a/direct/basic-test/yaffs_fileem2k.c
+++ b/direct/basic-test/yaffs_fileem2k.c
@@ -24,16 +24,16 @@ const char *yaffs_flashif2_c_version = "$Id: yaffs_fileem2k.c,v 1.24 2010-02-18
 
 #include "yaffs_flashif2.h"
 #include "yaffs_guts.h"
-#include "devextras.h"
+#include "yaffs_fileem2k.h"
+#include "yaffs_packedtags2.h"
+#include "yaffs_tagsvalidity.h"
+
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h> 
 
-#include "yaffs_fileem2k.h"
-#include "yaffs_packedtags2.h"
-
 
 
 #define REPORT_ERROR 0
@@ -66,7 +66,6 @@ int yaffs_test_partial_write = 0;
 
 extern int random_seed;
 extern int simulate_power_failure;
-static int initialised = 0;
 static int remaining_ops;
 static int nops_so_far;
 
@@ -180,15 +179,15 @@ int yflash2_WriteChunkWithTagsToNAND(struct yaffs_dev *dev,int nand_chunk,const
 	int nRead;
 	int error;
 	
-	T(YAFFS_TRACE_MTD,(TSTR("write chunk %d data %x tags %x" TENDSTR),nand_chunk,(unsigned)data, (unsigned)tags));
+	yaffs_trace(YAFFS_TRACE_MTD, "write chunk %d data %p tags %p",nand_chunk, data, tags);
 
 	CheckInit();
 	
 	
 	if(dev->param.inband_tags){
 		
-		yaffs_packed_tags2_tags_only * pt2tp;
-		pt2tp = (yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
+		struct yaffs_packed_tags2_tags_only * pt2tp;
+		pt2tp = (struct yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
 		yaffs_pack_tags2_tags_only(pt2tp,tags);
 		
 		pos = (nand_chunk % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE;
@@ -260,7 +259,7 @@ int yflash2_WriteChunkWithTagsToNAND(struct yaffs_dev *dev,int nand_chunk,const
 			}
 			else
 			{
-				yaffs_packed_tags2 pt;
+				struct yaffs_packed_tags2 pt;
 				yaffs_pack_tags2(&pt,tags, !dev->param.no_tags_ecc);
 				u8 * ptab = (u8 *)&pt;
 
@@ -338,7 +337,7 @@ int yflash2_WriteChunkWithTagsToNAND(struct yaffs_dev *dev,int nand_chunk,const
 			}
 			else
 			{
-				yaffs_packed_tags2 pt;
+				struct yaffs_packed_tags2 pt;
 				yaffs_pack_tags2(&pt,tags,!dev->param.no_tags_ecc);
 				u8 * ptab = (u8 *)&pt;
 
@@ -397,7 +396,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 %x tags %x" TENDSTR),nand_chunk,(unsigned)data, (unsigned)tags));
+	yaffs_trace(YAFFS_TRACE_MTD,"read chunk %d data %p tags %p",nand_chunk, data, tags);
 	
 	CheckInit();
 	
@@ -412,8 +411,8 @@ int yflash2_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *
 		}
 
 		
-		yaffs_packed_tags2_tags_only * pt2tp;
-		pt2tp = (yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
+		struct yaffs_packed_tags2_tags_only * pt2tp;
+		pt2tp = (struct yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
 
 		
 		pos = (nand_chunk % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE;
@@ -472,7 +471,7 @@ int yflash2_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *
 			}
 			else
 			{
-				yaffs_packed_tags2 pt;
+				struct yaffs_packed_tags2 pt;
 				nread= read(h,&pt,sizeof(pt));
 				yaffs_unpack_tags2(tags,&pt, !dev->param.no_tags_ecc);
 #ifdef SIMULATE_FAILURES
@@ -513,7 +512,7 @@ int yflash2_MarkNANDBlockBad(struct yaffs_dev *dev, int block_no)
 	int written;
 	int h;
 	
-	yaffs_packed_tags2 pt;
+	struct yaffs_packed_tags2 pt;
 
 	CheckInit();
 	
@@ -537,14 +536,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
@@ -580,7 +579,7 @@ int yflash2_InitialiseNAND(struct yaffs_dev *dev)
 
 
 
-int yflash2_QueryNANDBlock(struct yaffs_dev *dev, int block_no, yaffs_block_state_t *state, u32 *seq_number)
+int yflash2_QueryNANDBlock(struct yaffs_dev *dev, int block_no, enum yaffs_block_state *state, u32 *seq_number)
 {
 	struct yaffs_ext_tags tags;
 	int chunkNo;