yaffs Added more tests to direct/timothy_tests/mirror_tests

[yaffs2.git] / yportenv_single.h

diff --git a/yportenv_single.h b/yportenv_single.h
index 378b73a55d50e2e35011da119483067ece110040..236f5793eccfdc4d099918771d332eb5c55245a0 100644 (file)
--- a/yportenv_single.h
+++ b/yportenv_single.h
@@ -35,8 +35,6 @@
 #define YUCHAR unsigned char
 #define _Y(x)     x
 
-#define Y_INLINE __inline__
-
 #define YAFFS_LOSTNFOUND_NAME          "lost+found"
 #define YAFFS_LOSTNFOUND_PREFIX                "obj"
 
@@ -47,24 +45,24 @@
 #define Y_CURRENT_TIME CURRENT_TIME.tv_sec
 #define Y_TIME_CONVERT(x) (x).tv_sec
 
-
-#define TENDSTR "\n"
-#define TSTR(x) KERN_DEBUG x
-#define TCONT(x) x
-#define TOUT(p) printk p
-
 #define compile_time_assertion(assertion) \
        ({ int x = __builtin_choose_expr(assertion, 0, (void)0); (void) x; })
 
+
 #ifndef Y_DUMP_STACK
-#define Y_DUMP_STACK() do { } while (0)
+#define Y_DUMP_STACK() dump_stack()
 #endif
 
+#define yaffs_trace(msk, fmt, ...) do { \
+       if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \
+               printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
+} while(0)
+
 #ifndef YBUG
 #define YBUG() do {\
-       T(YAFFS_TRACE_BUG,\
-               (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),\
-               __LINE__));\
+       yaffs_trace(YAFFS_TRACE_BUG,\
+               "bug " __FILE__ " %d",\
+               __LINE__);\
        Y_DUMP_STACK();\
 } while (0)
 #endif