#include "yaffs_nandemul2k.h"
#include "yaffs_guts.h"
-#include "devextras.h"
#include "yaffs_packedtags2.h"
ned.nBlocks = nBlocks = nandemul2k_CalcNBlocks();
- ned.block = YMALLOC(sizeof(nandemul_Block*) * nBlocks );
+ ned.block = malloc(sizeof(nandemul_Block*) * nBlocks );
if(!ned.block) return YAFFS_FAIL;
nandemul_Block *blk;
- if(!(blk = ned.block[i] = YMALLOC(sizeof(nandemul_Block))))
+ if(!(blk = ned.block[i] = malloc(sizeof(nandemul_Block))))
{
fail = 1;
}
{
for(j = 0; j < PAGES_PER_BLOCK; j++)
{
- if((blk->page[j] = YMALLOC(sizeof(nandemul_Page))) == 0)
+ if((blk->page[j] = malloc(sizeof(nandemul_Page))) == 0)
{
fail = 1;
}
for(i = 0; i < nAllocated; i++)
{
- YFREE(ned.block[i]);
+ kfree(ned.block[i]);
}
- YFREE(ned.block);
+ kfree(ned.block);
- T(YAFFS_TRACE_ALWAYS,("Allocation failed, could only allocate %dMB of %dMB requested.\n",
- nAllocated/64,sizeInMB));
+ yaffs_trace(YAFFS_TRACE_ALWAYS,
+ "Allocation failed, could only allocate %dMB of %dMB requested.\n",
+ nAllocated/64,sizeInMB);
return 0;
}
{
x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
- yaffs_pack_tags2((yaffs_packed_tags2 *)x,tags, !dev->param.no_tags_ecc);
+ yaffs_pack_tags2((struct yaffs_packed_tags2 *)x,tags, !dev->param.no_tags_ecc);
}
{
x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
- yaffs_unpack_tags2(tags,(yaffs_packed_tags2 *)x, !dev->param.no_tags_ecc);
+ yaffs_unpack_tags2(tags,(struct yaffs_packed_tags2 *)x, !dev->param.no_tags_ecc);
}
return YAFFS_OK;
if(blockNumber < 0 || blockNumber >= ned.nBlocks)
{
- T(YAFFS_TRACE_ALWAYS,("Attempt to erase non-existant block %d\n",blockNumber));
+ yaffs_trace(YAFFS_TRACE_ALWAYS,
+ "Attempt to erase non-existant block %d\n",
+ blockNumber);
}
else if(ned.block[blockNumber]->damaged)
{
- T(YAFFS_TRACE_ALWAYS,("Attempt to erase damaged block %d\n",blockNumber));
+ yaffs_trace(YAFFS_TRACE_ALWAYS,
+ "Attempt to erase damaged block %d\n",
+ blockNumber);
}
else
{
x = &ned.block[block_no]->page[0]->data[PAGE_DATA_SIZE];
- memset(x,0,sizeof(yaffs_packed_tags2));
+ memset(x,0,sizeof(struct yaffs_packed_tags2));
return YAFFS_OK;
}
-int nandemul2k_QueryNANDBlock(struct yaffs_dev *dev, int block_no, yaffs_block_state_t *state, u32 *seq_number)
+int nandemul2k_QueryNANDBlock(struct yaffs_dev *dev, int block_no, enum yaffs_block_state *state, u32 *seq_number)
{
struct yaffs_ext_tags tags;
int chunkNo;