X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_verify.c;h=39d16e6363752a384a4c01e41e62a92d9a69c487;hp=828570281448457c8c2cd700a414218f734cdcc5;hb=f43976eda35065890e7cf0a008e9518158eb71d6;hpb=70c6bf2ff57c8a2fb778accdd5b4227abf273674

diff --git a/yaffs_verify.c b/yaffs_verify.c
index 8285702..39d16e6 100644
--- a/yaffs_verify.c
+++ b/yaffs_verify.c
@@ -18,26 +18,26 @@
 #include "yaffs_getblockinfo.h"
 #include "yaffs_nand.h"
 
-int yaffs_skip_verification(yaffs_Device *dev)
+int yaffs_skip_verification(yaffs_dev_t *dev)
 {
 	dev=dev;
 	return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
 }
 
-static int yaffs_skip_full_verification(yaffs_Device *dev)
+static int yaffs_skip_full_verification(yaffs_dev_t *dev)
 {
 	dev=dev;
 	return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_FULL));
 }
 
-static int yaffs_skip_nand_verification(yaffs_Device *dev)
+static int yaffs_skip_nand_verification(yaffs_dev_t *dev)
 {
 	dev=dev;
 	return !(yaffs_trace_mask & (YAFFS_TRACE_VERIFY_NAND));
 }
 
 
-static const char *blockStateName[] = {
+static const char *block_stateName[] = {
 "Unknown",
 "Needs scanning",
 "Scanning",
@@ -51,7 +51,7 @@ static const char *blockStateName[] = {
 };
 
 
-void yaffs_verify_blk(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
+void yaffs_verify_blk(yaffs_dev_t *dev, yaffs_block_info_t *bi, int n)
 {
 	int actuallyUsed;
 	int inUse;
@@ -60,52 +60,52 @@ void yaffs_verify_blk(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
 		return;
 
 	/* Report illegal runtime states */
-	if (bi->blockState >= YAFFS_NUMBER_OF_BLOCK_STATES)
-		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->blockState));
+	if (bi->block_state >= YAFFS_NUMBER_OF_BLOCK_STATES)
+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has undefined state %d"TENDSTR), n, bi->block_state));
 
-	switch (bi->blockState) {
+	switch (bi->block_state) {
 	case YAFFS_BLOCK_STATE_UNKNOWN:
 	case YAFFS_BLOCK_STATE_SCANNING:
 	case YAFFS_BLOCK_STATE_NEEDS_SCANNING:
 		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has bad run-state %s"TENDSTR),
-		n, blockStateName[bi->blockState]));
+		n, block_stateName[bi->block_state]));
 	}
 
 	/* Check pages in use and soft deletions are legal */
 
-	actuallyUsed = bi->pagesInUse - bi->softDeletions;
+	actuallyUsed = bi->pages_in_use - bi->soft_del_pages;
 
-	if (bi->pagesInUse < 0 || bi->pagesInUse > dev->param.nChunksPerBlock ||
-	   bi->softDeletions < 0 || bi->softDeletions > dev->param.nChunksPerBlock ||
-	   actuallyUsed < 0 || actuallyUsed > dev->param.nChunksPerBlock)
-		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pagesInUsed %d softDeletions %d"TENDSTR),
-		n, bi->pagesInUse, bi->softDeletions));
+	if (bi->pages_in_use < 0 || bi->pages_in_use > dev->param.chunks_per_block ||
+	   bi->soft_del_pages < 0 || bi->soft_del_pages > dev->param.chunks_per_block ||
+	   actuallyUsed < 0 || actuallyUsed > dev->param.chunks_per_block)
+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has illegal values pages_in_used %d soft_del_pages %d"TENDSTR),
+		n, bi->pages_in_use, bi->soft_del_pages));
 
 
 	/* Check chunk bitmap legal */
 	inUse = yaffs_count_chunk_bits(dev, n);
-	if (inUse != bi->pagesInUse)
-		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pagesInUse %d counted chunk bits %d"TENDSTR),
-			n, bi->pagesInUse, inUse));
+	if (inUse != bi->pages_in_use)
+		T(YAFFS_TRACE_VERIFY, (TSTR("Block %d has inconsistent values pages_in_use %d counted chunk bits %d"TENDSTR),
+			n, bi->pages_in_use, inUse));
 
 }
 
 
 
