X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_guts.h;h=643e5750954784e1cfb2cdd2a5ac6f4268eb4c76;hp=a9fdde2213c46b315b56ab333754852867b4cab7;hb=e81a96058aa89f6812e3c5224e26b4b44da3c143;hpb=e49491a81d17bbede16583e9cd2498ede4ed2322

diff --git a/yaffs_guts.h b/yaffs_guts.h
index a9fdde2..643e575 100644
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -54,6 +54,8 @@
 					YAFFS_TNODES_MAX_LEVEL)
 #define YAFFS_MAX_CHUNK_ID		((1 << YAFFS_TNODES_MAX_BITS) - 1)
 
+#define YAFFS_MAX_FILE_SIZE_32		0x7fffffff
+
 /* Constants for YAFFS1 mode */
 #define YAFFS_BYTES_PER_SPARE		16
 #define YAFFS_BYTES_PER_CHUNK		512
@@ -77,7 +79,7 @@
 
 /* Binary data version stamps */
 #define YAFFS_SUMMARY_VERSION		1
-#define YAFFS_CHECKPOINT_VERSION	6
+#define YAFFS_CHECKPOINT_VERSION	7
 
 #ifdef CONFIG_YAFFS_UNICODE
 #define YAFFS_MAX_NAME_LENGTH		127
@@ -518,7 +520,7 @@ struct yaffs_param {
 	/*
 	 * Entry parameters set up way early. Yaffs sets up the rest.
 	 * The structure should be zeroed out before use so that unused
-	 * and defualt values are zero.
+	 * and default values are zero.
 	 */
 
 	int inband_tags;	/* Use unband tags */
@@ -534,9 +536,13 @@ struct yaffs_param {
 	int n_caches;		/* If <= 0, then short op caching is disabled,
 				 * else the number of short op caches.
 				 */
+	int cache_bypass_aligned; /* If non-zero then bypass the cache for
+				   * aligned writes.
+				   */
+
 	int use_nand_ecc;	/* Flag to decide whether or not to use
 				 * NAND driver ECC on data (yaffs1) */
-        int tags_9bytes;	/* Use 9 byte tags */
+	int tags_9bytes;	/* Use 9 byte tags */
 	int no_tags_ecc;	/* Flag to decide whether or not to do ECC
 				 * on packed tags (yaffs2) */
 
@@ -552,29 +558,43 @@ struct yaffs_param {
 
 	int enable_xattr;	/* Enable xattribs */
 
-	/* NAND access functions (Must be set before calling YAFFS) */
-
-	int (*write_chunk_fn) (struct yaffs_dev *dev,
-			       int nand_chunk, const u8 *data,
-			       const struct yaffs_spare *spare);
-	int (*read_chunk_fn) (struct yaffs_dev *dev,
-			      int nand_chunk, u8 *data,
-			      struct yaffs_spare *spare);
-	int (*erase_fn) (struct yaffs_dev *dev, int flash_block);
-	int (*initialise_flash_fn) (struct yaffs_dev *dev);
-	int (*deinitialise_flash_fn) (struct yaffs_dev *dev);
-
-	/* yaffs2 mode functions */
+	/* 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 (*bad_block_fn) (struct yaffs_dev *dev, int block_no);
+
 	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.
+				*/
 
 	/* The remove_obj_fn function must be supplied by OS flavours that
 	 * need it.
@@ -606,10 +626,6 @@ struct yaffs_param {
 
 	int disable_summary;
 
-	int max_objects;	/*
-				 * Set to limit the number of objects created.
-				 * 0 = no limit.
-				*/
 };
 
 struct yaffs_dev {
@@ -760,6 +776,7 @@ struct yaffs_dev {
 	u32 n_page_writes;
 	u32 n_page_reads;
 	u32 n_erasures;
+	u32 n_bad_markings;
 	u32 n_erase_failures;
 	u32 n_gc_copies;
 	u32 all_gcs;