yaffsfs: Add yaffs_format function

Allows the formatting of a yaffs device

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

diff --git a/direct/basic-test/dtest.c b/direct/basic-test/dtest.c
index 153d274d3a54db1db8b2cf0764faf9c099840674..9f2d2e6f82d2f810f2c5c13b22851286e2190bf8 100644 (file)
--- a/direct/basic-test/dtest.c
+++ b/direct/basic-test/dtest.c
@@ -3081,6 +3081,32 @@ void readdir_test(const char *mountpt)
 
 }
 
 
 }
 

+void format_test(const char *mountpt)
+{
+       int ret;
+
+       yaffs_start_up();
+
+       ret = yaffs_format(mountpt, 0, 0, 0);
+       printf("yaffs_format(...,0, 0, 0) of unmounted returned %d\n", ret);
+
+       yaffs_mount(mountpt);
+
+       ret = yaffs_format(mountpt, 0, 0, 0);
+       printf("yaffs_format(...,0, 0, 0) of mounted returned %d\n", ret);
+
+       ret = yaffs_format(mountpt, 1, 0, 0);
+       printf("yaffs_format(...,1, 0, 0) of mounted returned %d\n", ret);
+
+       ret = yaffs_mount(mountpt);
+       printf("mount should return 0 returned %d\n", ret);
+
+       ret = yaffs_format(mountpt, 1, 0, 1);
+       printf("yaffs_format(...,1, 0, 1) of mounted returned %d\n", ret);
+
+       ret = yaffs_mount(mountpt);
+       printf("mount should return -1 returned %d\n", ret);
+}

 
 int random_seed;
 int simulate_power_failure;
 
 int random_seed;
 int simulate_power_failure;


@@ -3149,7 +3175,10 @@ int main(int argc, char *argv[])
         // link_follow_test("/yaffs2");
         //basic_utime_test("/yaffs2");
 
         // link_follow_test("/yaffs2");
         //basic_utime_test("/yaffs2");
 

-       max_files_test("/yaffs2");
+
+       format_test("/yaffs2");
+
+       //max_files_test("/yaffs2");

 
         //start_twice("/yaffs2");
 
 
         //start_twice("/yaffs2");
 

diff --git a/direct/u-boot/fs/yaffs2/Makefile b/direct/u-boot/fs/yaffs2/Makefile
index d2ae2bf2b59336e0402dabcc41b87ad5d02040e1..f45c19d9dd2662ebfaa546af75bd7ebe268f13ad 100644 (file)
--- a/direct/u-boot/fs/yaffs2/Makefile
+++ b/direct/u-boot/fs/yaffs2/Makefile
@@ -35,6 +35,11 @@ YCFLAGS =  -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM
 YCFLAGS += -DCONFIG_YAFFS_YAFFS2 -DNO_Y_INLINE
 YCFLAGS += -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
 
 YCFLAGS += -DCONFIG_YAFFS_YAFFS2 -DNO_Y_INLINE
 YCFLAGS += -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
 

+#
+# To enable 32-bit loff_t uncomment the following 
+#
+YCFLAGS += -DY_LOFF_T=int
+

 CFLAGS += $(YCFLAGS)
 CPPFLAGS +=  $(YCFLAGS)
 
 CFLAGS += $(YCFLAGS)
 CPPFLAGS +=  $(YCFLAGS)
 

diff --git a/direct/u-boot/patch-u-boot.sh b/direct/u-boot/patch-u-boot.sh
index 8caa2e821d5f3331344be1a5e171ed0e14a83b5c..fc17552e370327860dbd4a663a48bf11c055c085 100755 (executable)
--- a/direct/u-boot/patch-u-boot.sh
+++ b/direct/u-boot/patch-u-boot.sh
@@ -17,7 +17,7 @@
 #
 #  Inspired yaffs kernel patching script
 
 #
 #  Inspired yaffs kernel patching script
 

-set -e -x
+#set -e -x

 
 UBOOTDIR=$1
 
 
 UBOOTDIR=$1
 

diff --git a/direct/yaffsfs.c b/direct/yaffsfs.c
index d208e25df0b4fdf002bae73547caddcbc7892107..705106e7a13e603333fbeaf15c02ca5f9d26a1fa 100644 (file)
--- a/direct/yaffsfs.c
+++ b/direct/yaffsfs.c
@@ -2648,6 +2648,67 @@ int yaffs_unmount(const YCHAR *path)
        return yaffs_unmount2(path, 0);
 }
 
        return yaffs_unmount2(path, 0);
 }
 