-void yaffs_verify_collected_blk(yaffs_Device *dev, yaffs_BlockInfo *bi, int n)
+void yaffs_verify_collected_blk(yaffs_dev_t *dev, yaffs_block_info_t *bi, int n)
 {
 	yaffs_verify_blk(dev, bi, n);
 
 	/* After collection the block should be in the erased state */
 
-	if (bi->blockState != YAFFS_BLOCK_STATE_COLLECTING &&
-			bi->blockState != YAFFS_BLOCK_STATE_EMPTY) {
+	if (bi->block_state != YAFFS_BLOCK_STATE_COLLECTING &&
+			bi->block_state != YAFFS_BLOCK_STATE_EMPTY) {
 		T(YAFFS_TRACE_ERROR, (TSTR("Block %d is in state %d after gc, should be erased"TENDSTR),
-			n, bi->blockState));
+			n, bi->block_state));
 	}
 }
 
-void yaffs_verify_blocks(yaffs_Device *dev)
+void yaffs_verify_blocks(yaffs_dev_t *dev)
 {
 	int i;
 	int nBlocksPerState[YAFFS_NUMBER_OF_BLOCK_STATES];
@@ -116,12 +116,12 @@ void yaffs_verify_blocks(yaffs_Device *dev)
 
 	memset(nBlocksPerState, 0, sizeof(nBlocksPerState));
 
-	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-		yaffs_BlockInfo *bi = yaffs_get_block_info(dev, i);
+	for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
+		yaffs_block_info_t *bi = yaffs_get_block_info(dev, i);
 		yaffs_verify_blk(dev, bi, i);
 
-		if (bi->blockState < YAFFS_NUMBER_OF_BLOCK_STATES)
-			nBlocksPerState[bi->blockState]++;
+		if (bi->block_state < YAFFS_NUMBER_OF_BLOCK_STATES)
+			nBlocksPerState[bi->block_state]++;
 		else
 			nIllegalBlockStates++;
 	}
@@ -136,17 +136,17 @@ void yaffs_verify_blocks(yaffs_Device *dev)
 	for (i = 0; i < YAFFS_NUMBER_OF_BLOCK_STATES; i++)
 		T(YAFFS_TRACE_VERIFY,
 		  (TSTR("%s %d blocks"TENDSTR),
-		  blockStateName[i], nBlocksPerState[i]));
+		  block_stateName[i], nBlocksPerState[i]));
 
-	if (dev->blocksInCheckpoint != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
+	if (dev->blocks_in_checkpt != nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT])
 		T(YAFFS_TRACE_VERIFY,
 		 (TSTR("Checkpoint block count wrong dev %d count %d"TENDSTR),
-		 dev->blocksInCheckpoint, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
+		 dev->blocks_in_checkpt, nBlocksPerState[YAFFS_BLOCK_STATE_CHECKPOINT]));
 
-	if (dev->nErasedBlocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
+	if (dev->n_erased_blocks != nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY])
 		T(YAFFS_TRACE_VERIFY,
 		 (TSTR("Erased block count wrong dev %d count %d"TENDSTR),
-		 dev->nErasedBlocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
+		 dev->n_erased_blocks, nBlocksPerState[YAFFS_BLOCK_STATE_EMPTY]));
 
 	if (nBlocksPerState[YAFFS_BLOCK_STATE_COLLECTING] > 1)
 		T(YAFFS_TRACE_VERIFY,
@@ -161,9 +161,9 @@ void yaffs_verify_blocks(yaffs_Device *dev)
  * Verify the object header. oh must be valid, but obj and tags may be NULL in which
  * case those tests will not be performed.
  */
-void yaffs_verify_oh(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTags *tags, int parentCheck)
+void yaffs_verify_oh(yaffs_obj_t *obj, yaffs_obj_header *oh, yaffs_ext_tags *tags, int parentCheck)
 {
-	if (obj && yaffs_skip_verification(obj->myDev))
+	if (obj && yaffs_skip_verification(obj->my_dev))
 		return;
 
 	if (!(tags && obj && oh)) {
@@ -177,12 +177,12 @@ void yaffs_verify_oh(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTa
 			oh->type > YAFFS_OBJECT_TYPE_MAX)
 		T(YAFFS_TRACE_VERIFY,
 			(TSTR("Obj %d header type is illegal value 0x%x"TENDSTR),
-			tags->objectId, oh->type));
+			tags->obj_id, oh->type));
 
-	if (tags->objectId != obj->objectId)
+	if (tags->obj_id != obj->obj_id)
 		T(YAFFS_TRACE_VERIFY,
-			(TSTR("Obj %d header mismatch objectId %d"TENDSTR),
-			tags->objectId, obj->objectId));
+			(TSTR("Obj %d header mismatch obj_id %d"TENDSTR),
+			tags->obj_id, obj->obj_id));
 
 
 	/*
@@ -191,38 +191,38 @@ void yaffs_verify_oh(yaffs_Object *obj, yaffs_ObjectHeader *oh, yaffs_ExtendedTa
 	 * Tests do not apply to the root object.
 	 */
 
