X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_checkptrw.c;h=2b14006b71517fe2c5dc144fabb7af6e112aab5a;hp=afc7e470ba3f2ac0ae102e2ece981d572412564b;hb=cc6260c39bccfa63bcbdf8af6ae7974f0c2d0a61;hpb=f1bdfc2922899bb7f85385d0876bd82ebedd8f62

diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c
index afc7e47..2b14006 100644
--- a/yaffs_checkptrw.c
+++ b/yaffs_checkptrw.c
@@ -13,7 +13,7 @@
  */
 
 const char *yaffs_checkptrw_c_version =
-    "$Id: yaffs_checkptrw.c,v 1.6 2006-11-07 23:26:52 charles Exp $";
+    "$Id: yaffs_checkptrw.c,v 1.9 2006-11-09 23:57:07 charles Exp $";
 
 
 #include "yaffs_checkptrw.h"
@@ -43,9 +43,9 @@ static int yaffs_CheckpointErase(yaffs_Device *dev)
 	if(!dev->eraseBlockInNAND)	
 		return 0;
 	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR),
-		dev->startBlock,dev->endBlock));
+		dev->internalStartBlock,dev->internalEndBlock));
 		
-	for(i = dev->startBlock; i <= dev->endBlock; i++) {
+	for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
 		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
 		if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){
 			T(YAFFS_TRACE_CHECKPOINT,(TSTR("erasing checkpt block %d"TENDSTR),i));
@@ -71,12 +71,15 @@ static void yaffs_CheckpointFindNextErasedBlock(yaffs_Device *dev)
 {
 	int  i;
 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
+	T(YAFFS_TRACE_CHECKPOINT,
+		(TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
+		dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock));
 		
 	if(dev->checkpointNextBlock >= 0 &&
-	   dev->checkpointNextBlock <= dev->endBlock &&
+	   dev->checkpointNextBlock <= dev->internalEndBlock &&
 	   blocksAvailable > 0){
 	
-		for(i = dev->checkpointNextBlock; i <= dev->endBlock; i++){
+		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
 			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
 			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
 				dev->checkpointNextBlock = i + 1;
@@ -98,7 +101,7 @@ static void yaffs_CheckpointFindNextCheckpointBlock(yaffs_Device *dev)
 	yaffs_ExtendedTags tags;
 	
 	if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks) 
-		for(i = dev->checkpointNextBlock; i <= dev->endBlock; i++){
+		for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
 			int chunk = i * dev->nChunksPerBlock;
 
 			dev->readChunkWithTagsFromNAND(dev,chunk,NULL,&tags);
@@ -147,7 +150,7 @@ int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting)
 	dev->checkpointByteCount = 0;
 	dev->checkpointCurrentBlock = -1;
 	dev->checkpointCurrentChunk = -1;
-	dev->checkpointNextBlock = dev->startBlock;
+	dev->checkpointNextBlock = dev->internalStartBlock;
 	
 	/* Erase all the blocks in the checkpoint area */
 	if(forWriting){
@@ -163,7 +166,7 @@ int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting)
 		/* A checkpoint block list of 1 checkpoint block per 16 block is (hopefully)
 		 * going to be way more than we need */
 		dev->blocksInCheckpoint = 0;
-		dev->checkpointMaxBlocks = (dev->endBlock - dev->startBlock)/16 + 2;
+		dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
 		dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
 		for(i = 0; i < dev->checkpointMaxBlocks; i++)
 			dev->checkpointBlockList[i] = -1;
@@ -201,7 +204,10 @@ static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
 	}
 	
 	chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
-		
+	
+	T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
+		chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId)); 
+
 	dev->writeChunkWithTagsToNAND(dev,chunk,dev->checkpointBuffer,&tags);
 	dev->checkpointByteOffset = 0;
 	dev->checkpointPageSequence++;