From: charles <charles>
Date: Sun, 3 Jul 2005 05:48:11 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: pre-name-change~470
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=40b1e54e4e59aaeb6bafabcda5df47bddc5ecfee

*** empty log message ***
---

diff --git a/direct/Makefile b/direct/Makefile
index 2d5eed1..cb76c59 100644
--- a/direct/Makefile
+++ b/direct/Makefile
@@ -10,21 +10,22 @@
 #
 # NB Warning this Makefile does not include header dependencies.
 #
-# $Id: Makefile,v 1.5 2004-11-22 03:22:25 charles Exp $
+# $Id: Makefile,v 1.6 2005-07-03 05:48:11 charles Exp $
 
 CFLAGS =    -Wall -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM -DCONFIG_YAFFS_YAFFS2 -g
 #CFLAGS+=   -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations
 #CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
 
 
-DIRECTTESTOBJS = dtest.o yaffscfg2k.o yaffs_ecc.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o yaffs_packedtags1.o yaffs_ramdisk.o yaffs_tagscompat.o yaffs_packedtags2.o
+DIRECTTESTOBJS = dtest.o yaffscfg2k.o yaffs_ecc.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o yaffs_packedtags1.o yaffs_ramdisk.o yaffs_tagscompat.o yaffs_packedtags2.o yaffs_tagsvalidity.o
 
 BOOTTESTOBJS = bootldtst.o yboot.o yaffs_fileem.o nand_ecc.o
 
 ALLOBJS =  dtest.o nand_ecc.o yaffscfg.o yaffs_fileem.o yaffsfs.o yaffs_ramdisk.o bootldtst.o yboot.o yaffs_ramem2k.o
 
 SYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffsinterface.h yportenv.h yaffs_tagscompat.c yaffs_tagscompat.h \
-          yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h yaffs_ramem2k.c yaffs_nandemul2k.h
+          yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h yaffs_ramem2k.c yaffs_nandemul2k.h \
+          yaffs_tagsvalidity.c yaffs_tagsvalidity.h
 
 #all: directtest2k boottest
 
diff --git a/direct/dtest.c b/direct/dtest.c
index 53d1e80..4d9cb89 100644
--- a/direct/dtest.c
+++ b/direct/dtest.c
@@ -90,7 +90,7 @@ int check_pattern_file(char *fn)
 	h = yaffs_open(fn, O_RDWR,0);
 	size = yaffs_lseek(h,0,SEEK_END);
 		
-	for(i = 0; i < size && ok; i+=256)
+	for(i = 0; i < size; i+=256)
 	{
 		yaffs_lseek(h,i,SEEK_SET);
 		yaffs_read(h,&marker,sizeof(marker));
@@ -107,6 +107,38 @@ int check_pattern_file(char *fn)
 
 
 
+
+
+int dump_file_data(char *fn)
+{
+	int h;
+	int marker;
+	int i = 0;
+	int size;
+	int ok = 1;
+	unsigned char b;
+	
+	h = yaffs_open(fn, O_RDWR,0);
+
+				
+	printf("%s\n",fn);
+	while(yaffs_read(h,&b,1)> 0)
+	{
+		printf("%02x",b);
+		i++;
+		if(i > 32) 
+		{
+		   printf("\n");
+		   i = 0;;
+		 }
+	}
+	printf("\n");
+	yaffs_close(h);
+	return ok;
+}
+
+
+
 void dump_file(const char *fn)
 {
 	int i;
@@ -129,6 +161,95 @@ void dump_file(const char *fn)
 	}
 }
 