-	if (parentCheck && tags->objectId > 1 && !obj->parent)
+	if (parentCheck && tags->obj_id > 1 && !obj->parent)
 		T(YAFFS_TRACE_VERIFY,
-			(TSTR("Obj %d header mismatch parentId %d obj->parent is NULL"TENDSTR),
-			tags->objectId, oh->parentObjectId));
+			(TSTR("Obj %d header mismatch parent_id %d obj->parent is NULL"TENDSTR),
+			tags->obj_id, oh->parent_obj_id));
 
 	if (parentCheck && obj->parent &&
-			oh->parentObjectId != obj->parent->objectId &&
-			(oh->parentObjectId != YAFFS_OBJECTID_UNLINKED ||
-			obj->parent->objectId != YAFFS_OBJECTID_DELETED))
+			oh->parent_obj_id != obj->parent->obj_id &&
+			(oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED ||
+			obj->parent->obj_id != YAFFS_OBJECTID_DELETED))
 		T(YAFFS_TRACE_VERIFY,
-			(TSTR("Obj %d header mismatch parentId %d parentObjectId %d"TENDSTR),
-			tags->objectId, oh->parentObjectId, obj->parent->objectId));
+			(TSTR("Obj %d header mismatch parent_id %d parent_obj_id %d"TENDSTR),
+			tags->obj_id, oh->parent_obj_id, obj->parent->obj_id));
 
-	if (tags->objectId > 1 && oh->name[0] == 0) /* Null name */
+	if (tags->obj_id > 1 && oh->name[0] == 0) /* Null name */
 		T(YAFFS_TRACE_VERIFY,
 			(TSTR("Obj %d header name is NULL"TENDSTR),
-			obj->objectId));
+			obj->obj_id));
 
-	if (tags->objectId > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
+	if (tags->obj_id > 1 && ((__u8)(oh->name[0])) == 0xff) /* Trashed name */
 		T(YAFFS_TRACE_VERIFY,
 			(TSTR("Obj %d header name is 0xFF"TENDSTR),
-			obj->objectId));
+			obj->obj_id));
 }
 
 
 #if 0
 /* Not being used, but don't want to throw away yet */
-int yaffs_verify_tnode_worker(yaffs_Object *obj, yaffs_tnode_t *tn,
-					__u32 level, int chunkOffset)
+int yaffs_verify_tnode_worker(yaffs_obj_t *obj, yaffs_tnode_t *tn,
+					__u32 level, int chunk_offset)
 {
 	int i;
-	yaffs_Device *dev = obj->myDev;
+	yaffs_dev_t *dev = obj->my_dev;
 	int ok = 1;
 
 	if (tn) {
@@ -233,28 +233,28 @@ int yaffs_verify_tnode_worker(yaffs_Object *obj, yaffs_tnode_t *tn,
 					ok = yaffs_verify_tnode_worker(obj,
 							tn->internal[i],
 							level - 1,
-							(chunkOffset<<YAFFS_TNODES_INTERNAL_BITS) + i);
+							(chunk_offset<<YAFFS_TNODES_INTERNAL_BITS) + i);
 				}
 			}
 		} else if (level == 0) {
-			yaffs_ExtendedTags tags;
-			__u32 objectId = obj->objectId;
+			yaffs_ext_tags tags;
+			__u32 obj_id = obj->obj_id;
 
-			chunkOffset <<=  YAFFS_TNODES_LEVEL0_BITS;
+			chunk_offset <<=  YAFFS_TNODES_LEVEL0_BITS;
 
 			for (i = 0; i < YAFFS_NTNODES_LEVEL0; i++) {
 				__u32 theChunk = yaffs_get_group_base(dev, tn, i);
 
 				if (theChunk > 0) {
-					/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.objectId,tags.chunkId,theChunk)); */
+					/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),tags.obj_id,tags.chunk_id,theChunk)); */
 					yaffs_rd_chunk_tags_nand(dev, theChunk, NULL, &tags);
