diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-06 12:52:39 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-06 12:52:39 +0000 |
| commit | 477d43b2817c17de1caaedc38e50c3e7235ee585 (patch) | |
| tree | 8ba415f294639d4cdc93d6fa0902215a61a63d12 /target/linux/generic-2.6/files/fs/yaffs2/yportenv.h | |
| parent | 306f3677ecbecce777f35bfe3a9475901055dff1 (diff) | |
| download | upstream-477d43b2817c17de1caaedc38e50c3e7235ee585.tar.gz upstream-477d43b2817c17de1caaedc38e50c3e7235ee585.tar.bz2 upstream-477d43b2817c17de1caaedc38e50c3e7235ee585.zip | |
generic-2.6: sync yaffs code with the official CVS tree
SVN-Revision: 11378
Diffstat (limited to 'target/linux/generic-2.6/files/fs/yaffs2/yportenv.h')
| -rw-r--r-- | target/linux/generic-2.6/files/fs/yaffs2/yportenv.h | 17 |
1 files changed, 15 insertions, 2 deletions
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 15ac28121c..097b2a6756 100644 --- a/target/linux/generic-2.6/files/fs/yaffs2/yportenv.h +++ b/target/linux/generic-2.6/files/fs/yaffs2/yportenv.h @@ -17,6 +17,14 @@ #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" @@ -26,7 +34,10 @@ #include "moduleconfig.h" /* Linux kernel */ + #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 @@ -90,6 +101,8 @@ #elif defined CONFIG_YAFFS_DIRECT +#define MTD_VERSION_CODE MTD_VERSION(2,6,22) + /* Direct interface */ #include "ydirectenv.h" @@ -180,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) -#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 |