X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=yaffs_yaffs1.c;h=3acb1d2be92483e672540e427313cd190e82cdd0;hb=976dbeae825b18e6759f3903073a6784248cc244;hp=21933dc370667c26b30cdcdda71175bdf4987f3a;hpb=f330fefa27f2c87f7dff414fe6227261327663b7;p=yaffs2.git

diff --git a/yaffs_yaffs1.c b/yaffs_yaffs1.c
index 21933dc..3acb1d2 100644
--- a/yaffs_yaffs1.c
+++ b/yaffs_yaffs1.c
@@ -19,9 +19,9 @@
 #include "yaffs_nand.h"
 
 
-int yaffs1_scan(yaffs_dev_t *dev)
+int yaffs1_scan(struct yaffs_dev *dev)
 {
-	yaffs_ext_tags tags;
+	struct yaffs_ext_tags tags;
 	int blk;
 	int result;
 
@@ -29,19 +29,19 @@ int yaffs1_scan(yaffs_dev_t *dev)
 	int c;
 	int deleted;
 	yaffs_block_state_t state;
-	yaffs_obj_t *hard_list = NULL;
+	struct yaffs_obj *hard_list = NULL;
 	yaffs_block_info_t *bi;
-	__u32 seq_number;
-	yaffs_obj_header *oh;
-	yaffs_obj_t *in;
-	yaffs_obj_t *parent;
+	u32 seq_number;
+	struct yaffs_obj_hdr *oh;
+	struct yaffs_obj *in;
+	struct yaffs_obj *parent;
 
 	int alloc_failed = 0;
 
 	struct yaffs_shadow_fixer_s *shadow_fixers = NULL;
 
 
-	__u8 *chunk_data;
+	u8 *chunk_data;
 
 
 
@@ -191,7 +191,7 @@ int yaffs1_scan(yaffs_dev_t *dev)
 								chunk_data,
 								NULL);
 
-				oh = (yaffs_obj_header *) chunk_data;
+				oh = (struct yaffs_obj_hdr *) chunk_data;
 
 				in = yaffs_find_by_number(dev,
 							      tags.obj_id);
@@ -423,7 +423,7 @@ int yaffs1_scan(yaffs_dev_t *dev)
 	/* Fix up any shadowed objects */
 	{
 		struct yaffs_shadow_fixer_s *fixer;
-		yaffs_obj_t *obj;
+		struct yaffs_obj *obj;
 
 		while (shadow_fixers) {
 			fixer = shadow_fixers;