projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[kernel] generic-2.6: sync yaffs code with the official CVS tree
[openwrt.git]
/
target
/
linux
/
generic-2.6
/
files
/
fs
/
yaffs2
/
yportenv.h
diff --git
a/target/linux/generic-2.6/files/fs/yaffs2/yportenv.h
b/target/linux/generic-2.6/files/fs/yaffs2/yportenv.h
index
e5e3dbe
..
097b2a6
100644
(file)
--- a/
target/linux/generic-2.6/files/fs/yaffs2/yportenv.h
+++ b/
target/linux/generic-2.6/files/fs/yaffs2/yportenv.h
@@
-1,5
+1,5
@@
/*
/*
- * 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-2007 Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Copyright (C) 2002-2007 Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
@@
-17,6
+17,14
@@
#ifndef __YPORTENV_H__
#define __YPORTENV_H__
#ifndef __YPORTENV_H__
#define __YPORTENV_H__
+/*
+ * Define the MTD version in terms of Linux Kernel versions
+ * This allows yaffs to be used independantly of the kernel
+ * as well as with it.
+ */
+
+#define MTD_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+
#if defined CONFIG_YAFFS_WINCE
#include "ywinceenv.h"
#if defined CONFIG_YAFFS_WINCE
#include "ywinceenv.h"
@@
-26,12
+34,16
@@
#include "moduleconfig.h"
/* Linux kernel */
#include "moduleconfig.h"
/* Linux kernel */
+
#include <linux/version.h>
#include <linux/version.h>
+#define MTD_VERSION_CODE LINUX_VERSION_CODE
+
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19))
#include <linux/config.h>
#endif
#include <linux/kernel.h>
#include <linux/mm.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>
#include <linux/string.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
@@
-89,6
+101,8
@@
#elif defined CONFIG_YAFFS_DIRECT
#elif defined CONFIG_YAFFS_DIRECT
+#define MTD_VERSION_CODE MTD_VERSION(2,6,22)
+
/* Direct interface */
#include "ydirectenv.h"
/* Direct interface */
#include "ydirectenv.h"
@@
-149,7
+163,7
@@
extern unsigned int yaffs_wr_attempts;
* Tracing flags.
* The flags masked in YAFFS_TRACE_ALWAYS are always traced.
*/
* Tracing flags.
* The flags masked in YAFFS_TRACE_ALWAYS are always traced.
*/
-
+
#define YAFFS_TRACE_OS 0x00000002
#define YAFFS_TRACE_ALLOCATE 0x00000004
#define YAFFS_TRACE_SCAN 0x00000008
#define YAFFS_TRACE_OS 0x00000002
#define YAFFS_TRACE_ALLOCATE 0x00000004
#define YAFFS_TRACE_SCAN 0x00000008
@@
-179,8
+193,8
@@
extern unsigned int yaffs_wr_attempts;
#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
#define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
-#ifndef
CONFIG_YAFFS_WINCE
-#define YBUG()
T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__)
)
+#ifndef
YBUG
+#define YBUG()
do {T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__));} while(0
)
#endif
#endif
#endif
#endif
This page took
0.024042 seconds
and
4
git commands to generate.