X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=utils%2Fmkyaffsimage.c;h=1d835953298eb1a8364ccd0be3910b991a141199;hp=640d7ec98375ef523abb64ff289a350165cf6840;hb=b4d5215f18486403d16f2e776000e43eba052f40;hpb=41573908f821bcb40750e7c069ea8f5178f630e5 diff --git a/utils/mkyaffsimage.c b/utils/mkyaffsimage.c index 640d7ec..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-2007 Aleph One Ltd. + * Copyright (C) 2002-2011 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning @@ -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; @@ -113,12 +112,12 @@ static int find_obj_in_list(dev_t dev, ino_t ino) } // NCB added 10/9/2002 -static __u16 yaffs_calc_name_sum(const char *name) +static u16 yaffs_calc_name_sum(const char *name) { - __u16 sum = 0; - __u16 i = 1; + u16 sum = 0; + u16 i = 1; - __u8 *bname = (__u8 *)name; + u8 *bname = (u8 *)name; while (*bname) { @@ -130,16 +129,16 @@ static __u16 yaffs_calc_name_sum(const char *name) } -static void yaffs_calc_ecc(const __u8 *data, yaffs_spare *spare) +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(yaffs_tags_t *tags) +static void yaffs_calc_tags_ecc(struct yaffs_tags *tags) { // Todo don't do anything yet. Need to calculate ecc - unsigned char *b = ((yaffs_tags_union_t *)tags)->as_bytes; + unsigned char *b = ((union yaffs_tags_union *)tags)->as_bytes; unsigned i,j; unsigned ecc = 0; unsigned bit = 0; @@ -181,9 +180,9 @@ static void yaffs_calc_tags_ecc(yaffs_tags_t *tags) b[7] |= ((ecc & 0x3F) << 2); } } -static void yaffs_load_tags_to_spare(yaffs_spare *sparePtr, yaffs_tags_t *tagsPtr) +static void yaffs_load_tags_to_spare(struct yaffs_spare *sparePtr, struct yaffs_tags *tagsPtr) { - yaffs_tags_union_t *tu = (yaffs_tags_union_t *)tagsPtr; + union yaffs_tags_union *tu = (union yaffs_tags_union *)tagsPtr; //yaffs_calc_tags_ecc(tagsPtr); @@ -201,10 +200,10 @@ static void yaffs_load_tags_to_spare(yaffs_spare *sparePtr, yaffs_tags_t *tagsPt * NOTE: The tag is not usable after this other than calculating the CRC * with. */ -static void little_to_big_endian(yaffs_tags_t *tagsPtr) +static void little_to_big_endian(struct yaffs_tags *tagsPtr) { - yaffs_tags_union_t * tags = (yaffs_tags_union_t* )tagsPtr; // Work in bytes. - yaffs_tags_union_t temp; + union yaffs_tags_union * tags = (union yaffs_tags_union* )tagsPtr; // Work in bytes. + union yaffs_tags_union temp; memset(&temp, 0, sizeof(temp)); // Ick, I hate magic numbers. @@ -228,16 +227,16 @@ static void little_to_big_endian(yaffs_tags_t *tagsPtr) tags->as_bytes[7] = temp.as_bytes[7]; } -static int write_chunk(__u8 *data, __u32 obj_id, __u32 chunk_id, __u32 n_bytes) +static int write_chunk(u8 *data, u32 obj_id, u32 chunk_id, u32 n_bytes) { - yaffs_tags_t t; - yaffs_spare s; + struct yaffs_tags t; + struct yaffs_spare s; error = write(outFile,data,512); if(error < 0) return error; - memset(&t,0xff,sizeof (yaffs_tags_t)); - memset(&s,0xff,sizeof (yaffs_spare)); + memset(&t,0xff,sizeof (struct yaffs_tags)); + memset(&s,0xff,sizeof (struct yaffs_spare)); t.chunk_id = chunk_id; t.serial_number = 0; @@ -255,7 +254,7 @@ static int write_chunk(__u8 *data, __u32 obj_id, __u32 chunk_id, __u32 n_bytes) nPages++; - return write(outFile,&s,sizeof(yaffs_spare)); + return write(outFile,&s,sizeof(struct yaffs_spare)); } @@ -268,69 +267,48 @@ static int write_chunk(__u8 *data, __u32 obj_id, __u32 chunk_id, __u32 n_bytes) (((x) & 0xFF00) >> 8)) // This one is easier, since the types are more standard. No funky shifts here. -static void object_header_little_to_big_endian(yaffs_obj_header* oh) +static void object_header_little_to_big_endian(struct yaffs_obj_hdr* oh) { oh->type = SWAP32(oh->type); // GCC makes enums 32 bits. oh->parent_obj_id = SWAP32(oh->parent_obj_id); // int - oh->sum_no_longer_used = SWAP16(oh->sum_no_longer_used); // __u16 - Not used, but done for completeness. + 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, yaffs_obj_type t, struct stat *s, int parent, const char *name, int equivalentObj, const char * alias) +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) { - __u8 bytes[512]; + u8 bytes[512]; - yaffs_obj_header *oh = (yaffs_obj_header *)bytes; + struct yaffs_obj_hdr *oh = (struct yaffs_obj_hdr *)bytes; memset(bytes,0xff,512); @@ -355,7 +333,7 @@ static int write_object_header(int obj_id, yaffs_obj_type t, struct stat *s, int 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); @@ -453,7 +431,7 @@ static int process_directory(int parent, const char *path) if(error >= 0) { int h; - __u8 bytes[512]; + u8 bytes[512]; int n_bytes; int chunk = 0;