projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated is_yaffs_working_test_fix
[yaffs2.git]
/
direct
/
ydirectenv.h
diff --git
a/direct/ydirectenv.h
b/direct/ydirectenv.h
index b2293a62fbdf4236092590d21e67ed5c451d93a7..b477343d683f52f8f2d710603321c7feaa4426ec 100644
(file)
--- a/
direct/ydirectenv.h
+++ b/
direct/ydirectenv.h
@@
-1,8
+1,7
@@
/*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system.
*
/*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system.
*
- * Copyright (C) 2002-2011 Aleph One Ltd.
- * for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
*
* Created by Charles Manning <charles@aleph1.co.uk>
*
*
* Created by Charles Manning <charles@aleph1.co.uk>
*
@@
-39,6
+38,9
@@
void yaffs_bug_fn(const char *file_name, int line_no);
#define Y_LOFF_T loff_t
#endif
#define Y_LOFF_T loff_t
#endif
+/* Some RTOSs (eg. VxWorks) need strnlen. */
+size_t strnlen(const char *s, size_t maxlen);
+
#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_strcat(a, b) strcat(a, b)
#define yaffs_strcpy(a, b) strcpy(a, b)
#define yaffs_strncpy(a, b, c) strncpy(a, b, c)
@@
-54,10
+56,7
@@
void yaffs_bug_fn(const char *file_name, int line_no);
#define hweight8(x) yaffs_hweight8(x)
#define hweight32(x) yaffs_hweight32(x)
#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 sort(base, n, sz, cmp_fn, swp) qsort(base, n, sz, cmp_fn)
#define YAFFS_PATH_DIVIDERS "/"
#define YAFFS_PATH_DIVIDERS "/"
@@
-74,11
+73,15
@@
void yaffs_qsort(void *aa, size_t n, size_t es,
#define cond_resched() do {} while (0)
#define cond_resched() do {} while (0)
+#ifdef CONFIG_YAFFS_NO_TRACE
+#define yaffs_trace(...) do { } while (0)
+#else
#define yaffs_trace(msk, fmt, ...) do { \
if (yaffs_trace_mask & (msk)) \
printf("yaffs: " fmt "\n", ##__VA_ARGS__); \
} while (0)
#define yaffs_trace(msk, fmt, ...) do { \
if (yaffs_trace_mask & (msk)) \
printf("yaffs: " fmt "\n", ##__VA_ARGS__); \
} while (0)
+#endif
#define YAFFS_LOSTNFOUND_NAME "lost+found"
#define YAFFS_LOSTNFOUND_PREFIX "obj"
#define YAFFS_LOSTNFOUND_NAME "lost+found"
#define YAFFS_LOSTNFOUND_PREFIX "obj"