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

[yaffs2.git] / yaffs_tagscompat.h

diff --git a/yaffs_tagscompat.h b/yaffs_tagscompat.h
index 889bf5f4b7c873df778514e2732b8320f9c42d32..ae15e0bca23ba595705f2c97d33cae2dbe13b7e6 100644 (file)
--- a/yaffs_tagscompat.h
+++ b/yaffs_tagscompat.h
@@ -17,23 +17,20 @@
 #define __YAFFS_TAGSCOMPAT_H__
 
 #include "yaffs_guts.h"
-int yaffs_tags_compat_wr(yaffs_dev_t *dev,
-                                               int nand_chunk,
-                                               const __u8 *data,
-                                               const yaffs_ext_tags *tags);
-int yaffs_tags_compat_rd(yaffs_dev_t *dev,
-                                               int nand_chunk,
-                                               __u8 *data,
-                                               yaffs_ext_tags *tags);
-int yaffs_tags_compat_mark_bad(struct yaffs_dev_s *dev,
-                                           int block_no);
-int yaffs_tags_compat_query_block(struct yaffs_dev_s *dev,
-                                         int block_no,
-                                         yaffs_block_state_t *state,
-                                         __u32 *seq_number);
+int yaffs_tags_compat_wr(struct yaffs_dev *dev,
+                        int nand_chunk,
+                        const u8 *data, const struct yaffs_ext_tags *tags);
+int yaffs_tags_compat_rd(struct yaffs_dev *dev,
+                        int nand_chunk,
+                        u8 *data, struct yaffs_ext_tags *tags);
+int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int block_no);
+int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
+                                 int block_no,
+                                 enum yaffs_block_state *state,
+                                 u32 *seq_number);
 
-void yaffs_calc_tags_ecc(yaffs_tags_t *tags);
-int yaffs_check_tags_ecc(yaffs_tags_t *tags);
-int yaffs_count_bits(__u8 byte);
+void yaffs_calc_tags_ecc(struct yaffs_tags *tags);
+int yaffs_check_tags_ecc(struct yaffs_tags *tags);
+int yaffs_count_bits(u8 byte);
 
 #endif