-					if (tags.objectId != objectId || tags.chunkId != chunkOffset) {
-						T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-							objectId, chunkOffset, theChunk,
-							tags.objectId, tags.chunkId));
+					if (tags.obj_id != obj_id || tags.chunk_id != chunk_offset) {
+						T(~0, (TSTR("Object %d chunk_id %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
+							obj_id, chunk_offset, theChunk,
+							tags.obj_id, tags.chunk_id));
 					}
 				}
-				chunkOffset++;
+				chunk_offset++;
 			}
 		}
 	}
@@ -265,29 +265,29 @@ int yaffs_verify_tnode_worker(yaffs_Object *obj, yaffs_tnode_t *tn,
 
 #endif
 
-void yaffs_verify_file(yaffs_Object *obj)
+void yaffs_verify_file(yaffs_obj_t *obj)
 {
 	int requiredTallness;
 	int actualTallness;
 	__u32 lastChunk;
 	__u32 x;
 	__u32 i;
-	yaffs_Device *dev;
-	yaffs_ExtendedTags tags;
+	yaffs_dev_t *dev;
+	yaffs_ext_tags tags;
 	yaffs_tnode_t *tn;
-	__u32 objectId;
+	__u32 obj_id;
 
 	if (!obj)
 		return;
 
-	if (yaffs_skip_verification(obj->myDev))
+	if (yaffs_skip_verification(obj->my_dev))
 		return;
 
-	dev = obj->myDev;
-	objectId = obj->objectId;
+	dev = obj->my_dev;
+	obj_id = obj->obj_id;
 
 	/* Check file size is consistent with tnode depth */
-	lastChunk =  obj->variant.fileVariant.fileSize / dev->nDataBytesPerChunk + 1;
+	lastChunk =  obj->variant.file_variant.file_size / dev->data_bytes_per_chunk + 1;
 	x = lastChunk >> YAFFS_TNODES_LEVEL0_BITS;
 	requiredTallness = 0;
 	while (x > 0) {
@@ -295,7 +295,7 @@ void yaffs_verify_file(yaffs_Object *obj)
 		requiredTallness++;
 	}
 
-	actualTallness = obj->variant.fileVariant.topLevel;
+	actualTallness = obj->variant.file_variant.top_level;
 
 	/* Check that the chunks in the tnode tree are all correct.
 	 * We do this by scanning through the tnode tree and
@@ -306,17 +306,17 @@ void yaffs_verify_file(yaffs_Object *obj)
 		return;
 
 	for (i = 1; i <= lastChunk; i++) {
-		tn = yaffs_find_tnode_0(dev, &obj->variant.fileVariant, i);
+		tn = yaffs_find_tnode_0(dev, &obj->variant.file_variant, i);
 
 		if (tn) {
 			__u32 theChunk = yaffs_get_group_base(dev, tn, i);
 			if (theChunk > 0) {
-				/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),objectId,i,theChunk)); */
+				/* T(~0,(TSTR("verifying (%d:%d) %d"TENDSTR),obj_id,i,theChunk)); */
 				yaffs_rd_chunk_tags_nand(dev, theChunk, NULL, &tags);
-				if (tags.objectId != objectId || tags.chunkId != i) {
-					T(~0, (TSTR("Object %d chunkId %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
-						objectId, i, theChunk,
-						tags.objectId, tags.chunkId));
+				if (tags.obj_id != obj_id || tags.chunk_id != i) {
+					T(~0, (TSTR("Object %d chunk_id %d NAND mismatch chunk %d tags (%d:%d)"TENDSTR),
+						obj_id, i, theChunk,
+						tags.obj_id, tags.chunk_id));
 				}
 			}
 		}
@@ -324,36 +324,36 @@ void yaffs_verify_file(yaffs_Object *obj)
 }
 
 
-void yaffs_verify_link(yaffs_Object *obj)
+void yaffs_verify_link(yaffs_obj_t *obj)
 {
-	if (obj && yaffs_skip_verification(obj->myDev))
+	if (obj && yaffs_skip_verification(obj->my_dev))
 		return;
 
 	/* Verify sane equivalent object */
 }
 
-void yaffs_verify_symlink(yaffs_Object *obj)
+void yaffs_verify_symlink(yaffs_obj_t *obj)
 {
-	if (obj && yaffs_skip_verification(obj->myDev))
+	if (obj && yaffs_skip_verification(obj->my_dev))
 		return;
 
 	/* Verify symlink string */
 }
 
-void yaffs_verify_special(yaffs_Object *obj)
+void yaffs_verify_special(yaffs_obj_t *obj)
 {
-	if (obj && yaffs_skip_verification(obj->myDev))
+	if (obj && yaffs_skip_verification(obj->my_dev))
 		return;
 }
 
-void yaffs_verify_obj(yaffs_Object *obj)
+void yaffs_verify_obj(yaffs_obj_t *obj)
 {
-	yaffs_Device *dev;
+	yaffs_dev_t *dev;
 
 	__u32 chunkMin;
 	__u32 chunkMax;
 
-	__u32 chunkIdOk;
+	__u32 chunk_idOk;
 	__u32 chunkInRange;
 	__u32 chunkShouldNotBeDeleted;
 	__u32 chunkValid;
@@ -361,44 +361,44 @@ void yaffs_verify_obj(yaffs_Object *obj)
 	if (!obj)
 		return;
 
-	if (obj->beingCreated)
+	if (obj->being_created)
 		return;
 
-	dev = obj->myDev;
+	dev = obj->my_dev;
 
 	if (yaffs_skip_verification(dev))
 		return;
 
 	/* Check sane object header chunk */
 
-	chunkMin = dev->internalStartBlock * dev->param.nChunksPerBlock;
-	chunkMax = (dev->internalEndBlock+1) * dev->param.nChunksPerBlock - 1;
+	chunkMin = dev->internal_start_block * dev->param.chunks_per_block;
+	chunkMax = (dev->internal_end_block+1) * dev->param.chunks_per_block - 1;
 
-	chunkInRange = (((unsigned)(obj->hdrChunk)) >= chunkMin && ((unsigned)(obj->hdrChunk)) <= chunkMax);
-	chunkIdOk = chunkInRange || (obj->hdrChunk == 0);
+	chunkInRange = (((unsigned)(obj->hdr_chunk)) >= chunkMin && ((unsigned)(obj->hdr_chunk)) <= chunkMax);
+	chunk_idOk = chunkInRange || (obj->hdr_chunk == 0);
 	chunkValid = chunkInRange &&
 			yaffs_check_chunk_bit(dev,
-					obj->hdrChunk / dev->param.nChunksPerBlock,
-					obj->hdrChunk % dev->param.nChunksPerBlock);
+					obj->hdr_chunk / dev->param.chunks_per_block,
+					obj->hdr_chunk % dev->param.chunks_per_block);
 	chunkShouldNotBeDeleted = chunkInRange && !chunkValid;
 
 	if (!obj->fake &&
-			(!chunkIdOk || chunkShouldNotBeDeleted)) {
+			(!chunk_idOk || chunkShouldNotBeDeleted)) {
 		T(YAFFS_TRACE_VERIFY,
-			(TSTR("Obj %d has chunkId %d %s %s"TENDSTR),
-			obj->objectId, obj->hdrChunk,
-			chunkIdOk ? "" : ",out of range",
+			(TSTR("Obj %d has chunk_id %d %s %s"TENDSTR),
+			obj->obj_id, obj->hdr_chunk,
+			chunk_idOk ? "" : ",out of range",
 			chunkShouldNotBeDeleted ? ",marked as deleted" : ""));
 	}
 
 	if (chunkValid && !yaffs_skip_nand_verification(dev)) {
-		yaffs_ExtendedTags tags;
-		yaffs_ObjectHeader *oh;
+		yaffs_ext_tags tags;
+		yaffs_obj_header *oh;
 		__u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
 
-		oh = (yaffs_ObjectHeader *)buffer;
+		oh = (yaffs_obj_header *)buffer;
 
-		yaffs_rd_chunk_tags_nand(dev, obj->hdrChunk, buffer,
+		yaffs_rd_chunk_tags_nand(dev, obj->hdr_chunk, buffer,
 				&tags);
 
 		yaffs_verify_oh(obj, oh, &tags, 1);
@@ -408,20 +408,20 @@ void yaffs_verify_obj(yaffs_Object *obj)
 
 	/* Verify it has a parent */
 	if (obj && !obj->fake &&
-			(!obj->parent || obj->parent->myDev != dev)) {
+			(!obj->parent || obj->parent->my_dev != dev)) {
 		T(YAFFS_TRACE_VERIFY,
 			(TSTR("Obj %d has parent pointer %p which does not look like an object"TENDSTR),
-			obj->objectId, obj->parent));
+			obj->obj_id, obj->parent));
 	}
 
 	/* Verify parent is a directory */
-	if (obj->parent && obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+	if (obj->parent && obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
 		T(YAFFS_TRACE_VERIFY,
 			(TSTR("Obj %d's parent is not a directory (type %d)"TENDSTR),
-			obj->objectId, obj->parent->variantType));
+			obj->obj_id, obj->parent->variant_type));
 	}
 
-	switch (obj->variantType) {
+	switch (obj->variant_type) {
 	case YAFFS_OBJECT_TYPE_FILE:
 		yaffs_verify_file(obj);
 		break;
@@ -441,14 +441,14 @@ void yaffs_verify_obj(yaffs_Object *obj)
 	default:
 		T(YAFFS_TRACE_VERIFY,
 		(TSTR("Obj %d has illegaltype %d"TENDSTR),
-		obj->objectId, obj->variantType));
+		obj->obj_id, obj->variant_type));
 		break;
 	}
 }
 
