X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_yaffs1.c;h=89d570e14e6edf08ba9737ad9ea5db0c01042d1c;hp=3acb1d2be92483e672540e427313cd190e82cdd0;hb=9131fecc79ad4e5fbdb775cdc067bc80aae5adb8;hpb=976dbeae825b18e6759f3903073a6784248cc244

diff --git a/yaffs_yaffs1.c b/yaffs_yaffs1.c
index 3acb1d2..89d570e 100644
--- a/yaffs_yaffs1.c
+++ b/yaffs_yaffs1.c
@@ -28,9 +28,9 @@ int yaffs1_scan(struct yaffs_dev *dev)
 	int chunk;
 	int c;
 	int deleted;
-	yaffs_block_state_t state;
+	enum yaffs_block_state state;
 	struct yaffs_obj *hard_list = NULL;
-	yaffs_block_info_t *bi;
+	struct yaffs_block_info *bi;
 	u32 seq_number;
 	struct yaffs_obj_hdr *oh;
 	struct yaffs_obj *in;
@@ -38,7 +38,7 @@ int yaffs1_scan(struct yaffs_dev *dev)
 
 	int alloc_failed = 0;
 
-	struct yaffs_shadow_fixer_s *shadow_fixers = NULL;
+	struct yaffs_shadow_fixer *shadow_fixers = NULL;
 
 
 	u8 *chunk_data;
@@ -216,8 +216,8 @@ int yaffs1_scan(struct yaffs_dev *dev)
 
 				if (in && oh->shadows_obj > 0) {
 
-					struct yaffs_shadow_fixer_s *fixer;
-					fixer = YMALLOC(sizeof(struct yaffs_shadow_fixer_s));
+					struct yaffs_shadow_fixer *fixer;
+					fixer = YMALLOC(sizeof(struct yaffs_shadow_fixer));
 					if (fixer) {
 						fixer->next = shadow_fixers;
 						shadow_fixers = fixer;
@@ -422,7 +422,7 @@ int yaffs1_scan(struct yaffs_dev *dev)
 
 	/* Fix up any shadowed objects */
 	{
-		struct yaffs_shadow_fixer_s *fixer;
+		struct yaffs_shadow_fixer *fixer;
 		struct yaffs_obj *obj;
 
 		while (shadow_fixers) {