X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs%2F.git;a=blobdiff_plain;f=yportenv.h;h=1d4428f4f35dde299c4f48eed52b7015ba6522f8;hp=9b3e637e29547c155a5c8bc29a9be0981e35f56c;hb=7b5f93e758d963355b31ce0a1f0eafa16074f35d;hpb=657bdac1f20c85e9e0d06ef5fcdd49cec4d7627c

diff --git a/yportenv.h b/yportenv.h
index 9b3e637..1d4428f 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.9 2003-01-17 04:19:08 charles Exp $
+ * $Id: yportenv.h,v 1.14 2004-10-10 18:03:35 charles Exp $
  *
  */
  
@@ -25,52 +25,7 @@
 
 #if defined CONFIG_YAFFS_WINCE
 
-// CONFIG_YAFFS_WINCE
-#include "stdlib.h"
-#include "stdio.h"
-#include "string.h"
-
-#define CONFIG_YAFFS_CASE_INSENSITIVE
-
-#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) ((x) == (y))
-#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_HIDDEN
-
-
-#define TENDSTR L"\r\n"
-#define TSTR(x) TEXT(x)
-#define TOUT(x) RETAILMSG(1, x)
-
+#include "ywinceenv.h"
 
 #elif  defined __KERNEL__
 
@@ -78,6 +33,7 @@ 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"
@@ -93,6 +49,13 @@ extern unsigned yfsd_U32FileTimeNow(void);
 #define YAFFS_ROOT_MODE				0666
 #define YAFFS_LOSTNFOUND_MODE		0666
 
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
+#define Y_CURRENT_TIME CURRENT_TIME.tv_sec
+#define Y_TIME_CONVERT(x) (x).tv_sec
+#else
+#define Y_CURRENT_TIME CURRENT_TIME
+#define Y_TIME_CONVERT(x) (x)
+#endif
 
 #define yaffs_SumCompare(x,y) ((x) == (y))
 #define yaffs_strcmp(a,b) strcmp(a,b)
@@ -104,37 +67,8 @@ extern unsigned yfsd_U32FileTimeNow(void);
 
 #elif defined CONFIG_YAFFS_DIRECT
 
-// Directct 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)
+// Direct interface
+#include "ydirectenv.h"
 
 #elif defined CONFIG_YAFFS_UTIL
 
@@ -144,6 +78,8 @@ extern unsigned yfsd_U32FileTimeNow(void);
 #include "stdio.h"
 #include "string.h"
 
+#include "devextras.h"
+
 #define YMALLOC(x) malloc(x)
 #define YFREE(x)   free(x)
 
@@ -191,14 +127,11 @@ extern unsigned yaffs_traceMask;
 
 #define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ERROR)) TOUT(p);} while(0) 
 
-//#undef YINFO
-
 
-//#define YINFO(s) YPRINTF((KERN_DEBUG __FILE__ " %d %s\n",__LINE__,s))
-//#define YALERT(s) YINFO(s)
-#ifdef CONFIG_YAFFS_WINCE
-#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: %s %d" TENDSTR),TEXT(__FILE__),__LINE__))
-#else
+#ifndef CONFIG_YAFFS_WINCE
 #define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
 #endif
+
 #endif
+
+