diff options
author | Charles Manning <cdhmanning@gmail.com> | 2010-10-05 10:13:50 +1300 |
---|---|---|
committer | Charles Manning <cdhmanning@gmail.com> | 2010-10-07 11:14:38 +1300 |
commit | e33554a67753729f6b74677473cf0ec3b8d35a7e (patch) | |
tree | 11173283956c8eb07ef36c736b244e6834c05537 /utils | |
parent | b07263adb5c642fcb911125a77b9e7f4bb8af64c (diff) |
yaffs First round of name changes
Signed-off-by: Charles Manning <cdhmanning@gmail.com>
Diffstat (limited to 'utils')
-rw-r--r-- | utils/mkyaffs2image.c | 4 | ||||
-rw-r--r-- | utils/mkyaffsimage.c | 20 |
2 files changed, 12 insertions, 12 deletions
diff --git a/utils/mkyaffs2image.c b/utils/mkyaffs2image.c index b5f9606..f40a657 100644 --- 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 @@ -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; diff --git a/utils/mkyaffsimage.c b/utils/mkyaffsimage.c index e8434e8..b7173eb 100644 --- a/utils/mkyaffsimage.c +++ b/utils/mkyaffsimage.c @@ -113,7 +113,7 @@ static int find_obj_in_list(dev_t dev, ino_t ino) } // NCB added 10/9/2002 -static __u16 yaffs_CalcNameSum(const char *name) +static __u16 yaffs_calc_name_sum(const char *name) { __u16 sum = 0; __u16 i = 1; @@ -130,13 +130,13 @@ static __u16 yaffs_CalcNameSum(const char *name) } -static void yaffs_CalcECC(const __u8 *data, yaffs_Spare *spare) +static void yaffs_calc_ecc(const __u8 *data, yaffs_Spare *spare) { - yaffs_ECCCalculate(data , spare->ecc1); - yaffs_ECCCalculate(&data[256] , spare->ecc2); + yaffs_ecc_cacl(data , spare->ecc1); + yaffs_ecc_cacl(&data[256] , spare->ecc2); } -static void yaffs_CalcTagsECC(yaffs_Tags *tags) +static void yaffs_calc_tags_ecc(yaffs_Tags *tags) { // Todo don't do anything yet. Need to calculate ecc unsigned char *b = ((yaffs_TagsUnion *)tags)->asBytes; @@ -181,11 +181,11 @@ static void yaffs_CalcTagsECC(yaffs_Tags *tags) b[7] |= ((ecc & 0x3F) << 2); } } -static void yaffs_LoadTagsIntoSpare(yaffs_Spare *sparePtr, yaffs_Tags *tagsPtr) +static void yaffs_load_tags_to_spare(yaffs_Spare *sparePtr, yaffs_Tags *tagsPtr) { yaffs_TagsUnion *tu = (yaffs_TagsUnion *)tagsPtr; - //yaffs_CalcTagsECC(tagsPtr); + //yaffs_calc_tags_ecc(tagsPtr); sparePtr->tagByte0 = tu->asBytes[0]; sparePtr->tagByte1 = tu->asBytes[1]; @@ -249,9 +249,9 @@ static int write_chunk(__u8 *data, __u32 objId, __u32 chunkId, __u32 nBytes) little_to_big_endian(&t); } - yaffs_CalcTagsECC(&t); - yaffs_LoadTagsIntoSpare(&s,&t); - yaffs_CalcECC(data,&s); + yaffs_calc_tags_ecc(&t); + yaffs_load_tags_to_spare(&s,&t); + yaffs_calc_ecc(data,&s); nPages++; |