X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=utils%2Fmkyaffsimage.c;h=1d835953298eb1a8364ccd0be3910b991a141199;hp=02ad521a02bb92edc41de6c67134550b299459f1;hb=b4d5215f18486403d16f2e776000e43eba052f40;hpb=9131fecc79ad4e5fbdb775cdc067bc80aae5adb8

diff --git a/utils/mkyaffsimage.c b/utils/mkyaffsimage.c
index 02ad521..1d83595 100644
--- a/utils/mkyaffsimage.c
+++ b/utils/mkyaffsimage.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -45,8 +45,7 @@ typedef struct
 
 
 static objItem obj_list[MAX_OBJECTS];
-static int n_obj = 0;
-static int obj_id = YAFFS_NOBJECT_BUCKETS + 1;
+static int obj_alloc_id = YAFFS_NOBJECT_BUCKETS + 1;
 
 static int n_obj, nDirectories, nPages;
 
@@ -132,8 +131,8 @@ static u16 yaffs_calc_name_sum(const char *name)
 
 static void yaffs_calc_ecc(const u8 *data, struct yaffs_spare *spare)
 {
-	yaffs_ecc_cacl(data , spare->ecc1);
-	yaffs_ecc_cacl(&data[256] , spare->ecc2);
+	yaffs_ecc_calc(data , spare->ecc1);
+	yaffs_ecc_calc(&data[256] , spare->ecc2);
 }
 
 static void yaffs_calc_tags_ecc(struct yaffs_tags *tags)
@@ -275,54 +274,33 @@ static void object_header_little_to_big_endian(struct yaffs_obj_hdr* oh)
     oh->sum_no_longer_used = SWAP16(oh->sum_no_longer_used); // u16 - Not used, but done for completeness.
     // name = skip. Char array. Not swapped.
     oh->yst_mode = SWAP32(oh->yst_mode);
-#ifdef CONFIG_YAFFS_WINCE // WinCE doesn't implement this, but we need to just in case. 
-    // In fact, WinCE would be *THE* place where this would be an issue!
-    oh->not_for_wince[0] = SWAP32(oh->not_for_wince[0]);
-    oh->not_for_wince[1] = SWAP32(oh->not_for_wince[1]);
-    oh->not_for_wince[2] = SWAP32(oh->not_for_wince[2]);
-    oh->not_for_wince[3] = SWAP32(oh->not_for_wince[3]);
-    oh->not_for_wince[4] = SWAP32(oh->not_for_wince[4]);
-#else
+
     // Regular POSIX.
     oh->yst_uid = SWAP32(oh->yst_uid);
     oh->yst_gid = SWAP32(oh->yst_gid);
     oh->yst_atime = SWAP32(oh->yst_atime);
     oh->yst_mtime = SWAP32(oh->yst_mtime);
     oh->yst_ctime = SWAP32(oh->yst_ctime);
-#endif
 
-    oh->file_size = SWAP32(oh->file_size); // Aiee. An int... signed, at that!
+    oh->file_size_low = SWAP32(oh->file_size_low); // Aiee. An int... signed, at that!
     oh->equiv_id = SWAP32(oh->equiv_id);
     // alias  - char array.
     oh->yst_rdev = SWAP32(oh->yst_rdev);
 
-#ifdef CONFIG_YAFFS_WINCE
     oh->win_ctime[0] = SWAP32(oh->win_ctime[0]);
     oh->win_ctime[1] = SWAP32(oh->win_ctime[1]);
     oh->win_atime[0] = SWAP32(oh->win_atime[0]);
     oh->win_atime[1] = SWAP32(oh->win_atime[1]);
     oh->win_mtime[0] = SWAP32(oh->win_mtime[0]);
     oh->win_mtime[1] = SWAP32(oh->win_mtime[1]);
-    oh->room_to_grow[0] = SWAP32(oh->room_to_grow[0]);
-    oh->room_to_grow[1] = SWAP32(oh->room_to_grow[1]);
-    oh->room_to_grow[2] = SWAP32(oh->room_to_grow[2]);
-    oh->room_to_grow[3] = SWAP32(oh->room_to_grow[3]);
-    oh->room_to_grow[4] = SWAP32(oh->room_to_grow[4]);
-    oh->room_to_grow[5] = SWAP32(oh->room_to_grow[5]);
-#else
-    oh->room_to_grow[0] = SWAP32(oh->room_to_grow[0]);
-    oh->room_to_grow[1] = SWAP32(oh->room_to_grow[1]);
-    oh->room_to_grow[2] = SWAP32(oh->room_to_grow[2]);
-    oh->room_to_grow[3] = SWAP32(oh->room_to_grow[3]);
-    oh->room_to_grow[4] = SWAP32(oh->room_to_grow[4]);
-    oh->room_to_grow[5] = SWAP32(oh->room_to_grow[5]);
-    oh->room_to_grow[6] = SWAP32(oh->room_to_grow[6]);
-    oh->room_to_grow[7] = SWAP32(oh->room_to_grow[7]);
-    oh->room_to_grow[8] = SWAP32(oh->room_to_grow[8]);
-    oh->room_to_grow[9] = SWAP32(oh->room_to_grow[9]);
-    oh->room_to_grow[10] = SWAP32(oh->room_to_grow[10]);
-    oh->room_to_grow[11] = SWAP32(oh->room_to_grow[11]);
-#endif
+
+    oh->reserved[0] = SWAP32(oh->reserved[0]);
+    oh->reserved[1] = SWAP32(oh->reserved[1]);
+
+    oh->inband_shadowed_obj_id = SWAP32(oh->inband_shadowed_obj_id);
+    oh->inband_is_shrink = SWAP32(oh->inband_is_shrink);
+    oh->shadows_obj = SWAP32(oh->shadows_obj);
+    oh->is_shrink = SWAP32(oh->is_shrink);
 }
 
 static int write_object_header(int obj_id, enum yaffs_obj_type t, struct stat *s, int parent, const char *name, int equivalentObj, const char * alias)
@@ -355,7 +333,7 @@ static int write_object_header(int obj_id, enum yaffs_obj_type t, struct stat *s
 	
 	if(t == YAFFS_OBJECT_TYPE_FILE)
 	{
-		oh->file_size = s->st_size;
+		oh->file_size_low = s->st_size;
 	}
 	
 	if(t == YAFFS_OBJECT_TYPE_HARDLINK)
@@ -415,7 +393,7 @@ static int process_directory(int parent, const char *path)
 				    S_ISSOCK(stats.st_mode))
 				{
 				
-					newObj = obj_id++;
+					newObj = obj_alloc_id++;
 					n_obj++;
 					
 					printf("Object %d, %s is a ",newObj,full_name);