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 | c259b35b50096611802dd6da904d664ec4f1a057 (patch) | |
| tree | 4de5c4b7528ff05a6f76ba33d18ea2fa8edf543a /target/linux/generic-2.6/files/fs/yaffs2/yportenv.h | |
| parent | 4e9682caacd8c8011e7a8c821b1318478dfdb406 (diff) | |
| download | upstream-c259b35b50096611802dd6da904d664ec4f1a057.tar.gz upstream-c259b35b50096611802dd6da904d664ec4f1a057.tar.bz2 upstream-c259b35b50096611802dd6da904d664ec4f1a057.zip | |
[kernel] generic-2.6: sync yaffs code with the official CVS tree
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11378 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 |