projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs direct: Clean ups fixing stuff caught by Timthy's tests
[yaffs2.git]
/
direct
/
ydirectenv.h
diff --git
a/direct/ydirectenv.h
b/direct/ydirectenv.h
index 2b39af5f4cb07e7b349fb70d17179344a84bea68..ee6e8f5a2912d3d56713a1eed42828ee5390c7fa 100644
(file)
--- a/
direct/ydirectenv.h
+++ b/
direct/ydirectenv.h
@@
-1,8
+1,7
@@
/*
/*
- * YAFFS: Yet another FFS. A NAND-flash specific file system.
- * ydirectenv.h: Environment wrappers for direct.
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
*
*
- * Copyright (C) 2002 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>
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@
-11,38
+10,61
@@
* it under the terms of the GNU Lesser General Public License version 2.1 as
* published by the Free Software Foundation.
*
* it under the terms of the GNU Lesser General Public License version 2.1 as
* published by the Free Software Foundation.
*
- *
* Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
* Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
- *
- * $Id: ydirectenv.h,v 1.1 2005-07-03 05:48:11 charles Exp $
- *
*/
*/
-
+
+/*
+ * ydirectenv.h: Environment wrappers for YAFFS direct.
+ */
+
#ifndef __YDIRECTENV_H__
#define __YDIRECTENV_H__
// Direct interface
#ifndef __YDIRECTENV_H__
#define __YDIRECTENV_H__
// Direct interface
-#include "devextras.h"
-
#include "stdlib.h"
#include "stdio.h"
#include "string.h"
#include "stdlib.h"
#include "stdio.h"
#include "string.h"
+#include "yaffs_malloc.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 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_strcpy(a,b) strcpy(a,b)
#define yaffs_strncpy(a,b,c) strncpy(a,b,c)
-#define yaffs_strlen(s) strlen(s)
+#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_sprintf sprintf
#define yaffs_toupper(a) toupper(a)
-#define Y_INLINE inline
+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__
+#endif
-#define YMALLOC(x) malloc(x)
+#define YMALLOC(x)
yaffs_
malloc(x)
#define YFREE(x) free(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 YYIELD() do {} while(0)
+
//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s))
//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s))
@@
-51,6
+73,7
@@
#define TENDSTR "\n"
#define TSTR(x) x
#define TENDSTR "\n"
#define TSTR(x) x
+#define TCONT(x) x
#define TOUT(p) printf p
#define TOUT(p) printf p
@@
-66,9
+89,14
@@
#define YAFFS_ROOT_MODE 0666
#define YAFFS_LOSTNFOUND_MODE 0666
#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)
#define yaffs_strcmp(a,b) strcmp(a,b)
+#include "yaffs_list.h"
+
+
+#include "yaffsfs.h"
+
#endif
#endif