Merge branch 'quick_tests'

[yaffs2.git] / yaffs_nand.h

diff --git a/yaffs_nand.h b/yaffs_nand.h
index e013cdc2f545822f9c873267d86ad599627446e3..543f1987124e6a9d9ea0682a4d51278f92191286 100644 (file)
--- a/yaffs_nand.h
+++ b/yaffs_nand.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -17,28 +17,22 @@
 #define __YAFFS_NAND_H__
 #include "yaffs_guts.h"
 
+int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
+                            u8 * buffer, struct yaffs_ext_tags *tags);
 
+int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
+                            int nand_chunk,
+                            const u8 * buffer, struct yaffs_ext_tags *tags);
 
-int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
-                                       __u8 *buffer,
-                                       yaffs_ExtendedTags *tags);
+int yaffs_mark_bad(struct yaffs_dev *dev, int block_no);
 
-int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
-                                               int chunkInNAND,
-                                               const __u8 *buffer,
-                                               yaffs_ExtendedTags *tags);
+int yaffs_query_init_block_state(struct yaffs_dev *dev,
+                                int block_no,
+                                enum yaffs_block_state *state,
+                                unsigned *seq_number);
 
-int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo);
+int yaffs_erase_block(struct yaffs_dev *dev, int flash_block);
 
-int yaffs_QueryInitialBlockState(yaffs_Device *dev,
-                                               int blockNo,
-                                               yaffs_BlockState *state,
-                                               unsigned *sequenceNumber);
-
-int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
-                                 int blockInNAND);
-
-int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev);
+int yaffs_init_nand(struct yaffs_dev *dev);
 
 #endif
-