+void create_file_of_size(const char *fn,int syze)
+{
+	int h;
+	int n;
+	
+	
+	int iterations = (syze + strlen(fn) -1)/ strlen(fn);
+	
+	h = yaffs_open(fn, O_CREAT | O_RDWR | O_TRUNC, S_IREAD | S_IWRITE);
+		
+	while (iterations > 0)
+	{
+		yaffs_write(h,fn,strlen(fn));
+		iterations--;
+	}
+	yaffs_close (h);
+}
+
+void create_resized_file_of_size(const char *fn,int syze1,int reSyze, int syze2)
+{
+	int h;
+	int n;
+	
+	
+	int iterations;
+	
+	h = yaffs_open(fn, O_CREAT | O_RDWR | O_TRUNC, S_IREAD | S_IWRITE);
+		
+	iterations = (syze1 + strlen(fn) -1)/ strlen(fn);
+	while (iterations > 0)
+	{
+		yaffs_write(h,fn,strlen(fn));
+		iterations--;
+	}
+	
+	yaffs_truncate(h,reSyze);
+	
+	yaffs_lseek(h,0,SEEK_SET);
+	iterations = (syze2 + strlen(fn) -1)/ strlen(fn);
+	while (iterations > 0)
+	{
+		yaffs_write(h,fn,strlen(fn));
+		iterations--;
+	}
+	
+	yaffs_close (h);
+}
+
+
+void do_some_file_stuff(const char *path)
+{
+
+	char fn[100];
+
+	sprintf(fn,"%s/%s",path,"f1");
+	create_file_of_size(fn,10000);
+
+	sprintf(fn,"%s/%s",path,"fdel");
+	create_file_of_size(fn,10000);
+	yaffs_unlink(fn);
+
+	sprintf(fn,"%s/%s",path,"f2");
+	
+	create_resized_file_of_size(fn,10000,3000,4000);
+}
+
+void yaffs_backward_scan_test(const char *path)
+{
+	char fn[100];
+	
+	yaffs_StartUp();	
+	
+	yaffs_mount(path);
+	
+	do_some_file_stuff(path);
+	
+	sprintf(fn,"%s/ddd",path);
+	
+	yaffs_mkdir(fn,0);
+	
+	do_some_file_stuff(fn);
+	
+	yaffs_unmount(path);
+	
+	yaffs_mount(path);
+}
+
+
+
 void short_scan_test(const char *path, int fsize, int niterations)
 {
 	int i;
@@ -148,6 +269,8 @@ void short_scan_test(const char *path, int fsize, int niterations)
 	}
 }
 
+
+
 void scan_pattern_test(const char *path, int fsize, int niterations)
 {
 	int i;
@@ -169,8 +292,10 @@ void scan_pattern_test(const char *path, int fsize, int niterations)
 		dumpDir(path);
 		for(j = 0; j < 3; j++)
 		{
+			result = dump_file_data(fn[j]);
 			result = check_pattern_file(fn[j]);
 			make_pattern_file(fn[j],fsize); 
+			result = dump_file_data(fn[j]);
 			result = check_pattern_file(fn[j]);
 		}
 		yaffs_unmount(path);
@@ -662,11 +787,18 @@ int long_test(int argc, char *argv[])
 
 }
 
