yaffs: More clean up

[yaffs2.git] / utils / mkyaffsimage.c

diff --git a/utils/mkyaffsimage.c b/utils/mkyaffsimage.c
index 640d7ec98375ef523abb64ff289a350165cf6840..ffb0b5a11fc5b03678771b7df5fe8ab26c039d7c 100644 (file)
--- 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-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -113,12 +113,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,13 +130,13 @@ 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, yaffs_spare *spare)
 {
        yaffs_ecc_cacl(data , spare->ecc1);
        yaffs_ecc_cacl(&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;
@@ -181,7 +181,7 @@ 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(yaffs_spare *sparePtr, struct yaffs_tags *tagsPtr)
 {
        yaffs_tags_union_t *tu = (yaffs_tags_union_t *)tagsPtr;
        
@@ -201,7 +201,7 @@ 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;
@@ -228,15 +228,15 @@ 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;
+       struct yaffs_tags t;
        yaffs_spare s;
 
        error = write(outFile,data,512);
        if(error < 0) return error;
 
-       memset(&t,0xff,sizeof (yaffs_tags_t));
+       memset(&t,0xff,sizeof (struct yaffs_tags));
        memset(&s,0xff,sizeof (yaffs_spare));
        
        t.chunk_id = chunk_id;
@@ -268,11 +268,11 @@ 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. 
@@ -325,12 +325,12 @@ static void object_header_little_to_big_endian(yaffs_obj_header* oh)
 #endif
 }
 
-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);
        
@@ -453,7 +453,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;