-void yaffs_verify_objects(yaffs_Device *dev)
+void yaffs_verify_objects(yaffs_dev_t *dev)
 {
-	yaffs_Object *obj;
+	yaffs_obj_t *obj;
 	int i;
 	struct ylist_head *lh;
 
@@ -458,9 +458,9 @@ void yaffs_verify_objects(yaffs_Device *dev)
 	/* Iterate through the objects in each hash entry */
 
 	for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-		ylist_for_each(lh, &dev->objectBucket[i].list) {
+		ylist_for_each(lh, &dev->obj_bucket[i].list) {
 			if (lh) {
-				obj = ylist_entry(lh, yaffs_Object, hashLink);
+				obj = ylist_entry(lh, yaffs_obj_t, hash_link);
 				yaffs_verify_obj(obj);
 			}
 		}
@@ -468,10 +468,10 @@ void yaffs_verify_objects(yaffs_Device *dev)
 }
 
 
-void yaffs_verify_obj_in_dir(yaffs_Object *obj)
+void yaffs_verify_obj_in_dir(yaffs_obj_t *obj)
 {
 	struct ylist_head *lh;
-	yaffs_Object *listObj;
+	yaffs_obj_t *listObj;
 
 	int count = 0;
 
@@ -481,7 +481,7 @@ void yaffs_verify_obj_in_dir(yaffs_Object *obj)
 		return;
 	}
 
-	if (yaffs_skip_verification(obj->myDev))
+	if (yaffs_skip_verification(obj->my_dev))
 		return;
 
 	if (!obj->parent) {
@@ -490,16 +490,16 @@ void yaffs_verify_obj_in_dir(yaffs_Object *obj)
 		return;
 	}
 
-	if (obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+	if (obj->parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
 		T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
 		YBUG();
 	}
 
 	/* Iterate through the objects in each hash entry */
 
-	ylist_for_each(lh, &obj->parent->variant.directoryVariant.children) {
+	ylist_for_each(lh, &obj->parent->variant.dir_variant.children) {
 		if (lh) {
-			listObj = ylist_entry(lh, yaffs_Object, siblings);
+			listObj = ylist_entry(lh, yaffs_obj_t, siblings);
 			yaffs_verify_obj(listObj);
 			if (obj == listObj)
 				count++;
@@ -512,29 +512,29 @@ void yaffs_verify_obj_in_dir(yaffs_Object *obj)
 	}
 }
 
-void yaffs_verify_dir(yaffs_Object *directory)
+void yaffs_verify_dir(yaffs_obj_t *directory)
 {
 	struct ylist_head *lh;
-	yaffs_Object *listObj;
+	yaffs_obj_t *listObj;
 
 	if (!directory) {
 		YBUG();
 		return;
 	}
 
-	if (yaffs_skip_full_verification(directory->myDev))
+	if (yaffs_skip_full_verification(directory->my_dev))
 		return;
 
-	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
-		T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variantType));
+	if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
+		T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR), directory->variant_type));
 		YBUG();
 	}
 
 	/* Iterate through the objects in each hash entry */
 
