Some fixes and add NOR integrity code

[yaffs2.git] / direct / fsx_test / yaffs_fsx.c

diff --git a/direct/fsx_test/yaffs_fsx.c b/direct/fsx_test/yaffs_fsx.c
index 64588c8bc7aa1f6e83a65c7e5bd6fe643504688b..31b0751045ca32ff63ca1c6cfa151a50a97b3778 100644 (file)
--- a/direct/fsx_test/yaffs_fsx.c
+++ b/direct/fsx_test/yaffs_fsx.c
@@ -130,11 +130,7 @@ int        writebdy = 1;                   /* -w flag */
 long   monitorstart = -1;              /* -m flag */
 long   monitorend = -1;                /* -m flag */
 int    lite = 0;                       /* -L flag */
-<<<<<<< yaffs_fsx.c
-long   numops = 5000;                  /* -N flag */
-=======
-long   numops = /*-1 */ 100000;                        /* -N flag */
->>>>>>> 1.3
+long   numops = /*-1 */ 10000000;                      /* -N flag */
 int    randomoplen = 1;                /* -O flag disables it */
 int    seed = 1;                       /* -S flag */
 
@@ -778,7 +774,7 @@ getnum(char *s, char **e)
 }
 
 
-#define BASE_NAME "/flash/yaffs2"
+#define BASE_NAME "/flash/yaffs1"
 
 int
 main(int argc, char **argv)