X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fydirectenv.h;h=7860b848f21548cc4c6f3432425e839c94893344;hp=3c6ddf566a8b3d713bc0019c19d37e5e933ab4d1;hb=121c055437f23d9d6bc7b57d36ecf128b447013f;hpb=3c25b14489d1ef9c4ba073dacd9a9f8bb218fe32

diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
index 3c6ddf5..7860b84 100644
--- a/direct/ydirectenv.h
+++ b/direct/ydirectenv.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>
@@ -29,8 +29,8 @@
 #include "yaffs_hweight.h"
 
 #include "assert.h"
-#define YBUG() assert(0)
-//#define YBUG() do { *((int *)0) =1;} while(0)
+#define BUG() assert(0)
+//#define BUG() do { *((int *)0) =1;} while(0)
 
 
 #define YCHAR char
@@ -61,7 +61,7 @@ void yaffs_qsort(void *aa, size_t n, size_t es,
 #define cond_resched()  do {} while(0)
 
 #define yaffs_trace(msk, fmt, ...) do { \
-	if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \
+	if(yaffs_trace_mask & (msk)) \
 		printf("yaffs: " fmt "\n", ##__VA_ARGS__); \
 } while(0)