X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_packedtags1.c;h=dd9a331d8fc41e3dad052e75541f17bfc786b312;hp=905551208bbd3ec120a421f29ba15bf13efee975;hb=7dea5fe7a9a58636b5ce32fdbd58541c95c4a37d;hpb=757a553001be4016e9c5d8880648d3703f34b10e diff --git a/yaffs_packedtags1.c b/yaffs_packedtags1.c index 9055512..dd9a331 100644 --- a/yaffs_packedtags1.c +++ b/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 @@ -14,7 +14,16 @@ #include "yaffs_packedtags1.h" #include "yportenv.h" -void yaffs_pack_tags1(struct yaffs_packed_tags1 *pt, const struct 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; @@ -23,19 +32,16 @@ void yaffs_pack_tags1(struct yaffs_packed_tags1 *pt, const struct yaffs_ext_tags pt->ecc = 0; pt->deleted = (t->is_deleted) ? 0 : 1; pt->unused_stuff = 0; - pt->should_be_ff = 0xFFFFFFFF; - + pt->should_be_ff = 0xffffffff; } -void yaffs_unpack_tags1(struct yaffs_ext_tags *t, const struct yaffs_packed_tags1 *pt) +void yaffs_unpack_tags1(struct yaffs_ext_tags *t, + const struct yaffs_packed_tags1 *pt) { - static const u8 all_ff[] = - { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, -0xff }; if (memcmp(all_ff, pt, sizeof(struct yaffs_packed_tags1))) { t->block_bad = 0; - if (pt->should_be_ff != 0xFFFFFFFF) + if (pt->should_be_ff != 0xffffffff) t->block_bad = 1; t->chunk_used = 1; t->obj_id = pt->obj_id;