X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_packedtags1.c;h=a77f0954fc135a3440c70918a616925551c098a5;hp=3ad49a941f6c3f7662c1fb06fb20bc791811665d;hb=a0af04609fa36f2396474a3fbd6ef126de527c70;hpb=f43976eda35065890e7cf0a008e9518158eb71d6 diff --git a/yaffs_packedtags1.c b/yaffs_packedtags1.c index 3ad49a9..a77f095 100644 --- a/yaffs_packedtags1.c +++ b/yaffs_packedtags1.c @@ -14,7 +14,8 @@ #include "yaffs_packedtags1.h" #include "yportenv.h" -void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ext_tags *t) +void yaffs_pack_tags1(struct yaffs_packed_tags1 *pt, + const struct yaffs_ext_tags *t) { pt->chunk_id = t->chunk_id; pt->serial_number = t->serial_number; @@ -22,20 +23,22 @@ void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ext_tags *t) pt->obj_id = t->obj_id; pt->ecc = 0; pt->deleted = (t->is_deleted) ? 0 : 1; - pt->unusedStuff = 0; - pt->shouldBeFF = 0xFFFFFFFF; + pt->unused_stuff = 0; + pt->should_be_ff = 0xFFFFFFFF; } -void yaffs_unpack_tags1(yaffs_ext_tags *t, const yaffs_PackedTags1 *pt) +void yaffs_unpack_tags1(struct yaffs_ext_tags *t, + const struct yaffs_packed_tags1 *pt) { - static const __u8 allFF[] = + static const u8 all_ff[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, -0xff }; + 0xff + }; - if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) { + if (memcmp(all_ff, pt, sizeof(struct yaffs_packed_tags1))) { t->block_bad = 0; - if (pt->shouldBeFF != 0xFFFFFFFF) + if (pt->should_be_ff != 0xFFFFFFFF) t->block_bad = 1; t->chunk_used = 1; t->obj_id = pt->obj_id; @@ -45,6 +48,6 @@ void yaffs_unpack_tags1(yaffs_ext_tags *t, const yaffs_PackedTags1 *pt) t->is_deleted = (pt->deleted) ? 0 : 1; t->serial_number = pt->serial_number; } else { - memset(t, 0, sizeof(yaffs_ext_tags)); + memset(t, 0, sizeof(struct yaffs_ext_tags)); } }