X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_packedtags1.c;fp=yaffs_packedtags1.c;h=3ad49a941f6c3f7662c1fb06fb20bc791811665d;hp=db136b9faeeae269e19c27cc7ca1e4da2dc2ac0c;hb=f43976eda35065890e7cf0a008e9518158eb71d6;hpb=70c6bf2ff57c8a2fb778accdd5b4227abf273674

diff --git a/yaffs_packedtags1.c b/yaffs_packedtags1.c
index db136b9..3ad49a9 100644
--- a/yaffs_packedtags1.c
+++ b/yaffs_packedtags1.c
@@ -14,37 +14,37 @@
 #include "yaffs_packedtags1.h"
 #include "yportenv.h"
 
-void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ExtendedTags *t)
+void yaffs_PackTags1(yaffs_PackedTags1 *pt, const yaffs_ext_tags *t)
 {
-	pt->chunkId = t->chunkId;
-	pt->serialNumber = t->serialNumber;
-	pt->byteCount = t->byteCount;
-	pt->objectId = t->objectId;
+	pt->chunk_id = t->chunk_id;
+	pt->serial_number = t->serial_number;
+	pt->n_bytes = t->n_bytes;
+	pt->obj_id = t->obj_id;
 	pt->ecc = 0;
-	pt->deleted = (t->chunkDeleted) ? 0 : 1;
+	pt->deleted = (t->is_deleted) ? 0 : 1;
 	pt->unusedStuff = 0;
 	pt->shouldBeFF = 0xFFFFFFFF;
 
 }
 
-void yaffs_unpack_tags1(yaffs_ExtendedTags *t, const yaffs_PackedTags1 *pt)
+void yaffs_unpack_tags1(yaffs_ext_tags *t, const yaffs_PackedTags1 *pt)
 {
 	static const __u8 allFF[] =
 	    { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 0xff };
 
 	if (memcmp(allFF, pt, sizeof(yaffs_PackedTags1))) {
-		t->blockBad = 0;
+		t->block_bad = 0;
 		if (pt->shouldBeFF != 0xFFFFFFFF)
-			t->blockBad = 1;
-		t->chunkUsed = 1;
-		t->objectId = pt->objectId;
-		t->chunkId = pt->chunkId;
-		t->byteCount = pt->byteCount;
-		t->eccResult = YAFFS_ECC_RESULT_NO_ERROR;
-		t->chunkDeleted = (pt->deleted) ? 0 : 1;
-		t->serialNumber = pt->serialNumber;
+			t->block_bad = 1;
+		t->chunk_used = 1;
+		t->obj_id = pt->obj_id;
+		t->chunk_id = pt->chunk_id;
+		t->n_bytes = pt->n_bytes;
+		t->ecc_result = YAFFS_ECC_RESULT_NO_ERROR;
+		t->is_deleted = (pt->deleted) ? 0 : 1;
+		t->serial_number = pt->serial_number;
 	} else {
-		memset(t, 0, sizeof(yaffs_ExtendedTags));
+		memset(t, 0, sizeof(yaffs_ext_tags));
 	}
 }