*/
const char *yaffs_guts_c_version =
- "$Id: yaffs_guts.c,v 1.20 2005-10-07 02:46:49 charles Exp $";
+ "$Id: yaffs_guts.c,v 1.22 2005-10-13 02:17:00 charles Exp $";
#include "yportenv.h"
/* Set up dynamic blockinfo stuff. */
dev->chunkBitmapStride = (dev->nChunksPerBlock + 7) / 8;
dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
+ if(!dev->chunkBits){
+ dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
+ dev->chunkBitsAlt = 1;
+ }
+ else
+ dev->chunkBitsAlt = 0;
+
if (dev->blockInfo && dev->chunkBits) {
memset(dev->blockInfo, 0, nBlocks * sizeof(yaffs_BlockInfo));
memset(dev->chunkBits, 0, dev->chunkBitmapStride * nBlocks);
dev->blockInfoAlt = 0;
dev->blockInfo = NULL;
- YFREE(dev->chunkBits);
+
+ if(dev->chunkBitsAlt)
+ YFREE_ALT(dev->chunkBits);
+ else
+ YFREE(dev->chunkBits);
+ dev->chunkBitsAlt = 0;
dev->chunkBits = NULL;
}
if (markNAND &&
bi->blockState != YAFFS_BLOCK_STATE_COLLECTING && !dev->isYaffs2) {
-#ifdef CONFIG_MTD_NAND_VERIFY_WRITE
-
- /* Read data before write, to ensure correct ecc
- * if we're using MTD verification under Linux
- */
- yaffs_ReadChunkFromNAND(dev, chunkId, NULL, &spare, 0);
-#endif
-
yaffs_InitialiseTags(&tags);
tags.chunkDeleted = 1;