// mtd interface for YAFFS2
-const char *yaffs_mtdif2_c_version = "$Id: yaffs_mtdif2.c,v 1.1 2004-12-17 04:39:04 charles Exp $";
-
-#ifdef CONFIG_YAFFS_MTD_ENABLED
+const char *yaffs_mtdif2_c_version = "$Id: yaffs_mtdif2.c,v 1.6 2005-08-01 20:52:35 luc Exp $";
#include "yportenv.h"
+#ifdef CONFIG_YAFFS_YAFFS1
+
#include "yaffs_mtdif2.h"
#include "linux/mtd/mtd.h"
yaffs_PackedTags2 pt;
- T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %08x tags %08x" TENDSTR),chunkInNAND,data,tags));
+ T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p" TENDSTR),chunkInNAND,data,tags));
if(tags)
{
yaffs_PackTags2(&pt,tags);
}
-#ifndef CONFIG_YAFFS_USE_OLD_MTD
if(data && tags)
{
if(dev->useNANDECC)
}
else
{
-#endif
if(data)
retval = mtd->write(mtd,addr,dev->nBytesPerChunk,&dummy,data);
if(tags)
retval = mtd->write_oob(mtd,addr,mtd->oobsize,&dummy,(__u8 *)&pt);
-#ifndef CONFIG_YAFFS_USE_OLD_MTD
}
-#endif
if (retval == 0)
return YAFFS_OK;
yaffs_PackedTags2 pt;
- T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_ReadChunkWithTagsToNAND chunk %d data %08x tags %08x" TENDSTR),chunkInNAND,data,tags));
+ T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_ReadChunkWithTagsToNAND chunk %d data %p tags %p" TENDSTR),chunkInNAND,data,tags));
-#ifndef CONFIG_YAFFS_USE_OLD_MTD
if(data && tags)
{
if(dev->useNANDECC)
}
else
{
-#endif
if(data)
retval = mtd->read(mtd,addr,dev->nBytesPerChunk,&dummy,data);
if(tags)
retval = mtd->read_oob(mtd,addr,mtd->oobsize,&dummy,dev->spareBuffer);
-#ifndef CONFIG_YAFFS_USE_OLD_MTD
}
-#endif
memcpy(&pt,dev->spareBuffer,sizeof(pt));
T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR),blockNo));
- retval = mtd->block_markbad(mtd,blockNo);
+ retval = mtd->block_markbad(mtd,blockNo * dev->nChunksPerBlock * dev->nBytesPerChunk);
if (retval == 0)
return YAFFS_OK;
int retval;
T(YAFFS_TRACE_MTD,(TSTR("nandmtd2_QueryNANDBlock %d" TENDSTR),blockNo));
- retval = mtd->block_isbad(mtd,blockNo);
+ retval = mtd->block_isbad(mtd,blockNo* dev->nChunksPerBlock * dev->nBytesPerChunk);
if(retval)
{