X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yportenv_multi.h;h=79c746254c71689b6cc722095cdb732ad7acf4a0;hp=3295ca0aeebc13e118001cdebe94ef38eec835a0;hb=fb1a7ee223619260cfd9b6366fd78747cc572cd5;hpb=4aab7ea4c9b8fb1bb9b375476a9faf70d29871b1

diff --git a/yportenv_multi.h b/yportenv_multi.h
index 3295ca0..79c7462 100644
--- a/yportenv_multi.h
+++ b/yportenv_multi.h
@@ -13,7 +13,6 @@
  * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
  */
 
-
 #ifndef __YPORTENV_H__
 #define __YPORTENV_H__
 
@@ -54,34 +53,17 @@
 #include <linux/fs.h>
 #include <linux/stat.h>
 #include <linux/sort.h>
+#include <linux/bitops.h>
 
 #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
@@ -95,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
@@ -120,20 +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
@@ -153,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 */
@@ -177,7 +158,7 @@
 #define O_RDWR		02
 #endif
 
-#ifndef O_CREAT		
+#ifndef O_CREAT
 #define O_CREAT 	0100
 #endif
 
@@ -229,7 +210,7 @@
 #define EACCES	13
 #endif
 
-#ifndef EXDEV	
+#ifndef EXDEV
 #define EXDEV	18
 #endif
 
@@ -273,7 +254,6 @@
 #define EISDIR 21
 #endif
 
-
 // Mode flags
 
 #ifndef S_IFMT
@@ -292,7 +272,7 @@
 #define S_IFREG		0100000
 #endif
 
-#ifndef S_IREAD 
+#ifndef S_IREAD
 #define S_IREAD		0000400
 #endif
 
@@ -340,5 +320,4 @@
 } while (0)
 #endif
 
-
 #endif