X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_checkptrw.c;h=dcf7cf5042df99cd6c445bba110034840a5691f4;hp=72541c293ac5fe1ac8440d6dd4d22a01925f7eb2;hb=ca5c7aa2360cc5ed3b8f946e935591a4d112d4b7;hpb=9da8de1ba0cd0748246a9d5e471e2db1636c04a5 diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c index 72541c2..dcf7cf5 100644 --- a/yaffs_checkptrw.c +++ b/yaffs_checkptrw.c @@ -1,5 +1,4 @@ -/* - * YAFFS: Yet another FFS. A NAND-flash specific file system. +/* YAFFS: Yet another FFS. A NAND-flash specific file system. * * Copyright (C) 2002 Aleph One Ltd. * for Toby Churchill Ltd and Brightstar Engineering @@ -13,7 +12,7 @@ */ const char *yaffs_checkptrw_c_version = - "$Id: yaffs_checkptrw.c,v 1.8 2006-11-09 19:55:24 charles Exp $"; + "$Id: yaffs_checkptrw.c,v 1.10 2006-11-10 02:51:10 charles Exp $"; #include "yaffs_checkptrw.h" @@ -100,11 +99,16 @@ static void yaffs_CheckpointFindNextCheckpointBlock(yaffs_Device *dev) int i; yaffs_ExtendedTags tags; + T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: start: blocks %d next %d" TENDSTR), + dev->blocksInCheckpoint, dev->checkpointNextBlock)); + if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks) for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){ int chunk = i * dev->nChunksPerBlock; dev->readChunkWithTagsFromNAND(dev,chunk,NULL,&tags); + T(YAFFS_TRACE_CHECKPOINT,(TSTR("find next checkpt block: search: block %d oid %d seq %d eccr %d" TENDSTR), + i, tags.objectId,tags.sequenceNumber,tags.eccResult)); if(tags.sequenceNumber == YAFFS_SEQUENCE_CHECKPOINT_DATA){ /* Right kind of block */ @@ -204,7 +208,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++;