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

[yaffs2.git] / yaffs_nand.h

diff --git a/yaffs_nand.h b/yaffs_nand.h
index 5fa334bdc924a8a9b2aa61807f1d39e368a7ea32..24cd147af82b8bb94e561a4a79ebeeeec67e518d 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>
@@ -19,26 +19,26 @@
 
 
 
-int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
-                                          __u8 * buffer,
-                                          yaffs_ExtendedTags * tags);
+int yaffs_rd_chunk_tags_nand(yaffs_dev_t *dev, int nand_chunk,
+                                       __u8 *buffer,
+                                       yaffs_ext_tags *tags);
 
-int yaffs_WriteChunkWithTagsToNAND(yaffs_Device * dev,
-                                                  int chunkInNAND,
-                                                  const __u8 * buffer,
-                                                  yaffs_ExtendedTags * tags);
+int yaffs_wr_chunk_tags_nand(yaffs_dev_t *dev,
+                                               int nand_chunk,
+                                               const __u8 *buffer,
+                                               yaffs_ext_tags *tags);
 
-int yaffs_MarkBlockBad(yaffs_Device * dev, int blockNo);
+int yaffs_mark_bad(yaffs_dev_t *dev, int block_no);
 
-int yaffs_QueryInitialBlockState(yaffs_Device * dev,
-                                                int blockNo,
-                                                yaffs_BlockState * state,
-                                                unsigned *sequenceNumber);
+int yaffs_query_init_block_state(yaffs_dev_t *dev,
+                                               int block_no,
+                                               yaffs_block_state_t *state,
+                                               unsigned *seq_number);
 
-int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
-                                 int blockInNAND);
+int yaffs_erase_block(struct yaffs_dev_s *dev,
+                                 int flash_block);
 
-int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev);
+int yaffs_init_nand(struct yaffs_dev_s *dev);
 
 #endif