*/
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.7 2006-11-08 00:33:29 charles Exp $";
#include "yaffs_checkptrw.h"
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));
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++){
+ 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;
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);
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){
/* 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;
*/
const char *yaffs_guts_c_version =
- "$Id: yaffs_guts.c,v 1.41 2006-11-07 23:26:52 charles Exp $";
+ "$Id: yaffs_guts.c,v 1.42 2006-11-08 00:33:29 charles Exp $";
#include "yportenv.h"
static void yaffs_ReportOddballBlocks(yaffs_Device *dev)
{
int i;
- for(i = dev->startBlock; i <= dev->endBlock; i++){
+
+ for(i = dev->internalStartBlock; i <= dev->internalEndBlock && (yaffs_traceMask & YAFFS_TRACE_BAD_BLOCKS); i++){
yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
if(bi->needsRetiring || bi->gcPrioritise)
T(YAFFS_TRACE_BAD_BLOCKS,(TSTR("yaffs block %d%s%s" TENDSTR),
dev->blockInfoAlt = 0;
/* Set up dynamic blockinfo stuff. */
- dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; // round up bytes
+ dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8; /* round up bytes */
dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
if(!dev->chunkBits){
dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);