-int long_test_on_path(char *path)
+int huge_directory_test_on_path(char *path)
 {
 
+	yaffs_DIR *d;
+	yaffs_dirent *de;
+	struct yaffs_stat s;
+
 	int f;
+	int i;
 	int r;
+	int total = 0;
+	int lastTotal = 0;
 	char buffer[20];
 	
 	char str[100];
@@ -681,242 +813,41 @@ int long_test_on_path(char *path)
 	
 	yaffs_mount(path);
 	
-	printf("\nDirectory look-up of %s\n",path);
-	dumpDir(path);
-
-	//leave_unlinked_file("/flash",20000,0);
-	//leave_unlinked_file("/data",20000,0);
-	
-	leave_unlinked_file(path,20,0);
-	
-
-	sprintf(name,"%s/%s",path,"b1");
-	f = yaffs_open(name, O_RDONLY,0);
-	
-	printf("open %s readonly, f=%d\n",name,f);
-	
-	f = yaffs_open(name, O_CREAT,S_IREAD | S_IWRITE);
-	
-	printf("open %s O_CREAT, f=%d\n",name,f);
-	
-	
-	r = yaffs_write(f,"hello",1);
-	printf("write %d attempted to write to a read-only file\n",r);
-	
-	r = yaffs_close(f);
-	
-	printf("close %d\n",r);
-
-	f = yaffs_open(name, O_RDWR,0);
-	
-	printf("open %s O_RDWR,f=%d\n",name,f);
-	
-	
-	r = yaffs_write(f,"hello",2);
-	printf("write %d attempted to write to a writeable file\n",r);
-	r = yaffs_write(f,"world",3);
-	printf("write %d attempted to write to a writeable file\n",r);
-	
-	r= yaffs_lseek(f,0,SEEK_END);
-	printf("seek end %d\n",r);
-	memset(buffer,0,20);
-	r = yaffs_read(f,buffer,10);
-	printf("read %d \"%s\"\n",r,buffer);
-	r= yaffs_lseek(f,0,SEEK_SET);
-	printf("seek set %d\n",r);
-	memset(buffer,0,20);
-	r = yaffs_read(f,buffer,10);
-	printf("read %d \"%s\"\n",r,buffer);
-	memset(buffer,0,20);
-	r = yaffs_read(f,buffer,10);
-	printf("read %d \"%s\"\n",r,buffer);
-
-	// Check values reading at end.
-	// A read past end of file should return 0 for 0 bytes read.
-		
-	r= yaffs_lseek(f,0,SEEK_END);
-	r = yaffs_read(f,buffer,10);
-	printf("read at end returned  %d\n",r); 
-	r= yaffs_lseek(f,500,SEEK_END);
-	r = yaffs_read(f,buffer,10);
-	printf("read past end returned  %d\n",r);       
-	
-	r = yaffs_close(f);
-	
-	printf("close %d\n",r);
-	
-	sprintf(name,"%s/%s",path,"yyfile");
-	copy_in_a_file(name,"xxx");
+	// Create a large number of files
 	
-	// Create a file with a long name
-	sprintf(name,"%s/%s",path,"file with a long name");
-	copy_in_a_file(name,"xxx");
-	
-	
-	printf("\nDirectory look-up of %s\n",path);
-	dumpDir(path);
-
-	// Check stat
-	r = yaffs_stat(name,&ystat);
-	
-	// Check rename
-	sprintf(name2,"%s/%s",path,"r1");
-	r = yaffs_rename(name,name2);
-	
-	printf("\nDirectory look-up of %s\n",path);
-	dumpDir(path);
-	
-	// Check unlink
-	r = yaffs_unlink(name2);
-	
-	
-	printf("\nDirectory look-up of %s\n",path);
-	dumpDir(path);
-
-	// Check mkdir
-
-	sprintf(name,"%s/%s",path,"directory1");        
-	r = yaffs_mkdir(name,0);
-	
-	
-	printf("\nDirectory look-up of %s\n",path);
-	dumpDir(path);
-	printf("\nDirectory look-up of %s\n",name);
-	dumpDir(name);
-
-	// add a file to the directory                  
-	sprintf(name2,"%s/%s",name,"/file in dir with a long name");
-	copy_in_a_file(name2,"xxx");
-	
-	
-	printf("\nDirectory look-up of %s\n",path);
-	dumpDir(path);
-	printf("\nDirectory look-up of %s\n",name);
-	dumpDir(name);
-	
-	//  Attempt to delete directory (should fail)
-	
-	r = yaffs_rmdir(name);
-	
-	printf("\nDirectory look-up of %s\n",path);
-	dumpDir(path);
-	printf("\nDirectory look-up of %s\n",name);
-	dumpDir(name);
-
-	yaffs_unmount(path);
-
-	return 0;       
-	// Delete file first, then rmdir should work
-	r = yaffs_unlink(name2);
-	r = yaffs_rmdir(name);
-	
-	printf("\nDirectory look-up of %s\n",path);
-	dumpDir(path);
-	printf("\nDirectory look-up of %s\n",name);
-	dumpDir(name);
-
-#if 0
-	fill_disk_and_delete(path,20,20);
-	
-	printf("\nDirectory look-up of %s\n",path);
-	dumpDir(path);
-#endif
-
-	yaffs_unmount(path);
-
-	return 0;
-
-	yaffs_symlink("yyfile","/boot/slink");
-	
-	yaffs_readlink("/boot/slink",str,100);
-	printf("symlink alias is %s\n",str);
-	
-	
-	
-	
-	printf("\nDirectory look-up of /boot\n");
-	dumpDir("/boot");
-	printf("\nDirectory look-up of /boot (using stat instead of lstat)\n");
-	dumpDirFollow("/boot");
-	printf("\nDirectory look-up of /boot/directory1\n");
-	dumpDir("/boot/directory1");
-
-	h = yaffs_open("/boot/slink",O_RDWR,0);
-	
-	printf("file length is %d\n",yaffs_lseek(h,0,SEEK_END));
-	
-	yaffs_close(h);
-	
-	yaffs_unlink("/boot/slink");
-
-	
-	printf("\nDirectory look-up of /boot\n");
-	dumpDir("/boot");
-	
-	// Check chmod
-	
-	yaffs_stat("/boot/yyfile",&ystat);
-	temp_mode = ystat.st_mode;
-	
-	yaffs_chmod("/boot/yyfile",0x55555);
-	printf("\nDirectory look-up of /boot\n");
-	dumpDir("/boot");
-	
-	yaffs_chmod("/boot/yyfile",temp_mode);
-	printf("\nDirectory look-up of /boot\n");
-	dumpDir("/boot");
-	
-	// Permission checks...
-	PermissionsCheck("/boot/yyfile",0, O_WRONLY,0);
-	PermissionsCheck("/boot/yyfile",0, O_RDONLY,0);
-	PermissionsCheck("/boot/yyfile",0, O_RDWR,0);
-
-	PermissionsCheck("/boot/yyfile",S_IREAD, O_WRONLY,0);
-	PermissionsCheck("/boot/yyfile",S_IREAD, O_RDONLY,1);
-	PermissionsCheck("/boot/yyfile",S_IREAD, O_RDWR,0);
-
-	PermissionsCheck("/boot/yyfile",S_IWRITE, O_WRONLY,1);
-	PermissionsCheck("/boot/yyfile",S_IWRITE, O_RDONLY,0);
-	PermissionsCheck("/boot/yyfile",S_IWRITE, O_RDWR,0);
-	
-	PermissionsCheck("/boot/yyfile",S_IREAD | S_IWRITE, O_WRONLY,1);
-	PermissionsCheck("/boot/yyfile",S_IREAD | S_IWRITE, O_RDONLY,1);
-	PermissionsCheck("/boot/yyfile",S_IREAD | S_IWRITE, O_RDWR,1);
-
-	yaffs_chmod("/boot/yyfile",temp_mode);
-	
-	//create a zero-length file and unlink it (test for scan bug)
-	
-	h = yaffs_open("/boot/zlf",O_CREAT | O_TRUNC | O_RDWR,0);
-	yaffs_close(h);
-	
-	yaffs_unlink("/boot/zlf");
-	
-	
-	yaffs_DumpDevStruct("/boot");
-	
-	fill_disk_and_delete("/boot",20,20);
+	for(i = 0; i < 2000; i++)
+	{
+	  sprintf(str,"%s/%d",path,i);
+	  
+	   f = yaffs_open(str,O_CREAT,S_IREAD | S_IWRITE);
+	   yaffs_close(f);
+	}
 	
-	yaffs_DumpDevStruct("/boot");
 	
-	fill_files("/boot",1,10000,0);
-	fill_files("/boot",1,10000,5000);
-	fill_files("/boot",2,10000,0);
-	fill_files("/boot",2,10000,5000);
 	
-	leave_unlinked_file("/data",20000,0);
-	leave_unlinked_file("/data",20000,5000);
-	leave_unlinked_file("/data",20000,5000);
-	leave_unlinked_file("/data",20000,5000);
-	leave_unlinked_file("/data",20000,5000);
-	leave_unlinked_file("/data",20000,5000);
+	d = yaffs_opendir(path);
+	i = 0;
+	if (d) {
+	while((de = yaffs_readdir(d)) != NULL) {
+	if (total >lastTotal+100*9*1024||(i & 1023)==0){
+	printf("files = %d, total = %d\n",i, total);
+	lastTotal = total;
+	}
+		i++;
+		sprintf(str,"%s/%s",path,de->d_name);
+		yaffs_lstat(str,&s);
+		switch(s.st_mode & S_IFMT){
+		case S_IFREG:
+	//printf("data file");
+	total += s.st_size;
+	break;
+	}
+	}
 	
-	yaffs_DumpDevStruct("/boot");
-	yaffs_DumpDevStruct("/data");
+	yaffs_closedir(d);
+	}
 	
-
 	return 0;
-
 }
 
 int yaffs_scan_test(const char *path)