-	ylist_for_each(lh, &directory->variant.directoryVariant.children) {
+	ylist_for_each(lh, &directory->variant.dir_variant.children) {
 		if (lh) {
-			listObj = ylist_entry(lh, yaffs_Object, siblings);
+			listObj = ylist_entry(lh, yaffs_obj_t, siblings);
 			if (listObj->parent != directory) {
 				T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent %p" TENDSTR), listObj->parent));
 				YBUG();
@@ -546,7 +546,7 @@ void yaffs_verify_dir(yaffs_Object *directory)
 
 static int yaffs_free_verification_failures;
 
-void yaffs_verify_free_chunks(yaffs_Device *dev)
+void yaffs_verify_free_chunks(yaffs_dev_t *dev)
 {
 	int counted;
 	int difference;
@@ -556,40 +556,40 @@ void yaffs_verify_free_chunks(yaffs_Device *dev)
 
 	counted = yaffs_count_free_chunks(dev);
 
-	difference = dev->nFreeChunks - counted;
+	difference = dev->n_free_chunks - counted;
 
 	if (difference) {
 		T(YAFFS_TRACE_ALWAYS,
 		  (TSTR("Freechunks verification failure %d %d %d" TENDSTR),
-		   dev->nFreeChunks, counted, difference));
+		   dev->n_free_chunks, counted, difference));
 		yaffs_free_verification_failures++;
 	}
 }
 
-int yaffs_verify_file_sane(yaffs_Object *in)
+int yaffs_verify_file_sane(yaffs_obj_t *in)
 {
 #if 0
 	int chunk;
-	int nChunks;
+	int n_chunks;
 	int fSize;
 	int failed = 0;
-	int objId;
+	int obj_id;
 	yaffs_tnode_t *tn;
-	yaffs_Tags localTags;
-	yaffs_Tags *tags = &localTags;
+	yaffs_tags_t localTags;
+	yaffs_tags_t *tags = &localTags;
 	int theChunk;
-	int chunkDeleted;
+	int is_deleted;
 
-	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
+	if (in->variant_type != YAFFS_OBJECT_TYPE_FILE)
 		return YAFFS_FAIL;
 
-	objId = in->objectId;
-	fSize = in->variant.fileVariant.fileSize;
-	nChunks =
-	    (fSize + in->myDev->nDataBytesPerChunk - 1) / in->myDev->nDataBytesPerChunk;
+	obj_id = in->obj_id;
+	fSize = in->variant.file_variant.file_size;
+	n_chunks =
+	    (fSize + in->my_dev->data_bytes_per_chunk - 1) / in->my_dev->data_bytes_per_chunk;
 
-	for (chunk = 1; chunk <= nChunks; chunk++) {
-		tn = yaffs_find_tnode_0(in->myDev, &in->variant.fileVariant,
+	for (chunk = 1; chunk <= n_chunks; chunk++) {
+		tn = yaffs_find_tnode_0(in->my_dev, &in->variant.file_variant,
 					   chunk);
 
 		if (tn) {
@@ -597,14 +597,14 @@ int yaffs_verify_file_sane(yaffs_Object *in)
 			theChunk = yaffs_get_group_base(dev, tn, chunk);
 
 			if (yaffs_check_chunk_bits
-			    (dev, theChunk / dev->param.nChunksPerBlock,
-			     theChunk % dev->param.nChunksPerBlock)) {
+			    (dev, theChunk / dev->param.chunks_per_block,
+			     theChunk % dev->param.chunks_per_block)) {
 
-				yaffs_rd_chunk_tags_nand(in->myDev, theChunk,
+				yaffs_rd_chunk_tags_nand(in->my_dev, theChunk,
 							    tags,
-							    &chunkDeleted);
+							    &is_deleted);
 				if (yaffs_tags_match
-				    (tags, in->objectId, chunk, chunkDeleted)) {
+				    (tags, in->obj_id, chunk, is_deleted)) {
 					/* found it; */
 
 				}