yaffs: Replace YBUG() with BUG()

[yaffs2.git] / yportenv_single.h

diff --git a/yportenv_single.h b/yportenv_single.h
index 378b73a55d50e2e35011da119483067ece110040..ebf56ca61fbd891676e60d4960227209b3fbff37 100644 (file)
--- a/yportenv_single.h
+++ b/yportenv_single.h
@@ -31,12 +31,11 @@
 #include <linux/sort.h>
 #include <linux/bitops.h>
 
+/*  These type wrappings are used to support Unicode names in WinCE. */
 #define YCHAR char
 #define YUCHAR unsigned char
 #define _Y(x)     x
 
-#define Y_INLINE __inline__
-
 #define YAFFS_LOSTNFOUND_NAME          "lost+found"
 #define YAFFS_LOSTNFOUND_PREFIX                "obj"
 
@@ -47,26 +46,14 @@
 #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)
-#endif
 
-#ifndef YBUG
-#define YBUG() do {\
-       T(YAFFS_TRACE_BUG,\
-               (TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),\
-               __LINE__));\
-       Y_DUMP_STACK();\
+#define yaffs_trace(msk, fmt, ...) do { \
+       if (yaffs_trace_mask & (msk)) \
+               printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
 } while (0)
-#endif
+
 
 #endif