projects
/
yaffs2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
35ff307
)
Add Nick's yaffs1 autoselection
author
charles
<charles>
Mon, 5 Jun 2006 04:12:44 +0000
(
04:12
+0000)
committer
charles
<charles>
Mon, 5 Jun 2006 04:12:44 +0000
(
04:12
+0000)
yaffs_fs.c
patch
|
blob
|
history
diff --git
a/yaffs_fs.c
b/yaffs_fs.c
index 08494c8fd9739c35da973eaf8fab88af7ef98d85..54b1e8e36ef282b6fbb74c79a5d476d65a99a5e5 100644
(file)
--- a/
yaffs_fs.c
+++ b/
yaffs_fs.c
@@
-31,7
+31,7
@@
*/
const char *yaffs_fs_c_version =
*/
const char *yaffs_fs_c_version =
- "$Id: yaffs_fs.c,v 1.
49 2006-05-25 01:26:57
charles Exp $";
+ "$Id: yaffs_fs.c,v 1.
50 2006-06-05 04:12:44
charles Exp $";
extern const char *yaffs_guts_c_version;
#include <linux/config.h>
extern const char *yaffs_guts_c_version;
#include <linux/config.h>
@@
-66,6
+66,11
@@
extern const char *yaffs_guts_c_version;
#define BDEVNAME_SIZE 0
#define yaffs_devname(sb, buf) kdevname(sb->s_dev)
#define BDEVNAME_SIZE 0
#define yaffs_devname(sb, buf) kdevname(sb->s_dev)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
+/* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */
+#define __user
+#endif
+
#endif
#include <asm/uaccess.h>
#endif
#include <asm/uaccess.h>
@@
-1459,6
+1464,14
@@
static struct super_block *yaffs_internal_read_super(int yaffsVersion,
T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs2\n"));
yaffsVersion = 2;
}
T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs2\n"));
yaffsVersion = 2;
}
+
+ /* Added NCB 26/5/2006 for completeness */
+ if (yaffsVersion == 2 &&
+ mtd->oobblock == 512) {
+ T(YAFFS_TRACE_ALWAYS,("yaffs: auto selecting yaffs1\n"));
+ yaffsVersion = 1;
+ }
+
#endif
if (yaffsVersion == 2) {
#endif
if (yaffsVersion == 2) {