update to latest configs

diff --git a/direct/fsx_test/Makefile b/direct/fsx_test/Makefile
index 359a523d035fdcc92eac56acfa8fb8007cb25707..3d4b4fd89bbe1cf7685b52f4440e3d5732a03316 100644 (file)
--- a/direct/fsx_test/Makefile
+++ b/direct/fsx_test/Makefile
@@ -14,7 +14,7 @@
 #
 # NB Warning this Makefile does not include header dependencies.
 #
-# $Id: Makefile,v 1.2 2008-05-05 07:58:58 charles Exp $
+# $Id: Makefile,v 1.3 2008-08-07 22:45:44 charles Exp $
 
 #EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
 
@@ -27,14 +27,14 @@ CFLAGS+=    -fstack-check -O0
 #CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
 
 
-FSXTESTOBJS = yaffs_fsx.o yaffscfg2k.o yaffs_ecc.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \
+FSXTESTOBJS = yaffs_fsx.o yaffscfg2k.o yaffs_ecc.o yaffs_fileem2k.o yaffs_fileem.o yaffsfs.o yaffs_guts.o \
                 yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \
                 yaffs_tagscompat.o yaffs_packedtags2.o yaffs_tagsvalidity.o yaffs_nand.o \
                 yaffs_checkptrw.o  yaffs_qsort.o \
 #               yaffs_checkptrwtest.o\
                 
 
-BOOTTESTOBJS = bootldtst.o yboot.o yaffs_fileem.o nand_ecc.o
+#BOOTTESTOBJS = bootldtst.o yboot.o yaffs_fileem.o nand_ecc.o
 
 #ALLOBJS =  dtest.o nand_ecc.o yaffscfg.o yaffs_fileem.o yaffsfs.o yaffs_ramdisk.o bootldtst.o yboot.o yaffs_ramem2k.o
 
@@ -46,7 +46,7 @@ YAFFSSYMLINKS = devextras.h yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h ya
           yaffs_tagsvalidity.c yaffs_tagsvalidity.h yaffs_checkptrw.h yaffs_checkptrw.c \
           yaffs_qsort.c yaffs_qsort.h yaffs_getblockinfo.h
 
-YAFFSDIRECTSYMLINKS =  yaffscfg2k.c yaffs_fileem2k.c yaffsfs.c yaffs_flashif.h \
+YAFFSDIRECTSYMLINKS =  yaffscfg2k.c yaffs_fileem2k.c yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
                       yaffs_fileem2k.h yaffsfs.h yaffs_malloc.h yaffs_ramdisk.h ydirectenv.h \
                       yaffscfg.h yaffs_fileem.c yaffs_flashif.c yaffs_ramdisk.c yaffs_ramem2k.c
 

diff --git a/direct/fsx_test/yaffs_fsx.c b/direct/fsx_test/yaffs_fsx.c
index 26a8536d1a8458c3af41a0583b83e8e3911947dc..8e7f38b24270f31b52a3c051382533cf46634216 100644 (file)
--- a/direct/fsx_test/yaffs_fsx.c
+++ b/direct/fsx_test/yaffs_fsx.c
@@ -130,7 +130,7 @@ int writebdy = 1;                   /* -w flag */
 long   monitorstart = -1;              /* -m flag */
 long   monitorend = -1;                /* -m flag */
 int    lite = 0;                       /* -L flag */
-long   numops = -1;                    /* -N flag */
+long   numops = /*-1 */ 100000;                        /* -N flag */
 int    randomoplen = 1;                /* -O flag disables it */
 int    seed = 1;                       /* -S flag */
 
@@ -774,6 +774,8 @@ getnum(char *s, char **e)
 }
 
 
+#define BASE_NAME "/flash/yaffs2"
+
 int
 main(int argc, char **argv)
 {
@@ -915,9 +917,9 @@ main(int argc, char **argv)
        argv += optind;
 
        yaffs_StartUp();
-       yaffs_mount("/flash/flash");
+       yaffs_mount(BASE_NAME);
        
-       fname = "/flash/flash/fsxdata";
+       fname = BASE_NAME "/fsxdata";
 
        signal(SIGHUP,  cleanup);
        signal(SIGINT,  cleanup);
@@ -999,7 +1001,7 @@ main(int argc, char **argv)
        
        yaffs_close(fsxgoodfd);
        
-       yaffs_unmount("flash/flash");
+       yaffs_unmount(BASE_NAME);
        prt("All operations completed A-OK!\n");
 
        exit(0);