X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fydirectenv.h;h=0c2820579eade2682159b932fd004c894c737212;hp=2b39af5f4cb07e7b349fb70d17179344a84bea68;hb=b0b91352fff81d01d34fd562629ce199c255cdd6;hpb=40b1e54e4e59aaeb6bafabcda5df47bddc5ecfee

diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
index 2b39af5..0c28205 100644
--- 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-2007 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -11,13 +10,13 @@
  * 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 2005-07-03 05:48:11 charles Exp $
- *
  */
- 
+
+/*
+ * ydirectenv.h: Environment wrappers for YAFFS direct.
+ */
+
 #ifndef __YDIRECTENV_H__
 #define __YDIRECTENV_H__
 
@@ -28,21 +27,36 @@
 #include "stdlib.h"
 #include "stdio.h"
 #include "string.h"
+#include "yaffs_malloc.h"
+
+#include "assert.h"
+#define YBUG() assert(1)
 
 #define YCHAR char
 #define YUCHAR unsigned char
 #define _Y(x) x
 #define yaffs_strcpy(a,b)    strcpy(a,b)
 #define yaffs_strncpy(a,b,c) strncpy(a,b,c)
+#define yaffs_strncmp(a,b,c) strncmp(a,b,c)
 #define yaffs_strlen(s)	     strlen(s)
 #define yaffs_sprintf	     sprintf
 #define yaffs_toupper(a)     toupper(a)
 
+#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) yaffs_malloc(x)
+#define YFREE_ALT(x)   free(x)
+
+#define YMALLOC_DMA(x) yaffs_malloc(x)
+
+#define YYIELD()  do {} while(0)
+
 
 
 //#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s))