/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
* published by the Free Software Foundation.
*/
-const char *yaffs_nand_c_version =
- "$Id: yaffs_nand.c,v 1.11 2009-09-09 03:03:01 charles Exp $";
-
#include "yaffs_nand.h"
#include "yaffs_tagscompat.h"
#include "yaffs_tagsvalidity.h"
#include "yaffs_getblockinfo.h"
-int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
+int yaffs_rd_chunk_tags_nand(yaffs_Device *dev, int chunkInNAND,
__u8 *buffer,
yaffs_ExtendedTags *tags)
{
if (!tags)
tags = &localTags;
- if (dev->readChunkWithTagsFromNAND)
- result = dev->readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
+ if (dev->param.readChunkWithTagsFromNAND)
+ result = dev->param.readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
tags);
else
- result = yaffs_TagsCompatabilityReadChunkWithTagsFromNAND(dev,
+ result = yaffs_tags_compat_rd(dev,
realignedChunkInNAND,
buffer,
tags);
if (tags &&
tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
- yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
- yaffs_HandleChunkError(dev, bi);
+ yaffs_BlockInfo *bi;
+ bi = yaffs_get_block_info(dev, chunkInNAND/dev->param.nChunksPerBlock);
+ yaffs_handle_chunk_error(dev, bi);
}
return result;
}
-int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
+int yaffs_wr_chunk_tags_nand(yaffs_Device *dev,
int chunkInNAND,
const __u8 *buffer,
yaffs_ExtendedTags *tags)
if (tags) {
tags->sequenceNumber = dev->sequenceNumber;
tags->chunkUsed = 1;
- if (!yaffs_ValidateTags(tags)) {
+ if (!yaffs_validate_tags(tags)) {
T(YAFFS_TRACE_ERROR,
(TSTR("Writing uninitialised tags" TENDSTR)));
YBUG();
YBUG();
}
- if (dev->writeChunkWithTagsToNAND)
- return dev->writeChunkWithTagsToNAND(dev, chunkInNAND, buffer,
+ if (dev->param.writeChunkWithTagsToNAND)
+ return dev->param.writeChunkWithTagsToNAND(dev, chunkInNAND, buffer,
tags);
else
- return yaffs_TagsCompatabilityWriteChunkWithTagsToNAND(dev,
+ return yaffs_tags_compat_wr(dev,
chunkInNAND,
buffer,
tags);
}
-int yaffs_MarkBlockBad(yaffs_Device *dev, int blockNo)
+int yaffs_mark_bad(yaffs_Device *dev, int blockNo)
{
blockNo -= dev->blockOffset;
- if (dev->markNANDBlockBad)
- return dev->markNANDBlockBad(dev, blockNo);
+ if (dev->param.markNANDBlockBad)
+ return dev->param.markNANDBlockBad(dev, blockNo);
else
- return yaffs_TagsCompatabilityMarkNANDBlockBad(dev, blockNo);
+ return yaffs_tags_compat_mark_bad(dev, blockNo);
}
-int yaffs_QueryInitialBlockState(yaffs_Device *dev,
+int yaffs_query_init_block_state(yaffs_Device *dev,
int blockNo,
yaffs_BlockState *state,
__u32 *sequenceNumber)
{
blockNo -= dev->blockOffset;
- if (dev->queryNANDBlock)
- return dev->queryNANDBlock(dev, blockNo, state, sequenceNumber);
+ if (dev->param.queryNANDBlock)
+ return dev->param.queryNANDBlock(dev, blockNo, state, sequenceNumber);
else
- return yaffs_TagsCompatabilityQueryNANDBlock(dev, blockNo,
+ return yaffs_tags_compat_query_block(dev, blockNo,
state,
sequenceNumber);
}
-int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
+int yaffs_erase_block(struct yaffs_DeviceStruct *dev,
int blockInNAND)
{
int result;
dev->nBlockErasures++;
- result = dev->eraseBlockInNAND(dev, blockInNAND);
+ result = dev->param.eraseBlockInNAND(dev, blockInNAND);
return result;
}
-int yaffs_InitialiseNAND(struct yaffs_DeviceStruct *dev)
+int yaffs_init_nand(struct yaffs_DeviceStruct *dev)
{
- return dev->initialiseNAND(dev);
+ if(dev->param.initialiseNAND)
+ return dev->param.initialiseNAND(dev);
+ return YAFFS_OK;
}