X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_packedtags2.c;h=6a22939495073415a98ba579e2872d3b5c1204f8;hp=4873f78ef12c8656dcea8497ea6567a69f8c1d7d;hb=4aab7ea4c9b8fb1bb9b375476a9faf70d29871b1;hpb=470ba34cc1d593fca7cd98bb9a385a100f7cb3ac diff --git a/yaffs_packedtags2.c b/yaffs_packedtags2.c index 4873f78..6a22939 100644 --- a/yaffs_packedtags2.c +++ b/yaffs_packedtags2.c @@ -39,19 +39,19 @@ #define EXTRA_OBJECT_TYPE_MASK ((0x0F) << EXTRA_OBJECT_TYPE_SHIFT) -static void yaffs_dump_packed_tags2_tags_only(const yaffs_packed_tags2_tags_only *ptt) +static void yaffs_dump_packed_tags2_tags_only(const struct yaffs_packed_tags2_tags_only *ptt) { T(YAFFS_TRACE_MTD, (TSTR("packed tags obj %d chunk %d byte %d seq %d" TENDSTR), ptt->obj_id, ptt->chunk_id, ptt->n_bytes, ptt->seq_number)); } -static void yaffs_dump_packed_tags2(const yaffs_packed_tags2 *pt) +static void yaffs_dump_packed_tags2(const struct yaffs_packed_tags2 *pt) { yaffs_dump_packed_tags2_tags_only(&pt->t); } -static void yaffs_dump_tags2(const yaffs_ext_tags *t) +static void yaffs_dump_tags2(const struct yaffs_ext_tags *t) { T(YAFFS_TRACE_MTD, (TSTR @@ -62,8 +62,8 @@ static void yaffs_dump_tags2(const yaffs_ext_tags *t) } -void yaffs_pack_tags2_tags_only(yaffs_packed_tags2_tags_only *ptt, - const yaffs_ext_tags *t) +void yaffs_pack_tags2_tags_only(struct yaffs_packed_tags2_tags_only *ptt, + const struct yaffs_ext_tags *t) { ptt->chunk_id = t->chunk_id; ptt->seq_number = t->seq_number; @@ -97,22 +97,22 @@ void yaffs_pack_tags2_tags_only(yaffs_packed_tags2_tags_only *ptt, } -void yaffs_pack_tags2(yaffs_packed_tags2 *pt, const yaffs_ext_tags *t, int tags_ecc) +void yaffs_pack_tags2(struct yaffs_packed_tags2 *pt, const struct yaffs_ext_tags *t, int tags_ecc) { yaffs_pack_tags2_tags_only(&pt->t, t); if(tags_ecc) yaffs_ecc_calc_other((unsigned char *)&pt->t, - sizeof(yaffs_packed_tags2_tags_only), + sizeof(struct yaffs_packed_tags2_tags_only), &pt->ecc); } -void yaffs_unpack_tags2_tags_only(yaffs_ext_tags *t, - yaffs_packed_tags2_tags_only *ptt) +void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t, + struct yaffs_packed_tags2_tags_only *ptt) { - memset(t, 0, sizeof(yaffs_ext_tags)); + memset(t, 0, sizeof(struct yaffs_ext_tags)); yaffs_init_tags(t); @@ -156,22 +156,22 @@ void yaffs_unpack_tags2_tags_only(yaffs_ext_tags *t, } -void yaffs_unpack_tags2(yaffs_ext_tags *t, yaffs_packed_tags2 *pt, int tags_ecc) +void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt, int tags_ecc) { - yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_NO_ERROR; + enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_NO_ERROR; if (pt->t.seq_number != 0xFFFFFFFF && tags_ecc){ /* Chunk is in use and we need to do ECC */ - yaffs_ecc_other ecc; + struct yaffs_ecc_other ecc; int result; yaffs_ecc_calc_other((unsigned char *)&pt->t, - sizeof(yaffs_packed_tags2_tags_only), + sizeof(struct yaffs_packed_tags2_tags_only), &ecc); result = yaffs_ecc_correct_other((unsigned char *)&pt->t, - sizeof(yaffs_packed_tags2_tags_only), + sizeof(struct yaffs_packed_tags2_tags_only), &pt->ecc, &ecc); switch (result) { case 0: