X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fydirectenv.h;h=ee6e8f5a2912d3d56713a1eed42828ee5390c7fa;hp=3c009a48f28ca950a54bb184921dfa57f1897193;hb=ad412430513cae4adb7d0b9854fcd478ee35c129;hpb=fb8d28fbcc2aec0d05b0aa547bd81a97ab289ca3

diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
index 3c009a4..ee6e8f5 100644
--- a/direct/ydirectenv.h
+++ b/direct/ydirectenv.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
- * Copyright (C) 2002-2007 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>
@@ -22,8 +22,6 @@
 
 // Direct interface
 
-#include "devextras.h"
-
 #include "stdlib.h"
 #include "stdio.h"
 #include "string.h"
@@ -41,16 +39,21 @@
 #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_strnlen(s,m)	     strnlen(s,m)
 #define yaffs_sprintf	     sprintf
 #define yaffs_toupper(a)     toupper(a)
 
+void yaffs_qsort(void *aa, size_t n, size_t es,
+        int (*cmp)(const void *, const void *));
+
+#define yaffs_sort(base, n, sz, cmp_fn) yaffs_qsort(base, n, sz, cmp_fn)
+        
 #define YAFFS_PATH_DIVIDERS  "/"
 
 #ifdef NO_Y_INLINE
 #define Y_INLINE
 #else
-#define Y_INLINE inline
+#define Y_INLINE __inline__
 #endif
 
 #define YMALLOC(x) yaffs_malloc(x)
@@ -86,9 +89,14 @@
 #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 "yaffs_list.h"
+
+
+#include "yaffsfs.h"
+
 #endif