Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2

[yaffs2.git] / yaffs_guts.h

diff --git a/yaffs_guts.h b/yaffs_guts.h
index 643e5750954784e1cfb2cdd2a5ac6f4268eb4c76..64929ed37c29b6e4debf22e83b1a38a288d33fa5 100644 (file)
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -39,7 +39,7 @@
  * 2^(3*MAX_LEVEL+4)
  *
  * Thus a max level of 8 supports files with up to 2^^28 chunks which gives
- * a maximum file size of arounf 51Gbytees with 2k chunks.
+ * a maximum file size of around 512Gbytees with 2k chunks.
  */
 #define YAFFS_NTNODES_LEVEL0           16
 #define YAFFS_TNODES_LEVEL0_BITS       4
@@ -558,39 +558,6 @@ struct yaffs_param {
 
        int enable_xattr;       /* Enable xattribs */
 
-       /* Tags marshalling functions.
-        * If these are not set then defaults will be assigned.
-        */
-       int (*write_chunk_tags_fn) (struct yaffs_dev *dev,
-                                   int nand_chunk, const u8 *data,
-                                   const struct yaffs_ext_tags *tags);
-       int (*read_chunk_tags_fn) (struct yaffs_dev *dev,
-                                  int nand_chunk, u8 *data,
-                                  struct yaffs_ext_tags *tags);
-
-       int (*query_block_fn) (struct yaffs_dev *dev, int block_no,
-                              enum yaffs_block_state *state,
-                              u32 *seq_number);
-       int (*mark_bad_fn) (struct yaffs_dev *dev, int block_no);
-
-       /* NAND driver access functions All required except
-        * the deinitialise function which is optional.
-        */
-
-       int (*drv_write_chunk_fn) (struct yaffs_dev *dev, int nand_chunk,
-                                  const u8 *data, int data_len,
-                                  const u8 *oob, int oob_len);
-       int (*drv_read_chunk_fn) (struct yaffs_dev *dev, int nand_chunk,
-                                  u8 *data, int data_len,
-                                  u8 *oob, int oob_len,
-                                  enum yaffs_ecc_result *ecc_result);
-       int (*drv_erase_fn) (struct yaffs_dev *dev, int block_no);
-       int (*drv_mark_bad_fn) (struct yaffs_dev *dev, int block_no);
-       int (*drv_check_bad_fn) (struct yaffs_dev *dev, int block_no);
-       int (*drv_initialise_fn) (struct yaffs_dev *dev);
-       int (*drv_deinitialise_fn) (struct yaffs_dev *dev);
-
-
        int max_objects;        /*
                                 * Set to limit the number of objects created.
                                 * 0 = no limit.
@@ -607,7 +574,7 @@ struct yaffs_param {
        void (*sb_dirty_fn) (struct yaffs_dev *dev);
 
        /*  Callback to control garbage collection. */
-       unsigned (*gc_control) (struct yaffs_dev *dev);
+       unsigned (*gc_control_fn) (struct yaffs_dev *dev);
 
        /* Debug control flags. Don't use unless you know what you're doing */
        int use_header_file_size;       /* Flag to determine if we should use
@@ -628,8 +595,39 @@ struct yaffs_param {
 
 };
 
+struct yaffs_driver {
+       int (*drv_write_chunk_fn) (struct yaffs_dev *dev, int nand_chunk,
+                                  const u8 *data, int data_len,
+                                  const u8 *oob, int oob_len);
+       int (*drv_read_chunk_fn) (struct yaffs_dev *dev, int nand_chunk,
+                                  u8 *data, int data_len,
+                                  u8 *oob, int oob_len,
+                                  enum yaffs_ecc_result *ecc_result);
+       int (*drv_erase_fn) (struct yaffs_dev *dev, int block_no);
+       int (*drv_mark_bad_fn) (struct yaffs_dev *dev, int block_no);
+       int (*drv_check_bad_fn) (struct yaffs_dev *dev, int block_no);
+       int (*drv_initialise_fn) (struct yaffs_dev *dev);
+       int (*drv_deinitialise_fn) (struct yaffs_dev *dev);
+};
+
+struct yaffs_tags_handler {
+       int (*write_chunk_tags_fn) (struct yaffs_dev *dev,
+                                   int nand_chunk, const u8 *data,
+                                   const struct yaffs_ext_tags *tags);
+       int (*read_chunk_tags_fn) (struct yaffs_dev *dev,
+                                  int nand_chunk, u8 *data,
+                                  struct yaffs_ext_tags *tags);
+
+       int (*query_block_fn) (struct yaffs_dev *dev, int block_no,
+                              enum yaffs_block_state *state,
+                              u32 *seq_number);
+       int (*mark_bad_fn) (struct yaffs_dev *dev, int block_no);
+};
+
 struct yaffs_dev {
        struct yaffs_param param;
+       struct yaffs_driver drv;
+       struct yaffs_tags_handler tagger;
 
        /* Context storage. Holds extra OS specific data for this device */
 
@@ -976,6 +974,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_format_dev(struct yaffs_dev *dev);
+
 void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr,
                                int *chunk_out, u32 *offset_out);
 /*