yaffs: Merge branch 'python_play'

[yaffs2.git] / direct / ydirectenv.h

diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
index d05912643be2503de11fe8af442c8772d97e732a..824ce20ed2b232a9dd99832b0704a93e766453de 100644 (file)
--- a/direct/ydirectenv.h
+++ b/direct/ydirectenv.h
@@ -1,8 +1,7 @@
 /*
- * YAFFS: Yet another FFS. A NAND-flash specific file system. 
- * ydirectenv.h: Environment wrappers for direct.
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -11,42 +10,53 @@
  * 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.3 2006-05-21 09:39:12 charles Exp $
- *
  */
- 
+
+/*
+ * ydirectenv.h: Environment wrappers for YAFFS direct.
+ */
+
 #ifndef __YDIRECTENV_H__
 #define __YDIRECTENV_H__
 
 // Direct interface
 
-#include "devextras.h"
-
 #include "stdlib.h"
 #include "stdio.h"
 #include "string.h"
+#include "yaffs_malloc.h"
+
+#include "assert.h"
+#define YBUG() assert(0)
+//#define YBUG() do { *((int *)0) =1;} while(0)
+
 
 #define YCHAR char
 #define YUCHAR unsigned char
 #define _Y(x) x
+#define yaffs_strcat(a,b)    strcat(a,b)
 #define yaffs_strcpy(a,b)    strcpy(a,b)
 #define yaffs_strncpy(a,b,c) strncpy(a,b,c)
-#define yaffs_strlen(s)             strlen(s)
+#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
+#define yaffs_strnlen(s,m)          strnlen(s,m)
 #define yaffs_sprintf       sprintf
 #define yaffs_toupper(a)     toupper(a)
 
-#define Y_INLINE inline
+#define YAFFS_PATH_DIVIDERS  "/"
 
+#ifdef NO_Y_INLINE
+#define Y_INLINE
+#else
+#define Y_INLINE __inline__
+#endif
 
-#define YMALLOC(x) malloc(x)
+#define YMALLOC(x) yaffs_malloc(x)
 #define YFREE(x)   free(x)
-#define YMALLOC_ALT(x) malloc(x)
+#define YMALLOC_ALT(x) yaffs_malloc(x)
 #define YFREE_ALT(x)   free(x)
 
-#define YMALLOC_DMA(x) malloc(x)
+#define YMALLOC_DMA(x) yaffs_malloc(x)
 
 #define YYIELD()  do {} while(0)
 
@@ -58,6 +68,7 @@
 
 #define TENDSTR "\n"
 #define TSTR(x) x
+#define TCONT(x) x
 #define TOUT(p) printf p
 
 
@@ -73,9 +84,11 @@
 #define YAFFS_ROOT_MODE                                0666
 #define YAFFS_LOSTNFOUND_MODE          0666
 
-#define yaffs_SumCompare(x,y) ((x) == (y))
+#define yaffs_sum_cmp(x,y) ((x) == (y))
 #define yaffs_strcmp(a,b) strcmp(a,b)
 
+#include "yaffsfs.h"
+
 #endif