u-boot: Update yaffs2 file system
This patch updates the yaffs2 in u-boot to correspond to
git://www.aleph1.co.uk/yaffs2
commit id 9ee5d0643e559568dbe62215f76e0a7bd5a63d93
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
diff --git a/fs/yaffs2/yportenv.h b/fs/yaffs2/yportenv.h
index bbab14d..b47a4d6 100644
--- a/fs/yaffs2/yportenv.h
+++ b/fs/yaffs2/yportenv.h
@@ -1,7 +1,7 @@
/*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system.
*
- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@ -17,177 +17,292 @@
#ifndef __YPORTENV_H__
#define __YPORTENV_H__
-/* XXX U-BOOT XXX */
-#ifndef CONFIG_YAFFS_DIRECT
-#define CONFIG_YAFFS_DIRECT
+
+/* Definition of types */
+#ifdef CONFIG_YAFFS_DEFINES_TYPES
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned u32;
#endif
+
+#ifdef CONFIG_YAFFS_PROVIDE_DEFS
+/* File types */
+
+
+#define DT_UNKNOWN 0
+#define DT_FIFO 1
+#define DT_CHR 2
+#define DT_DIR 4
+#define DT_BLK 6
+#define DT_REG 8
+#define DT_LNK 10
+#define DT_SOCK 12
+#define DT_WHT 14
+
+
+/*
+ * Attribute flags.
+ * These are or-ed together to select what has been changed.
+ */
+#define ATTR_MODE 1
+#define ATTR_UID 2
+#define ATTR_GID 4
+#define ATTR_SIZE 8
+#define ATTR_ATIME 16
+#define ATTR_MTIME 32
+#define ATTR_CTIME 64
+
+struct iattr {
+ unsigned int ia_valid;
+ unsigned ia_mode;
+ unsigned ia_uid;
+ unsigned ia_gid;
+ unsigned ia_size;
+ unsigned ia_atime;
+ unsigned ia_mtime;
+ unsigned ia_ctime;
+ unsigned int ia_attr_flags;
+};
+
+#endif
+
+
+
#if defined CONFIG_YAFFS_WINCE
#include "ywinceenv.h"
+
+#elif defined CONFIG_YAFFS_DIRECT
+
+/* Direct interface */
+#include "ydirectenv.h"
+
+#elif defined CONFIG_YAFFS_UTIL
+
-/* XXX U-BOOT XXX */
-#elif 0 /* defined __KERNEL__ */
+#include "yutilsenv.h"
-#include "moduleconfig.h"
+#else
+/* Should have specified a configuration type */
+#error Unknown configuration
-/* Linux kernel */
-#include <linux/version.h>
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
-#include <linux/config.h>
#endif
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/sched.h>
-#include <linux/string.h>
-#include <linux/slab.h>
-#include <linux/vmalloc.h>
-#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_strncmp(a,b,c) strncmp(a,b,c)
-#define yaffs_strlen(s) strlen(s)
-#define yaffs_sprintf sprintf
-#define yaffs_toupper(a) toupper(a)
+#if defined(CONFIG_YAFFS_DIRECT) || defined(CONFIG_YAFFS_WINCE)
-#define Y_INLINE inline
+#ifdef CONFIG_YAFFSFS_PROVIDE_VALUES
-#define YAFFS_LOSTNFOUND_NAME "lost+found"
-#define YAFFS_LOSTNFOUND_PREFIX "obj"
+#ifndef O_RDONLY
+#define O_RDONLY 00
+#endif
-/* #define YPRINTF(x) printk x */
-#define YMALLOC(x) kmalloc(x,GFP_KERNEL)
-#define YFREE(x) kfree(x)
-#define YMALLOC_ALT(x) vmalloc(x)
-#define YFREE_ALT(x) vfree(x)
-#define YMALLOC_DMA(x) YMALLOC(x)
+#ifndef O_WRONLY
+#define O_WRONLY 01
+#endif
-// KR - added for use in scan so processes aren't blocked indefinitely.
-#define YYIELD() schedule()
+#ifndef O_RDWR
+#define O_RDWR 02
+#endif
-#define YAFFS_ROOT_MODE 0666
-#define YAFFS_LOSTNFOUND_MODE 0666
+#ifndef O_CREAT
+#define O_CREAT 0100
+#endif
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0))
-#define Y_CURRENT_TIME CURRENT_TIME.tv_sec
-#define Y_TIME_CONVERT(x) (x).tv_sec
-#else
-#define Y_CURRENT_TIME CURRENT_TIME
-#define Y_TIME_CONVERT(x) (x)
+#ifndef O_EXCL
+#define O_EXCL 0200
#endif
-#define yaffs_SumCompare(x,y) ((x) == (y))
-#define yaffs_strcmp(a,b) strcmp(a,b)
+#ifndef O_TRUNC
+#define O_TRUNC 01000
+#endif
-#define TENDSTR "\n"
-#define TSTR(x) KERN_WARNING x
-#define TOUT(p) printk p
+#ifndef O_APPEND
+#define O_APPEND 02000
+#endif
-#define yaffs_trace(mask, fmt, args...) \
- do { if ((mask) & (yaffs_traceMask|YAFFS_TRACE_ERROR)) \
- printk(KERN_WARNING "yaffs: " fmt, ## args); \
- } while (0)
+#ifndef SEEK_SET
+#define SEEK_SET 0
+#endif
-#define compile_time_assertion(assertion) \
- ({ int x = __builtin_choose_expr(assertion, 0, (void)0); (void) x; })
+#ifndef SEEK_CUR
+#define SEEK_CUR 1
+#endif
-#elif defined CONFIG_YAFFS_DIRECT
+#ifndef SEEK_END
+#define SEEK_END 2
+#endif
-/* Direct interface */
-#include "ydirectenv.h"
+#ifndef EBUSY
+#define EBUSY 16
+#endif
-#elif defined CONFIG_YAFFS_UTIL
+#ifndef ENODEV
+#define ENODEV 19
+#endif
-/* Stuff for YAFFS utilities */
+#ifndef EINVAL
+#define EINVAL 22
+#endif
-#include "stdlib.h"
-#include "stdio.h"
-#include "string.h"
+#ifndef ENFILE
+#define ENFILE 23
+#endif
-#include "devextras.h"
+#ifndef EBADF
+#define EBADF 9
+#endif
-#define YMALLOC(x) malloc(x)
-#define YFREE(x) free(x)
-#define YMALLOC_ALT(x) malloc(x)
-#define YFREE_ALT(x) free(x)
+#ifndef EACCES
+#define EACCES 13
+#endif
-#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)
+#ifndef EXDEV
+#define EXDEV 18
+#endif
-#define Y_INLINE inline
+#ifndef ENOENT
+#define ENOENT 2
+#endif
-/* #define YINFO(s) YPRINTF(( __FILE__ " %d %s\n",__LINE__,s)) */
-/* #define YALERT(s) YINFO(s) */
+#ifndef ENOSPC
+#define ENOSPC 28
+#endif
-#define TENDSTR "\n"
-#define TSTR(x) x
-#define TOUT(p) printf p
+#ifndef EROFS
+#define EROFS 30
+#endif
-#define YAFFS_LOSTNFOUND_NAME "lost+found"
-#define YAFFS_LOSTNFOUND_PREFIX "obj"
-/* #define YPRINTF(x) printf x */
+#ifndef ERANGE
+#define ERANGE 34
+#endif
-#define YAFFS_ROOT_MODE 0666
-#define YAFFS_LOSTNFOUND_MODE 0666
+#ifndef ENODATA
+#define ENODATA 61
+#endif
-#define yaffs_SumCompare(x,y) ((x) == (y))
-#define yaffs_strcmp(a,b) strcmp(a,b)
+#ifndef ENOTEMPTY
+#define ENOTEMPTY 39
+#endif
-#else
-/* Should have specified a configuration type */
-#error Unknown configuration
+#ifndef ENAMETOOLONG
+#define ENAMETOOLONG 36
+#endif
+#ifndef ENOMEM
+#define ENOMEM 12
#endif
-/* see yaffs_fs.c */
-extern unsigned int yaffs_traceMask;
-extern unsigned int yaffs_wr_attempts;
+#ifndef EFAULT
+#define EFAULT 14
+#endif
-/*
- * Tracing flags.
- * The flags masked in YAFFS_TRACE_ALWAYS are always traced.
- */
+#ifndef EEXIST
+#define EEXIST 17
+#endif
-#define YAFFS_TRACE_OS 0x00000002
-#define YAFFS_TRACE_ALLOCATE 0x00000004
-#define YAFFS_TRACE_SCAN 0x00000008
-#define YAFFS_TRACE_BAD_BLOCKS 0x00000010
-#define YAFFS_TRACE_ERASE 0x00000020
-#define YAFFS_TRACE_GC 0x00000040
-#define YAFFS_TRACE_WRITE 0x00000080
-#define YAFFS_TRACE_TRACING 0x00000100
-#define YAFFS_TRACE_DELETION 0x00000200
-#define YAFFS_TRACE_BUFFERS 0x00000400
-#define YAFFS_TRACE_NANDACCESS 0x00000800
-#define YAFFS_TRACE_GC_DETAIL 0x00001000
-#define YAFFS_TRACE_SCAN_DEBUG 0x00002000
-#define YAFFS_TRACE_MTD 0x00004000
-#define YAFFS_TRACE_CHECKPOINT 0x00008000
+#ifndef ENOTDIR
+#define ENOTDIR 20
+#endif
-#define YAFFS_TRACE_VERIFY 0x00010000
-#define YAFFS_TRACE_VERIFY_NAND 0x00020000
-#define YAFFS_TRACE_VERIFY_FULL 0x00040000
-#define YAFFS_TRACE_VERIFY_ALL 0x000F0000
+#ifndef EISDIR
+#define EISDIR 21
+#endif
+#ifndef ELOOP
+#define ELOOP 40
+#endif
-#define YAFFS_TRACE_ERROR 0x40000000
-#define YAFFS_TRACE_BUG 0x80000000
-#define YAFFS_TRACE_ALWAYS 0xF0000000
+/* Mode flags */
-#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
+#ifndef S_IFMT
+#define S_IFMT 0170000
+#endif
+
+#ifndef S_IFSOCK
+#define S_IFSOCK 0140000
+#endif
+
+#ifndef S_IFIFO
+#define S_IFIFO 0010000
+#endif
+
+#ifndef S_IFCHR
+#define S_IFCHR 0020000
+#endif
+
+#ifndef S_IFBLK
+#define S_IFBLK 0060000
+#endif
+
+#ifndef S_IFLNK
+#define S_IFLNK 0120000
+#endif
+
+#ifndef S_IFDIR
+#define S_IFDIR 0040000
+#endif
+
+#ifndef S_IFREG
+#define S_IFREG 0100000
+#endif
+
+#define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
+#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+#define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
+#define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
+#define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
+
+
+#ifndef S_IREAD
+#define S_IREAD 0000400
+#endif
+
+#ifndef S_IWRITE
+#define S_IWRITE 0000200
+#endif
+
+#ifndef S_IEXEC
+#define S_IEXEC 0000100
+#endif
+
+#ifndef XATTR_CREATE
+#define XATTR_CREATE 1
+#endif
+
+#ifndef XATTR_REPLACE
+#define XATTR_REPLACE 2
+#endif
+
+#ifndef R_OK
+#define R_OK 4
+#define W_OK 2
+#define X_OK 1
+#define F_OK 0
+#endif
+
+#else
+#include <errno.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#endif
+
+#endif
+
+#ifndef Y_DUMP_STACK
+#define Y_DUMP_STACK() do { } while (0)
+#endif
-#ifndef CONFIG_YAFFS_WINCE
-#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
+#ifndef BUG
+#define BUG() do {\
+ yaffs_trace(YAFFS_TRACE_BUG,\
+ "==>> yaffs bug: " __FILE__ " %d",\
+ __LINE__);\
+ Y_DUMP_STACK();\
+} while (0)
#endif
#endif