From: Charles Manning <cdhmanning@gmail.com>
Date: Wed, 3 Nov 2010 03:21:38 +0000 (+1300)
Subject: Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
X-Git-Tag: linux-mainline-patchset-4~132
X-Git-Url: https://yaffs.net/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=5409719091c79983abc45bcc3070bce6786c8278;hp=73c54aa8c1de3f61a4c211cd47431293a6092f18

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

diff --git a/direct/python/yaffs_python_helper.c b/direct/python/yaffs_python_helper.c
index ad7e5cc..7c2c7e0 100644
--- 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 5c583b9..b187142 100644
--- 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 d8a4d0f..50b5cbc 100644
--- 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