*/
const char *yaffs_checkptrw_c_version =
- "$Id: yaffs_checkptrw.c,v 1.2 2006-05-17 09:31:07 charles Exp $";
+ "$Id: yaffs_checkptrw.c,v 1.4 2006-05-23 19:08:41 charles Exp $";
#include "yaffs_checkptrw.h"
int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
- if(blocksAvailable < 0)
- blocksAvailable = 0;
-
- T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpt blocks available" TENDSTR)));
+ T(YAFFS_TRACE_CHECKPOINT,
+ (TSTR("checkpt blocks available = %d" TENDSTR),
+ blocksAvailable));
- if(blocksAvailable <= 0)
- return 0;
-
- return 1;
+ return (blocksAvailable <= 0) ? 0 : 1;
}
yaffs_BlockInfo *bi = &dev->blockInfo[i];
if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
dev->checkpointNextBlock = i + 1;
- dev->nErasedBlocks--;
dev->checkpointCurrentBlock = i;
T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i));
return;
return 0;
if(!dev->checkpointBuffer)
- dev->checkpointBuffer = YMALLOC(dev->nBytesPerChunk);
+ dev->checkpointBuffer = YMALLOC_DMA(dev->nBytesPerChunk);
if(!dev->checkpointBuffer)
return 0;
dev->checkpointByteOffset = dev->nBytesPerChunk;
/* 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->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
for(i = 0; i < dev->checkpointMaxBlocks; i++)
tags.chunkId = dev->checkpointPageSequence + 1;
tags.sequenceNumber = YAFFS_SEQUENCE_CHECKPOINT_DATA;
tags.byteCount = dev->nBytesPerChunk;
+ if(dev->checkpointCurrentChunk == 0){
+ /* First chunk we write for the block? Set block state to
+ checkpoint */
+ yaffs_BlockInfo *bi = &dev->blockInfo[dev->checkpointCurrentBlock];
+ bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
+ dev->blocksInCheckpoint++;
+ }
chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;