X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fydirectenv.h;h=63cd6d85182b1f1b899af05a306e50a809e3a431;hp=536ff22068c4a2d1be86b151133023fc55f8d94f;hb=2899f1fb283094d96a13bc50fff5c03f2d85cdba;hpb=fb1a7ee223619260cfd9b6366fd78747cc572cd5

diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
index 536ff22..63cd6d8 100644
--- a/direct/ydirectenv.h
+++ b/direct/ydirectenv.h
@@ -47,10 +47,10 @@ void yaffs_qsort(void *aa, size_t n, size_t es,
         
 #define YAFFS_PATH_DIVIDERS  "/"
 
-#ifdef NO_Y_INLINE
-#define Y_INLINE
+#ifdef NO_inline
+#define inline
 #else
-#define Y_INLINE __inline__
+#define inline __inline__
 #endif
 
 #define kmalloc(x,flags) yaffs_malloc(x)
@@ -60,21 +60,14 @@ void yaffs_qsort(void *aa, size_t n, size_t es,
 
 #define cond_resched()  do {} while(0)
 
-
-
-//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s))
-//#define YALERT(s) YINFO(s)
-
-
-#define TENDSTR "\n"
-#define TSTR(x) x
-#define TCONT(x) x
-#define TOUT(p) printf p
+#define yaffs_trace(msk, fmt, ...) do { \
+	if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \
+		printf("yaffs: " fmt "\n", ##__VA_ARGS__); \
+} while(0)
 
 
 #define YAFFS_LOSTNFOUND_NAME		"lost+found"
 #define YAFFS_LOSTNFOUND_PREFIX		"obj"
-//#define YPRINTF(x) printf x
 
 #include "yaffscfg.h"