X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fydirectenv.h;h=536ff22068c4a2d1be86b151133023fc55f8d94f;hp=6a2bb182e8200e112fed98b8232c60e4eeed1fcd;hb=fb1a7ee223619260cfd9b6366fd78747cc572cd5;hpb=e8cfe05cf0d057f6978c37943e51b17bb14664e3

diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
index 6a2bb18..536ff22 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,43 +22,43 @@
 
 // Direct interface
 
-#include "devextras.h"
-
 #include "stdlib.h"
 #include "stdio.h"
 #include "string.h"
-#include "yaffs_malloc.h"
+#include "yaffs_osglue.h"
+#include "yaffs_hweight.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_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)
 
+#define hweight8(x)	yaffs_hweight8(x)
+#define hweight32(x)	yaffs_hweight32(x)
+
+void yaffs_qsort(void *aa, size_t n, size_t es,
+        int (*cmp)(const void *, const void *));
+
+#define sort(base, n, sz, cmp_fn, swp) 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)
-#define YFREE(x)   free(x)
-#define YMALLOC_ALT(x) yaffs_malloc(x)
-#define YFREE_ALT(x)   free(x)
+#define kmalloc(x,flags) yaffs_malloc(x)
+#define kfree(x)   yaffs_free(x)
+#define vmalloc(x) yaffs_malloc(x)
+#define vfree(x) yaffs_free(x)
 
-#define YMALLOC_DMA(x) yaffs_malloc(x)
-
-#define YYIELD()  do {} while(0)
+#define cond_resched()  do {} while(0)
 
 
 
@@ -68,6 +68,7 @@
 
 #define TENDSTR "\n"
 #define TSTR(x) x
+#define TCONT(x) x
 #define TOUT(p) printf p
 
 
@@ -83,8 +84,9 @@
 #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 "yaffs_list.h"
+
+#include "yaffsfs.h"
 
 #endif