X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fydirectenv.h;h=b477343d683f52f8f2d710603321c7feaa4426ec;hp=561c8b552c2cd0bd7837a68d53b71e4d2c1fa9e5;hb=223ff79f689aba309ebc3ef856fb46095148d40e;hpb=f67d10d7a5a6d1cc7d1cb6eaada2522873ce5e99

diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
index 561c8b5..b477343 100644
--- a/direct/ydirectenv.h
+++ b/direct/ydirectenv.h
@@ -1,9 +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.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
@@ -11,65 +9,94 @@
  * 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.
- *
- * $Id: ydirectenv.h,v 1.2 2005-10-07 03:48:50 charles Exp $
- *
  */
- 
-#ifndef __YDIRECTENV_H__
-#define __YDIRECTENV_H__
 
-// Direct interface
+/*
+ * ydirectenv.h: Environment wrappers for YAFFS direct.
+ */
 
-#include "devextras.h"
+#ifndef __YDIRECTENV_H__
+#define __YDIRECTENV_H__
 
 #include "stdlib.h"
 #include "stdio.h"
 #include "string.h"
+#include "yaffs_osglue.h"
+#include "yaffs_hweight.h"
+
+void yaffs_bug_fn(const char *file_name, int line_no);
+
+#define BUG() do { yaffs_bug_fn(__FILE__, __LINE__); } while (0)
+
 
 #define YCHAR char
 #define YUCHAR unsigned char
 #define _Y(x) x
-#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_sprintf	     sprintf
-#define yaffs_toupper(a)     toupper(a)
 
-#define Y_INLINE inline
+#ifndef Y_LOFF_T
+#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_strnlen(s, m)	strnlen(s, m)
+#ifdef CONFIG_YAFFS_CASE_INSENSITIVE
+#define yaffs_strcmp(a, b)	strcasecmp(a, b)
+#define yaffs_strncmp(a, b, c)	strncasecmp(a, b, c)
+#else
+#define yaffs_strcmp(a, b)	strcmp(a, b)
+#define yaffs_strncmp(a, b, c)	strncmp(a, b, c)
+#endif
 
-#define YMALLOC(x) malloc(x)
-#define YFREE(x)   free(x)
-#define YMALLOC_ALT(x) malloc(x)
-#define YFREE_ALT(x)   free(x)
+#define hweight8(x)	yaffs_hweight8(x)
+#define hweight32(x)	yaffs_hweight32(x)
 
+#define sort(base, n, sz, cmp_fn, swp) qsort(base, n, sz, cmp_fn)
 
-//#define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s))
-//#define YALERT(s) YINFO(s)
+#define YAFFS_PATH_DIVIDERS  "/"
 
+#ifdef NO_inline
+#define inline
+#else
+#define inline __inline__
+#endif
 
-#define TENDSTR "\n"
-#define TSTR(x) x
-#define TOUT(p) printf p
+#define kmalloc(x, flags) yaffsfs_malloc(x)
+#define kfree(x)   yaffsfs_free(x)
+#define vmalloc(x) yaffsfs_malloc(x)
+#define vfree(x) yaffsfs_free(x)
 
+#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)
+
+#endif
 
 #define YAFFS_LOSTNFOUND_NAME		"lost+found"
 #define YAFFS_LOSTNFOUND_PREFIX		"obj"
-//#define YPRINTF(x) printf x
 
 #include "yaffscfg.h"
 
 #define Y_CURRENT_TIME yaffsfs_CurrentTime()
 #define Y_TIME_CONVERT(x) x
 
-#define YAFFS_ROOT_MODE				0666
+#define YAFFS_ROOT_MODE			0666
 #define YAFFS_LOSTNFOUND_MODE		0666
 
-#define yaffs_SumCompare(x,y) ((x) == (y))
-#define yaffs_strcmp(a,b) strcmp(a,b)
+#include "yaffs_list.h"
+
+#include "yaffsfs.h"
 
 #endif