yaffs: Remove a whole lot of function wrappers and forward declarations

[yaffs2.git] / direct / ydirectenv.h

diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
index be80e68c9eec74d2d1653681821db87a3da88b10..536ff22068c4a2d1be86b151133023fc55f8d94f 100644 (file)
--- a/direct/ydirectenv.h
+++ b/direct/ydirectenv.h
@@ -26,6 +26,7 @@
 #include "stdio.h"
 #include "string.h"
 #include "yaffs_osglue.h"
+#include "yaffs_hweight.h"
 
 #include "assert.h"
 #define YBUG() assert(0)
@@ -35,18 +36,14 @@
 #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_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 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 yaffs_sort(base, n, sz, cmp_fn) yaffs_qsort(base, n, sz, cmp_fn)
+#define sort(base, n, sz, cmp_fn, swp) yaffs_qsort(base, n, sz, cmp_fn)
         
 #define YAFFS_PATH_DIVIDERS  "/"
 
@@ -56,14 +53,12 @@ void yaffs_qsort(void *aa, size_t n, size_t es,
 #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 YMALLOC_DMA(x) yaffs_malloc(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 YYIELD()  do {} while(0)
+#define cond_resched()  do {} while(0)
 
 
 
@@ -89,12 +84,8 @@ void yaffs_qsort(void *aa, size_t n, size_t es,
 #define YAFFS_ROOT_MODE                                0666
 #define YAFFS_LOSTNFOUND_MODE          0666
 
-#define yaffs_sum_cmp(x,y) ((x) == (y))
-#define yaffs_strcmp(a,b) strcmp(a,b)
-
 #include "yaffs_list.h"
 
-
 #include "yaffsfs.h"
 
 #endif