X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffs_fileem2k.c;h=1e2cd6b3ef59156d9b4fbb26824414415ebf1a2e;hp=8b4b46142b914cbc44d3159b9b8eb5602f330fcd;hb=bcac5908f05d38711a5db79da4f2bae1eea3abba;hpb=cb6db8000bf9110fe422e80a78a0cae79ba48e73

diff --git a/direct/yaffs_fileem2k.c b/direct/yaffs_fileem2k.c
index 8b4b461..1e2cd6b 100644
--- a/direct/yaffs_fileem2k.c
+++ b/direct/yaffs_fileem2k.c
@@ -1,21 +1,22 @@
 /*
- * YAFFS: Yet another FFS. A NAND-flash specific file system. 
- * yaffs_ramdisk.c: yaffs ram disk component
+ * 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>
  *
  * 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 provides a YAFFS nand emulation on a file for emulating 2kB pages.
-// THis is only intended as test code to test persistence etc.
+/*
+ * This provides a YAFFS nand emulation on a file for emulating 2kB pages.
+ * This is only intended as test code to test persistence etc.
+ */
 
-const char *yaffs_flashif_c_version = "$Id: yaffs_fileem2k.c,v 1.8 2006-11-07 23:37:43 charles Exp $";
+const char *yaffs_flashif_c_version = "$Id: yaffs_fileem2k.c,v 1.12 2007-02-14 01:09:06 wookey Exp $";
 
 
 #include "yportenv.h"
@@ -61,6 +62,10 @@ static yflash_Device filedisk;
 int yaffs_testPartialWrite = 0;
 
 
+
+
+static __u8 localBuffer[PAGE_SIZE];
+
 static char *NToName(char *buf,int n)
 {
 	sprintf(buf,"emfile%d",n);
@@ -144,6 +149,9 @@ int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8
 	int written;
 	int pos;
 	int h;
+	int i;
+	int nRead;
+	int error;
 	
 	T(YAFFS_TRACE_MTD,(TSTR("write chunk %d data %x tags %x" TENDSTR),chunkInNAND,(unsigned)data, (unsigned)tags));
 
@@ -157,13 +165,38 @@ int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8
 		h = filedisk.handle[(chunkInNAND / (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE))];
 		
 		lseek(h,pos,SEEK_SET);
-		written = write(h,data,dev->nDataBytesPerChunk);
+		nRead =  read(h, localBuffer,dev->nDataBytesPerChunk);
+		for(i = error = 0; i < dev->nDataBytesPerChunk && !error; i++){
+			if(localBuffer[i] != 0xFF){
+				printf("nand simulation: chunk %d data byte %d was %0x2\n",
+					chunkInNAND,i,localBuffer[i]);
+				error = 1;
+			}
+		}
+		
+		for(i = 0; i < dev->nDataBytesPerChunk; i++)
+		  localBuffer[i] &= data[i];
+		  
+		if(memcmp(localBuffer,data,dev->nDataBytesPerChunk))
+			printf("nand simulator: data does not match\n");
+			
+		lseek(h,pos,SEEK_SET);
+		written = write(h,localBuffer,dev->nDataBytesPerChunk);
 		
 		if(yaffs_testPartialWrite){
 			close(h);
 			exit(1);
 		}
 		
+#ifdef SIMULATE_FAILURES
+			if((chunkInNAND >> 6) == 100) 
+			  written = 0;
+
+			if((chunkInNAND >> 6) == 110) 
+			  written = 0;
+#endif
+
+
 		if(written != dev->nDataBytesPerChunk) return YAFFS_FAIL;
 	}
 	
@@ -173,6 +206,7 @@ int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8
 		h = filedisk.handle[(chunkInNAND / (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE))];
 		
 		lseek(h,pos,SEEK_SET);
+
 		if( 0 && dev->isYaffs2)
 		{
 			
@@ -183,8 +217,26 @@ int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8
 		{
 			yaffs_PackedTags2 pt;
 			yaffs_PackTags2(&pt,tags);
-
-			written = write(h,&pt,sizeof(pt));
+			__u8 * ptab = (__u8 *)&pt;
+
+			nRead = read(h,localBuffer,sizeof(pt));
+			for(i = error = 0; i < sizeof(pt) && !error; i++){
+				if(localBuffer[i] != 0xFF){
+					printf("nand simulation: chunk %d oob byte %d was %0x2\n",
+						chunkInNAND,i,localBuffer[i]);
+						error = 1;
+				}
+			}
+		
+			for(i = 0; i < sizeof(pt); i++)
+			  localBuffer[i] &= ptab[i];
+			 
+			if(memcmp(localBuffer,&pt,sizeof(pt)))
+				printf("nand sim: tags corruption\n");
+				
+			lseek(h,pos,SEEK_SET);
+			
+			written = write(h,localBuffer,sizeof(pt));
 			if(written != sizeof(pt)) return YAFFS_FAIL;
 		}
 	}
@@ -209,6 +261,8 @@ int yaffs_CheckAllFF(const __u8 *ptr, int n)
 static int fail300 = 1;
 static int fail320 = 1;
 
+static int failRead10 = 2;
+
 int yflash_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags)
 {
 	int nread;
@@ -229,6 +283,7 @@ int yflash_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *da
 		lseek(h,pos,SEEK_SET);
 		nread = read(h,data,dev->nDataBytesPerChunk);
 		
+		
 		if(nread != dev->nDataBytesPerChunk) return YAFFS_FAIL;
 	}
 	
@@ -257,20 +312,25 @@ int yflash_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *da
 			nread= read(h,&pt,sizeof(pt));
 			yaffs_UnpackTags2(tags,&pt);
 #ifdef SIMULATE_FAILURES
-			if((chunkInNAND >> 6) == 300) {
+			if((chunkInNAND >> 6) == 100) {
 			    if(fail300 && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR){
 			       tags->eccResult = YAFFS_ECC_RESULT_FIXED;
 			       fail300 = 0;
 			    }
 			    
 			}
-			if((chunkInNAND >> 6) == 320) {
+			if((chunkInNAND >> 6) == 110) {
 			    if(fail320 && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR){
 			       tags->eccResult = YAFFS_ECC_RESULT_FIXED;
 			       fail320 = 0;
 			    }
 			}
 #endif
+			if(failRead10>0 && chunkInNAND == 10){
+				failRead10--;
+				nread = 0;
+			}
+			
 			if(nread != sizeof(pt)) return YAFFS_FAIL;
 		}
 	}
@@ -310,6 +370,8 @@ int yflash_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
 		
 	CheckInit();
 	
+	printf("erase block %d\n",blockNumber);
+	
 	if(blockNumber == 320)
 		fail320 = 1;