*/
const char *yaffs_guts_c_version =
- "$Id: yaffs_guts.c,v 1.19 2005-09-20 05:08:50 charles Exp $";
+ "$Id: yaffs_guts.c,v 1.21 2005-10-09 07:55:00 charles Exp $";
#include "yportenv.h"
/* Todo we're assuming the malloc will pass. */
dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
+ if(!dev->blockInfo){
+ dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
+ dev->blockInfoAlt = 1;
+ }
+ else
+ dev->blockInfoAlt = 0;
/* 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);
static void yaffs_DeinitialiseBlocks(yaffs_Device * dev)
{
- YFREE(dev->blockInfo);
+ if(dev->blockInfoAlt)
+ YFREE_ALT(dev->blockInfo);
+ else
+ YFREE(dev->blockInfo);
+ 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;
}