+int yaffs_format(const YCHAR *path,
+               int unmount_flag,
+               int force_unmount_flag,
+               int remount_flag)
+{
+       int retVal = 0;
+       struct yaffs_dev *dev = NULL;
+       int result;
+
+       if (!path) {
+               yaffsfs_SetError(-EFAULT);
+               return -1;
+       }
+
+       if (yaffsfs_CheckPath(path) < 0) {
+               yaffsfs_SetError(-ENAMETOOLONG);
+               return -1;
+       }
+
+       yaffsfs_Lock();
+       dev = yaffsfs_FindMountPoint(path);
+
+       if (dev) {
+               int was_mounted = dev->is_mounted;
+
+               if (dev->is_mounted && unmount_flag) {
+                       int inUse;
+                       yaffs_flush_whole_cache(dev);
+                       yaffs_checkpoint_save(dev);
+                       inUse = yaffsfs_IsDevBusy(dev);
+                       if (!inUse || force_unmount_flag) {
+                               if (inUse)
+                                       yaffsfs_BreakDeviceHandles(dev);
+                               yaffs_deinitialise(dev);
+                       }
+               }
+
+               if(dev->is_mounted) {
+                               yaffsfs_SetError(-EBUSY);
+                               retVal = -1;
+               } else {
+                       yaffs_format_dev(dev);
+                       if(was_mounted && remount_flag) {
+                               result = yaffs_guts_initialise(dev);
+                               if (result == YAFFS_FAIL) {
+                                       yaffsfs_SetError(-ENOMEM);
+                                       retVal = -1;
+                               }
+                       }
+               }
+       } else {
+               yaffsfs_SetError(-ENODEV);
+               retVal = -1;
+       }
+
+       yaffsfs_Unlock();
+       return retVal;
+
+}
+
+

 Y_LOFF_T yaffs_freespace(const YCHAR *path)
 {
        Y_LOFF_T retVal = -1;
 Y_LOFF_T yaffs_freespace(const YCHAR *path)
 {
        Y_LOFF_T retVal = -1;

diff --git a/direct/yaffsfs.h b/direct/yaffsfs.h
index ba3f87fb256001a3b240c80f8c33ced4e9b1bfd0..b863901fba5b78111e4967100c84fdf0fe6d25db 100644 (file)
--- a/direct/yaffsfs.h
+++ b/direct/yaffsfs.h
@@ -171,6 +171,10 @@ int yaffs_unmount(const YCHAR *path) ;
 int yaffs_unmount2(const YCHAR *path, int force);
 int yaffs_remount(const YCHAR *path, int force, int read_only);
 
 int yaffs_unmount2(const YCHAR *path, int force);
 int yaffs_remount(const YCHAR *path, int force, int read_only);
 

+int yaffs_format(const YCHAR *path,
+               int unmount_flag,
+               int force_unmount_flag,
+               int remount_flag);

 
 int yaffs_sync(const YCHAR *path) ;
 
 
 int yaffs_sync(const YCHAR *path) ;
 

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 1602c4bde572e538482953ee10bff65d1624b5d9..b67055adef5de24874aaaa1b3121fcb252b84091 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -4986,6 +4986,42 @@ int yaffs_get_n_free_chunks(struct yaffs_dev *dev)
        return n_free;
 }
 
        return n_free;
 }
 

+
+int yaffs_format_dev(struct yaffs_dev *dev)
+{
+       int i;
+       enum yaffs_block_state state;
+       u32 dummy;
+
+       if(dev->is_mounted)
+               return YAFFS_FAIL;
+
+       /*
+       * The runtime variables might not have been set up,
+       * so set up what we need.
+       */
+       dev->internal_start_block = dev->param.start_block;
+       dev->internal_end_block = dev->param.end_block;
+       dev->block_offset = 0;
+       dev->chunk_offset = 0;
+
+       if (dev->param.start_block == 0) {
+               dev->internal_start_block = dev->param.start_block + 1;
+               dev->internal_end_block = dev->param.end_block + 1;
+               dev->block_offset = 1;
+               dev->chunk_offset = dev->param.chunks_per_block;
+       }
+
+       for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
+               yaffs_query_init_block_state(dev, i, &state, &dummy);
+               if (state != YAFFS_BLOCK_STATE_DEAD)
+                       yaffs_erase_block(dev, i);
+       }
+
+       return YAFFS_OK;
+}
+
+

 /*
  * Marshalling functions to get loff_t file sizes into and out of
  * object headers.
 /*
  * Marshalling functions to get loff_t file sizes into and out of
  * object headers.

diff --git a/yaffs_guts.h b/yaffs_guts.h
index 1aefb8518c5116b9644ace7d341cc47b4f214714..0e334bdd5e723ad6a028d10e1c5b1b1cda9092e8 100644 (file)
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -961,6 +961,8 @@ u32 yaffs_get_group_base(struct yaffs_dev *dev, struct yaffs_tnode *tn,
 
 int yaffs_is_non_empty_dir(struct yaffs_obj *obj);
 
 
 int yaffs_is_non_empty_dir(struct yaffs_obj *obj);
 

+int yaffs_format_dev(struct yaffs_dev *dev);
+

 void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr,
                                int *chunk_out, u32 *offset_out);
 /*
 void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr,
                                int *chunk_out, u32 *offset_out);
 /*