*** empty log message ***

diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
new file mode 100644 (file)
index 0000000..08f4b57
--- /dev/null
+++ b/direct/ydirectenv.h
@@ -0,0 +1,56 @@
+/*
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
+ * ydirectenv.h: Environment wrappers for direct.
+ *
+ * Copyright (C) 2002 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ *
+ * $Id: ydirectenv.h,v 1.1 2004-09-19 09:21:38 charles Exp $
+ *
+ */
+ 
+#ifndef __YDIRECTENV_H__
+#define __YDIRECTENV_H__
+
+// 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)
+
+#endif

diff --git a/wince/ywinceenv.h b/wince/ywinceenv.h
new file mode 100644 (file)
index 0000000..33fee72
--- /dev/null
+++ b/wince/ywinceenv.h
@@ -0,0 +1,72 @@
+/*
+ * YAFFS: Yet another FFS. A NAND-flash specific file system. 
+ * ywinceenv.h: Port of functions to WinCE
+ *
+ * Copyright (C) 2002 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1 as
+ * published by the Free Software Foundation.
+ *
+ *
+ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
+ *
+ * $Id: ywinceenv.h,v 1.1 2004-09-19 09:21:38 charles Exp $
+ *
+ */
+ 
+#ifndef __YWINCEENV_H__
+#define __YWINCEENV_H__
+
+// 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)     RETAILMSG(1,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)
+
+#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: %s %d" TENDSTR),TEXT(__FILE__),__LINE__))
+
+#endif

diff --git a/yportenv.h b/yportenv.h
index f95c6eebd06f5cd5d75a85603b9e12d3715a99ec..6f80d2bdb3277911520f63756ecb20a5dd77dc63 100644 (file)
--- 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.10 2003-01-31 03:30:33 charles Exp $
+ * $Id: yportenv.h,v 1.11 2004-09-19 09:21:33 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)     RETAILMSG(1,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__
 
@@ -105,36 +60,7 @@ extern unsigned yfsd_U32FileTimeNow(void);
 #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)
+#include "ydirectenv.h"
 
 #elif defined CONFIG_YAFFS_UTIL
 
@@ -191,14 +117,9 @@ 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