-typedef struct
-{
- unsigned sequenceNumber;
- unsigned chunkId;
- unsigned objectId;
- unsigned byteCount;
- unsigned nandTagsEcc;
-
-} yaffs_PackedTags2TagsPart;
-
-typedef struct
-{
- yaffs_PackedTags2TagsPart t;
- yaffs_ECCOther ecc;
-} yaffs_PackedTags2;
-
-
-void yaffs_PackTags2(yaffs_PackedTags2 *pt, const yaffs_ExtendedTags *t);
-void yaffs_UnpackTags2(yaffs_ExtendedTags *t, const yaffs_PackedTags2 *pt);
+typedef struct {
+ unsigned seq_number;
+ unsigned obj_id;
+ unsigned chunk_id;
+ unsigned n_bytes;
+} yaffs_packed_tags2_tags_only;
+
+typedef struct {
+ yaffs_packed_tags2_tags_only t;
+ yaffs_ecc_other ecc;
+} yaffs_packed_tags2;
+
+/* Full packed tags with ECC, used for oob tags */
+void yaffs_pack_tags2(yaffs_packed_tags2 *pt, const struct yaffs_ext_tags *t, int tags_ecc);
+void yaffs_unpack_tags2(struct yaffs_ext_tags *t, yaffs_packed_tags2 *pt, int tags_ecc);
+
+/* Only the tags part (no ECC for use with inband tags */
+void yaffs_pack_tags2_tags_only(yaffs_packed_tags2_tags_only *pt, const struct yaffs_ext_tags *t);
+void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t, yaffs_packed_tags2_tags_only *pt);