yaffs More symbol changes

[yaffs2.git] / utils / mkyaffs2image.c

diff --git a/utils/mkyaffs2image.c b/utils/mkyaffs2image.c
index b5f96060d6b4021b4fcd69bafe4b8e08cfe29562..ac658b1da26d7a81ec4ce0c14219b1cc99407260 100644 (file)
--- a/utils/mkyaffs2image.c
+++ b/utils/mkyaffs2image.c
@@ -37,7 +37,7 @@
 #include "yaffs_tagsvalidity.h"
 #include "yaffs_packedtags2.h"
 
-unsigned yaffs_traceMask=0;
+unsigned yaffs_trace_mask=0;
 
 #define MAX_OBJECTS 10000
 
@@ -148,8 +148,8 @@ static int find_obj_in_list(dev_t dev, ino_t ino)
 static void little_to_big_endian(yaffs_Tags *tagsPtr)
 {
 #if 0 // FIXME NCB
-    yaffs_TagsUnion * tags = (yaffs_TagsUnion* )tagsPtr; // Work in bytes.
-    yaffs_TagsUnion   temp;
+    yaffs_tags_union_t * tags = (yaffs_tags_union_t* )tagsPtr; // Work in bytes.
+    yaffs_tags_union_t   temp;
 
     memset(&temp, 0, sizeof(temp));
     // Ick, I hate magic numbers.
@@ -190,7 +190,7 @@ static int write_chunk(__u8 *data, __u32 objId, __u32 chunkId, __u32 nBytes)
        if (write(outFile,data,chunkSize) != chunkSize)
                fatal("write");
 
-       yaffs_InitialiseTags(&t);
+       yaffs_init_tags(&t);
        
        t.chunkId = chunkId;
 //     t.serialNumber = 0;