@@ -1308,26 +1239,90 @@ int truncate_test(void)
 }
 
 
+
+
+void scan_deleted_files_test(const char *mountpt)
+{
+	char fn[100];
+	char sub[100];
+	
+	const char *p;
+	
+	int i;
+	int j;
+	int k;
+	int h;
+	
+	sprintf(sub,"%s/sdir",mountpt);
+	yaffs_StartUp();
+	
+	for(j = 0; j < 10; j++)
+	{
+		printf("\n\n>>>>>>> Run %d <<<<<<<<<<<<<\n\n",j);
+		yaffs_mount(mountpt);
+		yaffs_mkdir(sub,0);
+		
+		
+		p = (j & 0) ? mountpt: sub;
+	
+		for(i = 0; i < 100; i++)
+		{
+		  sprintf(fn,"%s/%d",p,i);  
+		  
+		  if(i & 1)
+		  {
+			  h = yaffs_open(fn,O_CREAT | O_TRUNC | O_RDWR, S_IREAD | S_IWRITE);
+			  for(k = 0; k < 1000; k++)
+				  yaffs_write(h,fn,100);
+			  yaffs_close(h);
+		  }
+		  else
+		    	yaffs_mkdir(fn,0);
+		}
+		
+		for(i = 0; i < 10; i++)
+		{
+		  sprintf(fn,"%s/%d",p,i);  
+		  if(i & 1) 
+		  	yaffs_unlink(fn);
+		  else
+		  	yaffs_rmdir(fn);
+		  
+		}
+				
+		yaffs_unmount(mountpt);
+	}
+	
+	
+	
+
+}
+
 int main(int argc, char *argv[])
 {
 	//return long_test(argc,argv);
 	
 	//return cache_read_test();
 	
-	//return resize_stress_test_no_grow("/flash",2);
+	//resize_stress_test_no_grow("/flash",2);
 	
-
+	//huge_directory_test_on_path("/ram2k");
 	
-	scan_pattern_test("/ram2k",40000,10);
+	 //yaffs_backward_scan_test("/flash")	;
+	 
+	 //scan_pattern_test("/flash",10000,10);
 	//short_scan_test("/flash",40000,200);
-	return 0;
+
+	
+	//long_test_on_path("/ram2k");
+	//long_test_on_path("/flash");
+	scan_deleted_files_test("/flash");
+	
 	
-	long_test_on_path("/ram2k");
-	long_test_on_path("/ram2k");
 	
 	// cache_bypass_bug_test();
 	
-	 free_space_check();
+	 //free_space_check();
 	 
 	 return 0;
 	
diff --git a/direct/yaffs_fileem2k.c b/direct/yaffs_fileem2k.c
index 0a9b9e3..786094b 100644
--- a/direct/yaffs_fileem2k.c
+++ b/direct/yaffs_fileem2k.c
@@ -15,7 +15,7 @@
 // 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.2 2004-11-22 03:22:25 charles Exp $";
+const char *yaffs_flashif_c_version = "$Id: yaffs_fileem2k.c,v 1.3 2005-07-03 05:48:11 charles Exp $";
 
 
 #include "yportenv.h"
@@ -133,7 +133,7 @@ int yflash_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8
 	{
 		pos = chunkInNAND * PAGE_SIZE + PAGE_DATA_SIZE;
 		lseek(filedisk.handle,pos,SEEK_SET);
-		if(dev->isYaffs2)
+		if( 0 && dev->isYaffs2)
 		{
 			
 			written = write(filedisk.handle,tags,sizeof(yaffs_ExtendedTags));
@@ -207,7 +207,7 @@ int yflash_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *da
 	{
 		pos = chunkInNAND * PAGE_SIZE + PAGE_DATA_SIZE;
 		lseek(filedisk.handle,pos,SEEK_SET);
-		if(dev->isYaffs2)
+		if(0 && dev->isYaffs2)
 		{
 			nread= read(filedisk.handle,tags,sizeof(yaffs_ExtendedTags));
 			if(nread != sizeof(yaffs_ExtendedTags)) return YAFFS_FAIL;
diff --git a/direct/yaffs_fileem2k.h b/direct/yaffs_fileem2k.h
index 6aa731f..febbf84 100644
--- a/direct/yaffs_fileem2k.h
+++ b/direct/yaffs_fileem2k.h
@@ -17,7 +17,7 @@
 
 #if 1
 
-#define SIZE_IN_MB 512
+#define SIZE_IN_MB 32
 #define PAGE_DATA_SIZE (2048)
 #define PAGE_SPARE_SIZE  (64)
 #define PAGE_SIZE  (PAGE_DATA_SIZE + PAGE_SPARE_SIZE)
diff --git a/direct/yaffscfg2k.c b/direct/yaffscfg2k.c
index f51c0c4..2bf5f33 100644
--- a/direct/yaffscfg2k.c
+++ b/direct/yaffscfg2k.c
@@ -13,7 +13,7 @@
 
 #include <errno.h>
 
-unsigned yaffs_traceMask = 0xFFFFFFFF;
+unsigned yaffs_traceMask = YAFFS_TRACE_SCAN |  YAFFS_TRACE_GC | YAFFS_TRACE_GC_DETAIL | YAFFS_TRACE_WRITE | YAFFS_TRACE_ERASE | YAFFS_TRACE_TRACING | YAFFS_TRACE_ALLOCATE;
 
 
 void yaffsfs_SetError(int err)
@@ -120,7 +120,7 @@ int yaffs_StartUp(void)
 	flashDev.nReservedBlocks = 5;
 	flashDev.startBlock = 64; // First block after /boot
 	//flashDev.endBlock = 127; // Last block in 16MB
-	flashDev.endBlock = (512 * 1024 * 1024)/(flashDev.nBytesPerChunk * flashDev.nChunksPerBlock) - 1; // Last block in 512MB
+	flashDev.endBlock = (32 * 1024 * 1024)/(flashDev.nBytesPerChunk * flashDev.nChunksPerBlock) - 1; // Last block in 512MB
 	flashDev.isYaffs2 = 1;
 	flashDev.nShortOpCaches = 10; // Use caches
 	flashDev.genericDevice = (void *) 2;	// Used to identify the device in fstat.
diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index 45539db..9109da7 100644
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -25,7 +25,7 @@
 #endif
 
 
-const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.3 2005-04-24 09:18:52 charles Exp $";
+const char *yaffsfs_c_version="$Id: yaffsfs.c,v 1.4 2005-07-03 05:48:11 charles Exp $";
 
 // configurationList is the list of devices that are supported
 static yaffsfs_DeviceConfiguration *yaffsfs_configurationList;
@@ -578,6 +578,7 @@ int yaffs_write(int fd, const void *buf, unsigned int nbyte)
 	yaffs_Object *obj = NULL;
 	int pos = 0;
 	int nWritten = -1;
+	int writeThrough = 0;
 	
 	yaffsfs_Lock();
 	h = yaffsfs_GetHandlePointer(fd);
@@ -603,7 +604,7 @@ int yaffs_write(int fd, const void *buf, unsigned int nbyte)
 			pos = h->position;
 		}
 		
-		nWritten = yaffs_WriteDataToFile(obj,buf,pos,nbyte);
+		nWritten = yaffs_WriteDataToFile(obj,buf,pos,nbyte,writeThrough);
 		
 		if(nWritten >= 0)
 		{
diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
new file mode 100644
index 0000000..2b39af5
--- /dev/null
+++ b/direct/ydirectenv.h
@@ -0,0 +1,74 @@
+/*
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
+ * ydirectenv.h: Environment wrappers for direct.
+ *
+ * Copyright (C) 2002 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 Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ *
+ * $Id: ydirectenv.h,v 1.1 2005-07-03 05:48:11 charles Exp $
+ *
+ */
+ 
+#ifndef __YDIRECTENV_H__
+#define __YDIRECTENV_H__
+
+// Direct interface
+
+#include "devextras.h"
+
+#include "stdlib.h"
+#include "stdio.h"
+#include "string.h"
+
+#define YCHAR char
+#define YUCHAR unsigned char
+#define _Y(x) x
+#define yaffs_strcpy(a,b)    strcpy(a,b)
+#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
+#define yaffs_strlen(s)	     strlen(s)
+#define yaffs_sprintf	     sprintf
+#define yaffs_toupper(a)     toupper(a)
+
+#define Y_INLINE inline
+
+
+#define YMALLOC(x) malloc(x)
+#define YFREE(x)   free(x)
+
+
+//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s))
+//#define YALERT(s) YINFO(s)
+
+
+#define TENDSTR "\n"
+#define TSTR(x) x
+#define TOUT(p) printf p
+
+
+#define YAFFS_LOSTNFOUND_NAME		"lost+found"
+#define YAFFS_LOSTNFOUND_PREFIX		"obj"
+//#define YPRINTF(x) printf x
+
+#include "yaffscfg.h"
+
+#define Y_CURRENT_TIME yaffsfs_CurrentTime()
+#define Y_TIME_CONVERT(x) x
+
+#define YAFFS_ROOT_MODE				0666
+#define YAFFS_LOSTNFOUND_MODE		0666
+
+#define yaffs_SumCompare(x,y) ((x) == (y))
+#define yaffs_strcmp(a,b) strcmp(a,b)
+
+#endif
+
+