Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2

diff --git a/direct/python/yaffs_python_helper.c b/direct/python/yaffs_python_helper.c
index ad7e5cc93c230758d1359285c90347bd14ef7b0f..7c2c7e06dca623085597ca9f407a55d2ce3655ec 100644 (file)
--- a/direct/python/yaffs_python_helper.c
+++ b/direct/python/yaffs_python_helper.c
@@ -47,8 +47,6 @@ int yaffs_O_WRONLY(void) { return O_WRONLY;}
 int yaffs_O_RDWR(void) { return O_RDWR;}
 int yaffs_O_TRUNC(void) { return O_TRUNC;}
 
-int yaffs_set_trace(unsigned int tm) { return yaffs_trace_mask=tm; }
-int yaffs_get_trace(void) { return yaffs_trace_mask; }
 
 int yaffs_S_IFMT(void){return S_IFMT;}
 int yaffs_S_IFLNK(void){return S_IFLNK;}

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index 5c583b9d39d44c9de2f16205c2756ce8c65a8148..b1871423e96de733ee74123f4f7f060389203bb4 100644 (file)
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -67,6 +67,18 @@ static yaffsfs_Inode yaffsfs_inode[YAFFSFS_N_HANDLES];
 static yaffsfs_Handle yaffsfs_handle[YAFFSFS_N_HANDLES];
 static int yaffsfs_handlesInitialised;
 
+unsigned int yaffs_trace_mask;
+
+int yaffs_set_trace(unsigned int tm) 
+{
+       return yaffs_trace_mask=tm;
+}
+
+unsigned int yaffs_get_trace(void)
+{
+       return yaffs_trace_mask;
+}
+
 /*
  * yaffsfs_InitHandle
  * Inilitalise handle management on start-up.

diff --git a/direct/yaffsfs.h b/direct/yaffsfs.h
index d8a4d0f2df25b5e8afb59fd431a4f476d765e379..50b5cbcd8eac356c859043a48bf76e45007e76d2 100644 (file)
--- a/direct/yaffsfs.h
+++ b/direct/yaffsfs.h
@@ -178,7 +178,9 @@ int yaffs_get_error(void);
 void * yaffs_getdev(const YCHAR *path);
 int yaffs_dump_dev(const YCHAR *path);
 
-
+/* Trace control functions */
+int yaffs_set_trace(unsigned int tm);
+unsigned int yaffs_get_trace(void);
 #endif