diff options
Diffstat (limited to 'target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c')
-rw-r--r-- | target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c b/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c index 3ad49a941f..dd9a331d8f 100644 --- a/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c +++ b/target/linux/generic/files/fs/yaffs2/yaffs_packedtags1.c @@ -1,7 +1,7 @@ /* * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. * - * Copyright (C) 2002-2010 Aleph One Ltd. + * Copyright (C) 2002-2011 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering * * Created by Charles Manning <charles@aleph1.co.uk> @@ -14,7 +14,16 @@ #include "yaffs_packedtags1.h" #include "yportenv.h" -void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ext_tags *t) +static const u8 all_ff[20] = { + 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff +}; + +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 +31,17 @@ 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[] = - { 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 +51,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)); } } |