X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_checkptrw.c;h=ed12fa509d7984f3fc532bce4410401af332a90b;hp=6ed976db80f795e3b34b2341d2e77784093e947c;hb=5dcdf77ef2af74d01edb41d8eadee55176c33cad;hpb=84e0675793174e99e63ccf0e0af616a6a5a3c1ab

diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c
index 6ed976d..ed12fa5 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.4 2006-05-23 19:08:41 charles Exp $";
+    "$Id: yaffs_checkptrw.c,v 1.7 2006-11-08 00:33:29 charles Exp $";
 
 
 #include "yaffs_checkptrw.h"
@@ -43,10 +43,10 @@ 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++) {
-		yaffs_BlockInfo *bi = &dev->blockInfo[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));
 			if(dev->eraseBlockInNAND(dev,i)){
@@ -73,11 +73,11 @@ static void yaffs_CheckpointFindNextErasedBlock(yaffs_Device *dev)
 	int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
 		
 	if(dev->checkpointNextBlock >= 0 &&
-	   dev->checkpointNextBlock <= dev->endBlock &&
+	   dev->checkpointNextBlock <= dev->internalEndBlock &&
 	   blocksAvailable > 0){
 	
-		for(i = dev->checkpointNextBlock; i <= dev->endBlock; i++){
-			yaffs_BlockInfo *bi = &dev->blockInfo[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;
 				dev->checkpointCurrentBlock = i;
@@ -98,7 +98,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);
@@ -135,7 +135,7 @@ int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting)
 		return 0;
 			
 	if(!dev->checkpointBuffer)
-		dev->checkpointBuffer = YMALLOC_DMA(dev->nBytesPerChunk);
+		dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk);
 	if(!dev->checkpointBuffer)
 		return 0;
 
@@ -147,11 +147,11 @@ 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){
-		memset(dev->checkpointBuffer,0,dev->nBytesPerChunk);
+		memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
 		dev->checkpointByteOffset = 0;
 		return yaffs_CheckpointErase(dev);
 		
@@ -159,11 +159,11 @@ int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting)
 	} else {
 		int i;
 		/* Set to a value that will kick off a read */
-		dev->checkpointByteOffset = dev->nBytesPerChunk;
+		dev->checkpointByteOffset = dev->nDataBytesPerChunk;
 		/* 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;
@@ -191,11 +191,11 @@ static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
 	tags.objectId = dev->checkpointNextBlock; /* Hint to next place to look */
 	tags.chunkId = dev->checkpointPageSequence + 1;
 	tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
-	tags.byteCount = dev->nBytesPerChunk;
+	tags.byteCount = dev->nDataBytesPerChunk;
 	if(dev->checkpointCurrentChunk == 0){
 		/* First chunk we write for the block? Set block state to
 		   checkpoint */
-		yaffs_BlockInfo *bi = &dev->blockInfo[dev->checkpointCurrentBlock];
+		yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointCurrentBlock);
 		bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
 		dev->blocksInCheckpoint++;
 	}
@@ -210,7 +210,7 @@ static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
 		dev->checkpointCurrentChunk = 0;
 		dev->checkpointCurrentBlock = -1;
 	}
-	memset(dev->checkpointBuffer,0,dev->nBytesPerChunk);
+	memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
 	
 	return 1;
 }
@@ -241,7 +241,7 @@ int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes)
 		
 		
 		if(dev->checkpointByteOffset < 0 ||
-		   dev->checkpointByteOffset >= dev->nBytesPerChunk) 
+		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk) 
 			ok = yaffs_CheckpointFlushBuffer(dev);
 
 	}
@@ -267,7 +267,7 @@ int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
 	
 	
 		if(dev->checkpointByteOffset < 0 ||
-		   dev->checkpointByteOffset >= dev->nBytesPerChunk) {
+		   dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
 		   
 		   	if(dev->checkpointCurrentBlock < 0){
 				yaffs_CheckpointFindNextCheckpointBlock(dev);
@@ -321,7 +321,7 @@ int yaffs_CheckpointClose(yaffs_Device *dev)
 	} else {
 		int i;
 		for(i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++){
-			yaffs_BlockInfo *bi = &dev->blockInfo[dev->checkpointBlockList[i]];
+			yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointBlockList[i]);
 			if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
 				bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
 			else {