X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=yportenv.h;h=0c640372a2290c0030882405eda0c7b5eac07a18;hb=0446bf9a8d4cb2703587b7c99bd01270cfcd7d96;hp=63931749fc1d10964209153b7f370061048b84f7;hpb=4d9efb8e3f1bd240579632b4c1446d7384c3cc96;p=yaffs%2F.git

diff --git a/yportenv.h b/yportenv.h
index 6393174..0c64037 100644
--- a/yportenv.h
+++ b/yportenv.h
@@ -15,60 +15,17 @@
  *
  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  *
- * $Id: yportenv.h,v 1.5 2002-09-27 20:50:50 charles Exp $
+ * $Id: yportenv.h,v 1.12 2004-10-04 23:24:21 charles Exp $
  *
  */
  
-#ifndef __PORTENV_H__
-#define __PORTENV_H__
+#ifndef __YPORTENV_H__
+#define __YPORTENV_H__
 
 
-#if defined WIN32
-
-// Win32
-#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)
-
-#include <windows.h>
-
-#define YAFFS_LOSTNFOUND_NAME		"LOST_CLUSTERS"
-#define YAFFS_LOSTNFOUND_PREFIX		"OBJ"
-
-#define YPRINTF(x)
-
-// Always pass the sum compare to overcome the case insensitivity issue
-#define yaffs_SumCompare(x,y) 1
-#define yaffs_strcmp(a,b) _stricmp(a,b)
-
-
-#define u_char unsigned char
-#define loff_t int
-#define S_IFDIR						04000
-
-#define S_ISFIFO(x) 0
-#define S_ISCHR(x) 0
-#define S_ISBLK(x) 0
-#define S_ISSOCK(x) 0
-
-extern unsigned yfsd_U32FileTimeNow(void);
-
-#define CURRENT_TIME				 yfsd_U32FileTimeNow()
-#define YAFFS_ROOT_MODE				FILE_ATTRIBUTE_ARCHIVE
-#define YAFFS_LOSTNFOUND_MODE		(FILE_ATTRIBUTE_ARCHIVE | FILE_ATTRIBUTE_HIDDEN)
-
-
-#define TENDSTR "\r\n"
-#define TSTR(x) TEXT(x)
-#define T(x) RETAILMSG(1, x)
+#if defined CONFIG_YAFFS_WINCE
 
+#include "ywinceenv.h"
 
 #elif  defined __KERNEL__
 
@@ -76,13 +33,16 @@ extern unsigned yfsd_U32FileTimeNow(void);
 
 // Linux kernel
 #include "linux/kernel.h"
+#include "linux/version.h"
 #include "linux/mm.h"
 #include "linux/string.h"
 #include "linux/slab.h"
+
+
 #define YAFFS_LOSTNFOUND_NAME		"lost+found"
 #define YAFFS_LOSTNFOUND_PREFIX		"obj"
 
-#define YPRINTF(x) printk x
+//#define YPRINTF(x) printk x
 #define YMALLOC(x) kmalloc(x,GFP_KERNEL)
 #define YFREE(x)   kfree(x)
 
@@ -95,12 +55,18 @@ extern unsigned yfsd_U32FileTimeNow(void);
 
 #define TENDSTR "\n"
 #define TSTR(x) KERN_DEBUG x
-#define T(x) printk x
+#define TOUT(p) printk p
 
 
-#else
+#elif defined CONFIG_YAFFS_DIRECT
+
+// Direct interface
+#include "ydirectenv.h"
+
+#elif defined CONFIG_YAFFS_UTIL
+
+// Stuff for YAFFS utilities
 
-// Linux application
 #include "stdlib.h"
 #include "stdio.h"
 #include "string.h"
@@ -109,18 +75,19 @@ extern unsigned yfsd_U32FileTimeNow(void);
 #define YFREE(x)   free(x)
 
 
-#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s))
-#define YALERT(s) YINFO(s)
+//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s))
+//#define YALERT(s) YINFO(s)
 
 
 #define TENDSTR "\n"
 #define TSTR(x) x
-#define T(x) printf x
+#define TOUT(p) printf p
 
 
 #define YAFFS_LOSTNFOUND_NAME		"lost+found"
 #define YAFFS_LOSTNFOUND_PREFIX		"obj"
-#define YPRINTF(x) printf x
+//#define YPRINTF(x) printf x
+
 
 #define CURRENT_TIME 0
 #define YAFFS_ROOT_MODE				0666
@@ -129,17 +96,31 @@ extern unsigned yfsd_U32FileTimeNow(void);
 #define yaffs_SumCompare(x,y) ((x) == (y))
 #define yaffs_strcmp(a,b) strcmp(a,b)
 
-#endif 
+#else
+// Should have specified a configuration type
+#error Unknown configuration
 
+#endif 
 
 
-#undef YINFO
+extern unsigned yaffs_traceMask;
 
+#define YAFFS_TRACE_ERROR		0x0001
+#define YAFFS_TRACE_OS			0x0002
+#define YAFFS_TRACE_ALLOCATE	0x0004
+#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
 
-#define YINFO(s) YPRINTF((KERN_DEBUG __FILE__ " %d %s\n",__LINE__,s))
-#define YALERT(s) YINFO(s)
+#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ERROR)) TOUT(p);} while(0) 
 
-#define YBUG() do{YINFO("bug");} while(0)
 
+#ifndef CONFIG_YAFFS_WINCE
+#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
+#endif
 
 #endif