projects
/
yaffs
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[yaffs/.git]
/
yaffs_mtdif.c
diff --git
a/yaffs_mtdif.c
b/yaffs_mtdif.c
index 14876c84206a3b3468544ebf7f543e0dfffc8982..7ada87a8c37216373b01654d85d9a6e3482f6039 100644
(file)
--- a/
yaffs_mtdif.c
+++ b/
yaffs_mtdif.c
@@
-13,7
+13,7
@@
*
*/
*
*/
-const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.
6 2003-01-14 23:15:32
charles Exp $";
+const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.
7 2003-01-17 04:19:08
charles Exp $";
#ifdef CONFIG_YAFFS_MTD_ENABLED
#ifdef CONFIG_YAFFS_MTD_ENABLED
@@
-35,7
+35,7
@@
int nandmtd_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data,
size_t dummy;
int retval = 0;
size_t dummy;
int retval = 0;
- loff_t addr = ((loff_t)chunkInNAND) *
YAFFS_BYTES_PER_CHUNK
;
+ loff_t addr = ((loff_t)chunkInNAND) *
dev->nBytesPerChunk
;
__u8 *spareAsBytes = (__u8 *)spare;
__u8 *spareAsBytes = (__u8 *)spare;
@@
-43,15
+43,15
@@
int nandmtd_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data,
if(data && spare)
{
if(dev->useNANDECC)
if(data && spare)
{
if(dev->useNANDECC)
- mtd->write_ecc(mtd,addr,
YAFFS_BYTES_PER_CHUNK
,&dummy,data,spareAsBytes,NAND_YAFFS_OOB);
+ mtd->write_ecc(mtd,addr,
dev->nBytesPerChunk
,&dummy,data,spareAsBytes,NAND_YAFFS_OOB);
else
else
- mtd->write_ecc(mtd,addr,
YAFFS_BYTES_PER_CHUNK
,&dummy,data,spareAsBytes,NAND_NONE_OOB);
+ mtd->write_ecc(mtd,addr,
dev->nBytesPerChunk
,&dummy,data,spareAsBytes,NAND_NONE_OOB);
}
else
{
#endif
if(data)
}
else
{
#endif
if(data)
- retval = mtd->write(mtd,addr,
YAFFS_BYTES_PER_CHUNK
,&dummy,data);
+ retval = mtd->write(mtd,addr,
dev->nBytesPerChunk
,&dummy,data);
if(spare)
retval = mtd->write_oob(mtd,addr,YAFFS_BYTES_PER_SPARE,&dummy,spareAsBytes);
#ifndef CONFIG_YAFFS_USE_OLD_MTD
if(spare)
retval = mtd->write_oob(mtd,addr,YAFFS_BYTES_PER_SPARE,&dummy,spareAsBytes);
#ifndef CONFIG_YAFFS_USE_OLD_MTD
@@
-70,7
+70,7
@@
int nandmtd_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaf
size_t dummy;
int retval = 0;
size_t dummy;
int retval = 0;
- loff_t addr = ((loff_t)chunkInNAND) *
YAFFS_BYTES_PER_CHUNK
;
+ loff_t addr = ((loff_t)chunkInNAND) *
dev->nBytesPerChunk
;
__u8 *spareAsBytes = (__u8 *)spare;
__u8 *spareAsBytes = (__u8 *)spare;
@@
-80,19
+80,19
@@
int nandmtd_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaf
if(dev->useNANDECC)
{
u8 tmpSpare[ YAFFS_BYTES_PER_SPARE + (2*sizeof(int)) ];
if(dev->useNANDECC)
{
u8 tmpSpare[ YAFFS_BYTES_PER_SPARE + (2*sizeof(int)) ];
- retval = mtd->read_ecc(mtd,addr,
YAFFS_BYTES_PER_CHUNK
,&dummy,data,tmpSpare,NAND_YAFFS_OOB);
+ retval = mtd->read_ecc(mtd,addr,
dev->nBytesPerChunk
,&dummy,data,tmpSpare,NAND_YAFFS_OOB);
memcpy(spareAsBytes, tmpSpare, YAFFS_BYTES_PER_SPARE);
}
else
{
memcpy(spareAsBytes, tmpSpare, YAFFS_BYTES_PER_SPARE);
}
else
{
- retval = mtd->read_ecc(mtd,addr,
YAFFS_BYTES_PER_CHUNK
,&dummy,data,spareAsBytes,NAND_NONE_OOB);
+ retval = mtd->read_ecc(mtd,addr,
dev->nBytesPerChunk
,&dummy,data,spareAsBytes,NAND_NONE_OOB);
}
}
else
{
#endif
if(data)
}
}
else
{
#endif
if(data)
- retval = mtd->read(mtd,addr,
YAFFS_BYTES_PER_CHUNK
,&dummy,data);
+ retval = mtd->read(mtd,addr,
dev->nBytesPerChunk
,&dummy,data);
if(spare)
retval = mtd->read_oob(mtd,addr,YAFFS_BYTES_PER_SPARE,&dummy,spareAsBytes);
#ifndef CONFIG_YAFFS_USE_OLD_MTD
if(spare)
retval = mtd->read_oob(mtd,addr,YAFFS_BYTES_PER_SPARE,&dummy,spareAsBytes);
#ifndef CONFIG_YAFFS_USE_OLD_MTD
@@
-116,13
+116,13
@@
static void nandmtd_EraseCallback(struct erase_info *ei)
int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
- __u32 addr = ((loff_t) blockNumber) *
YAFFS_BYTES_PER_BLOCK
;
+ __u32 addr = ((loff_t) blockNumber) *
dev->nBytesPerChunk * dev->nChunksPerBlock
;
struct erase_info ei;
int retval = 0;
ei.mtd = mtd;
ei.addr = addr;
struct erase_info ei;
int retval = 0;
ei.mtd = mtd;
ei.addr = addr;
- ei.len =
YAFFS_BYTES_PER_BLOCK
;
+ ei.len =
dev->nBytesPerChunk * dev->nChunksPerBlock
;
ei.time = 1000;
ei.retries = 2;
ei.callback = nandmtd_EraseCallback;
ei.time = 1000;
ei.retries = 2;
ei.callback = nandmtd_EraseCallback;