X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yportenv_single.h;h=d8194754a8f3c49dd20e28b982b681095b73191a;hp=378b73a55d50e2e35011da119483067ece110040;hb=79fcd0f8cc347e650e8ccdce12d7a350b8cc6008;hpb=fb1a7ee223619260cfd9b6366fd78747cc572cd5

diff --git a/yportenv_single.h b/yportenv_single.h
index 378b73a..d819475 100644
--- a/yportenv_single.h
+++ b/yportenv_single.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -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,25 +46,16 @@
 #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();\
+#ifdef CONFIG_YAFFS_DEBUG
+#define yaffs_trace(msk, fmt, ...) do { \
+	if (yaffs_trace_mask & (msk)) \
+		printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
+} while (0)
+#else
+#define yaffs_trace(msk, fmt, ...) do { \
 } while (0)
 #endif