X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=yaffs_yaffs1.c;h=89d570e14e6edf08ba9737ad9ea5db0c01042d1c;hb=9131fecc79ad4e5fbdb775cdc067bc80aae5adb8;hp=21933dc370667c26b30cdcdda71175bdf4987f3a;hpb=f330fefa27f2c87f7dff414fe6227261327663b7;p=yaffs2.git

diff --git a/yaffs_yaffs1.c b/yaffs_yaffs1.c
index 21933dc..89d570e 100644
--- a/yaffs_yaffs1.c
+++ b/yaffs_yaffs1.c
@@ -19,29 +19,29 @@
 #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;
 
 	int chunk;
 	int c;
 	int deleted;
-	yaffs_block_state_t state;
-	yaffs_obj_t *hard_list = NULL;
-	yaffs_block_info_t *bi;
-	__u32 seq_number;
-	yaffs_obj_header *oh;
-	yaffs_obj_t *in;
-	yaffs_obj_t *parent;
+	enum yaffs_block_state state;
+	struct yaffs_obj *hard_list = NULL;
+	struct yaffs_block_info *bi;
+	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;
+	struct yaffs_shadow_fixer *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);
@@ -216,8 +216,8 @@ int yaffs1_scan(yaffs_dev_t *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,8 +422,8 @@ int yaffs1_scan(yaffs_dev_t *dev)
 
 	/* Fix up any shadowed objects */
 	{
-		struct yaffs_shadow_fixer_s *fixer;
-		yaffs_obj_t *obj;
+		struct yaffs_shadow_fixer *fixer;
+		struct yaffs_obj *obj;
 
 		while (shadow_fixers) {
 			fixer = shadow_fixers;