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

diff --git a/yaffs_yaffs1.c b/yaffs_yaffs1.c
index 3acb1d2..059d125 100644
--- a/yaffs_yaffs1.c
+++ b/yaffs_yaffs1.c
@@ -17,7 +17,7 @@
 #include "yaffs_bitmap.h"
 #include "yaffs_getblockinfo.h"
 #include "yaffs_nand.h"
-
+#include "yaffs_attribs.h"
 
 int yaffs1_scan(struct yaffs_dev *dev)
 {
@@ -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;
@@ -259,21 +259,7 @@ int yaffs1_scan(struct yaffs_dev *dev)
 					in->variant_type = oh->type;
 
 					in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-					in->win_atime[0] = oh->win_atime[0];
-					in->win_ctime[0] = oh->win_ctime[0];
-					in->win_mtime[0] = oh->win_mtime[0];
-					in->win_atime[1] = oh->win_atime[1];
-					in->win_ctime[1] = oh->win_ctime[1];
-					in->win_mtime[1] = oh->win_mtime[1];
-#else
-					in->yst_uid = oh->yst_uid;
-					in->yst_gid = oh->yst_gid;
-					in->yst_atime = oh->yst_atime;
-					in->yst_mtime = oh->yst_mtime;
-					in->yst_ctime = oh->yst_ctime;
-					in->yst_rdev = oh->yst_rdev;
-#endif
+					yaffs_load_attribs(in, oh);
 					in->hdr_chunk = chunk;
 					in->serial = tags.serial_number;
 
@@ -284,21 +270,7 @@ int yaffs1_scan(struct yaffs_dev *dev)
 					in->variant_type = oh->type;
 
 					in->yst_mode = oh->yst_mode;
-#ifdef CONFIG_YAFFS_WINCE
-					in->win_atime[0] = oh->win_atime[0];
-					in->win_ctime[0] = oh->win_ctime[0];
-					in->win_mtime[0] = oh->win_mtime[0];
-					in->win_atime[1] = oh->win_atime[1];
-					in->win_ctime[1] = oh->win_ctime[1];
-					in->win_mtime[1] = oh->win_mtime[1];
-#else
-					in->yst_uid = oh->yst_uid;
-					in->yst_gid = oh->yst_gid;
-					in->yst_atime = oh->yst_atime;
-					in->yst_mtime = oh->yst_mtime;
-					in->yst_ctime = oh->yst_ctime;
-					in->yst_rdev = oh->yst_rdev;
-#endif
+					yaffs_load_attribs(in, oh);
 					in->hdr_chunk = chunk;
 					in->serial = tags.serial_number;
 
@@ -320,7 +292,7 @@ int yaffs1_scan(struct yaffs_dev *dev)
 						/* Set up as a directory */
 						parent->variant_type =
 							YAFFS_OBJECT_TYPE_DIRECTORY;
-						YINIT_LIST_HEAD(&parent->variant.
+						INIT_LIST_HEAD(&parent->variant.
 								dir_variant.
 								children);
 					} else if (!parent || parent->variant_type !=
@@ -367,7 +339,7 @@ int yaffs1_scan(struct yaffs_dev *dev)
 							equiv_id =
 							oh->equiv_id;
 						in->hard_links.next =
-							(struct ylist_head *)
+							(struct list_head *)
 							hard_list;
 						hard_list = in;
 						break;
@@ -422,7 +394,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) {