X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=yportenv.h;h=f95c6eebd06f5cd5d75a85603b9e12d3715a99ec;hb=37122d7644239983d55096a85bca6fb8e248cf20;hp=943cffe5071b90a35636ec45779dd248faca3648;hpb=ce96b5b9742c81cad6d902eaf793b792c1b8943b;p=yaffs%2F.git

diff --git a/yportenv.h b/yportenv.h
index 943cffe..f95c6ee 100644
--- a/yportenv.h
+++ b/yportenv.h
@@ -15,7 +15,7 @@
  *
  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  *
- * $Id: yportenv.h,v 1.7 2002-11-26 01:15:37 charles Exp $
+ * $Id: yportenv.h,v 1.10 2003-01-31 03:30:33 charles Exp $
  *
  */
  
@@ -30,6 +30,8 @@
 #include "stdio.h"
 #include "string.h"
 
+#define CONFIG_YAFFS_CASE_INSENSITIVE
+
 #define YMALLOC(x) malloc(x)
 #define YFREE(x)   free(x)
 
@@ -42,7 +44,7 @@
 #define YAFFS_LOSTNFOUND_NAME		"Lost Clusters"
 #define YAFFS_LOSTNFOUND_PREFIX		"OBJ"
 
-#define YPRINTF(x)
+#define YPRINTF(x)	RETAILMSG(1,x)
 
 // Always pass the sum compare to overcome the case insensitivity issue
 #define yaffs_SumCompare(x,y) ((x) == (y))
@@ -100,9 +102,44 @@ extern unsigned yfsd_U32FileTimeNow(void);
 #define TOUT(p) printk p
 
 
-#else
+#elif defined CONFIG_YAFFS_DIRECT
+
+// Direct interface
+
+#include "stdlib.h"
+#include "stdio.h"
+#include "string.h"
+
+#define YMALLOC(x) malloc(x)
+#define YFREE(x)   free(x)
+
+
+//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s))
+//#define YALERT(s) YINFO(s)
+
+
+#define TENDSTR "\n"
+#define TSTR(x) x
+#define TOUT(p) printf p
+
+
+#define YAFFS_LOSTNFOUND_NAME		"lost+found"
+#define YAFFS_LOSTNFOUND_PREFIX		"obj"
+//#define YPRINTF(x) printf x
+
+#include "yaffscfg.h"
+
+#define CURRENT_TIME yaffsfs_CurrentTime()
+#define YAFFS_ROOT_MODE				0666
+#define YAFFS_LOSTNFOUND_MODE		0666
+
+#define yaffs_SumCompare(x,y) ((x) == (y))
+#define yaffs_strcmp(a,b) strcmp(a,b)
+
+#elif defined CONFIG_YAFFS_UTIL
+
+// Stuff for YAFFS utilities
 
-// Linux application
 #include "stdlib.h"
 #include "stdio.h"
 #include "string.h"
@@ -124,6 +161,7 @@ extern unsigned yfsd_U32FileTimeNow(void);
 #define YAFFS_LOSTNFOUND_PREFIX		"obj"
 //#define YPRINTF(x) printf x
 
+
 #define CURRENT_TIME 0
 #define YAFFS_ROOT_MODE				0666
 #define YAFFS_LOSTNFOUND_MODE		0666
@@ -131,6 +169,10 @@ extern unsigned yfsd_U32FileTimeNow(void);
 #define yaffs_SumCompare(x,y) ((x) == (y))
 #define yaffs_strcmp(a,b) strcmp(a,b)
 
+#else
+// Should have specified a configuration type
+#error Unknown configuration
+
 #endif 
 
 
@@ -142,6 +184,7 @@ extern unsigned yaffs_traceMask;
 #define YAFFS_TRACE_SCAN		0x0008
 #define YAFFS_TRACE_BAD_BLOCKS	0x0010
 #define YAFFS_TRACE_ERASE		0x0020
+#define YAFFS_TRACE_GC			0x0040
 #define YAFFS_TRACE_TRACING		0x0100
 #define YAFFS_TRACE_ALWAYS		0x0200
 #define YAFFS_TRACE_BUG			0x8000