summaryrefslogtreecommitdiff
path: root/yportenv_multi.h
diff options
context:
space:
mode:
authorCharles Manning <cdhmanning@gmail.com>2010-12-07 13:45:55 +1300
committerCharles Manning <cdhmanning@gmail.com>2010-12-07 13:45:55 +1300
commitfb1a7ee223619260cfd9b6366fd78747cc572cd5 (patch)
tree17b1408b4ecfa48a9ef57fa27663244c9483c3f0 /yportenv_multi.h
parent84f122f301b6a27295641fcbde3a6fbcfea78a99 (diff)
yaffs: Remove a whole lot of function wrappers and forward declarations
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Diffstat (limited to 'yportenv_multi.h')
-rw-r--r--yportenv_multi.h39
1 files changed, 11 insertions, 28 deletions
diff --git a/yportenv_multi.h b/yportenv_multi.h
index 4b058a7..79c7462 100644
--- a/yportenv_multi.h
+++ b/yportenv_multi.h
@@ -58,29 +58,12 @@
#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 yaffs_sort(base, n, sz, cmp_fn) sort(base, n, sz, cmp_fn, NULL)
#define Y_INLINE __inline__
#define YAFFS_LOSTNFOUND_NAME "lost+found"
#define YAFFS_LOSTNFOUND_PREFIX "obj"
-/* #define YPRINTF(x) printk x */
-#define YMALLOC(x) kmalloc(x, GFP_NOFS)
-#define YFREE(x) kfree(x)
-#define YMALLOC_ALT(x) vmalloc(x)
-#define YFREE_ALT(x) vfree(x)
-#define YMALLOC_DMA(x) YMALLOC(x)
-
-#define YYIELD() schedule()
-#define Y_DUMP_STACK() dump_stack()
#define YAFFS_ROOT_MODE 0755
#define YAFFS_LOSTNFOUND_MODE 0700
@@ -94,7 +77,7 @@
#endif
#define yaffs_sum_cmp(x, y) ((x) == (y))
-#define yaffs_strcmp(a, b) strcmp(a, b)
+#define strcmp(a, b) strcmp(a, b)
#define TENDSTR "\n"
#define TSTR(x) KERN_DEBUG x
@@ -119,19 +102,19 @@
#include "stdio.h"
#include "string.h"
-#define YMALLOC(x) malloc(x)
-#define YFREE(x) free(x)
-#define YMALLOC_ALT(x) malloc(x)
-#define YFREE_ALT(x) free(x)
+#define kmalloc(x) malloc(x)
+#define kfree(x) free(x)
+#define kmalloc_ALT(x) malloc(x)
+#define kfree_ALT(x) free(x)
#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_strnlen(s,m) strnlen(s,m)
-#define yaffs_sprintf sprintf
+#define strcat(a, b) strcat(a, b)
+#define strcpy(a, b) strcpy(a, b)
+#define strncpy(a, b, c) strncpy(a, b, c)
+#define strnlen(s,m) strnlen(s,m)
+#define sprintf sprintf
#define yaffs_toupper(a) toupper(a)
#define Y_INLINE inline
@@ -151,7 +134,7 @@
#define YAFFS_LOSTNFOUND_MODE 0700
#define yaffs_sum_cmp(x, y) ((x) == (y))
-#define yaffs_strcmp(a, b) strcmp(a, b)
+#define strcmp(a, b) strcmp(a, b)
#else
/* Should have specified a configuration type */