From: Charles Manning <cdhmanning@gmail.com>
Date: Tue, 13 Nov 2012 18:16:47 +0000 (+1300)
Subject: Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
X-Git-Tag: aleph1-release~62^2~10
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=a78bce6f4a7042fa153ab32d2bb263ecf7d27b66;hp=-c

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

a78bce6f4a7042fa153ab32d2bb263ecf7d27b66
diff --combined yaffs_guts.h
index 941782d,26ad54d..64929ed
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@@ -39,7 -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
@@@ -520,7 -520,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 */
@@@ -536,6 -536,10 +536,10 @@@
  	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 */
@@@ -554,29 -558,10 +558,10 @@@
  
  	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 */
- 	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 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.
@@@ -589,7 -574,7 +574,7 @@@
  	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
@@@ -608,14 -593,41 +593,41 @@@
  
  	int disable_summary;
  
- 	int max_objects;	/*
- 				 * Set to limit the number of objects created.
- 				 * 0 = no limit.
- 				*/
+ };
+ 
+ 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 */
  
@@@ -762,6 -774,7 +774,7 @@@
  	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;