projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes to retirement handling
[yaffs2.git]
/
yaffs_mtdif.c
diff --git
a/yaffs_mtdif.c
b/yaffs_mtdif.c
index 1f40e8fbb0c33ca6fdd2f4d399f822b16ce1de53..1510a94782ede1166319fda7ce8950eeaa83a9df 100644
(file)
--- a/
yaffs_mtdif.c
+++ b/
yaffs_mtdif.c
@@
-14,7
+14,7
@@
*/
const char *yaffs_mtdif_c_version =
*/
const char *yaffs_mtdif_c_version =
- "$Id: yaffs_mtdif.c,v 1.1
4 2006-09-26 13:28:13 vwool
Exp $";
+ "$Id: yaffs_mtdif.c,v 1.1
6 2006-11-08 06:24:34 charles
Exp $";
#include "yportenv.h"
#include "yportenv.h"
@@
-81,12
+81,12
@@
int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
size_t dummy;
int retval = 0;
size_t dummy;
int retval = 0;
- loff_t addr = ((loff_t) chunkInNAND) * dev->nBytesPerChunk;
+ loff_t addr = ((loff_t) chunkInNAND) * dev->n
Data
BytesPerChunk;
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
__u8 spareAsBytes[8]; /* OOB */
if (data && !spare)
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
__u8 spareAsBytes[8]; /* OOB */
if (data && !spare)
- retval = mtd->write(mtd, addr, dev->nBytesPerChunk,
+ retval = mtd->write(mtd, addr, dev->n
Data
BytesPerChunk,
&dummy, data);
else if (spare) {
if (dev->useNANDECC) {
&dummy, data);
else if (spare) {
if (dev->useNANDECC) {
@@
-97,7
+97,7
@@
int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
ops.mode = MTD_OOB_RAW;
ops.ooblen = YAFFS_BYTES_PER_SPARE;
}
ops.mode = MTD_OOB_RAW;
ops.ooblen = YAFFS_BYTES_PER_SPARE;
}
- ops.len = data ? dev->nBytesPerChunk : ops.ooblen;
+ ops.len = data ? dev->n
Data
BytesPerChunk : ops.ooblen;
ops.datbuf = (u8 *)data;
ops.ooboffs = 0;
ops.oobbuf = spareAsBytes;
ops.datbuf = (u8 *)data;
ops.ooboffs = 0;
ops.oobbuf = spareAsBytes;
@@
-109,18
+109,18
@@
int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
if (data && spare) {
if (dev->useNANDECC)
retval =
if (data && spare) {
if (dev->useNANDECC)
retval =
- mtd->write_ecc(mtd, addr, dev->nBytesPerChunk,
+ mtd->write_ecc(mtd, addr, dev->n
Data
BytesPerChunk,
&dummy, data, spareAsBytes,
&yaffs_oobinfo);
else
retval =
&dummy, data, spareAsBytes,
&yaffs_oobinfo);
else
retval =
- mtd->write_ecc(mtd, addr, dev->nBytesPerChunk,
+ mtd->write_ecc(mtd, addr, dev->n
Data
BytesPerChunk,
&dummy, data, spareAsBytes,
&yaffs_noeccinfo);
} else {
if (data)
retval =
&dummy, data, spareAsBytes,
&yaffs_noeccinfo);
} else {
if (data)
retval =
- mtd->write(mtd, addr, dev->nBytesPerChunk, &dummy,
+ mtd->write(mtd, addr, dev->n
Data
BytesPerChunk, &dummy,
data);
if (spare)
retval =
data);
if (spare)
retval =
@@
-145,12
+145,12
@@
int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
size_t dummy;
int retval = 0;
size_t dummy;
int retval = 0;
- loff_t addr = ((loff_t) chunkInNAND) * dev->nBytesPerChunk;
+ loff_t addr = ((loff_t) chunkInNAND) * dev->n
Data
BytesPerChunk;
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
__u8 spareAsBytes[8]; /* OOB */
if (data && !spare)
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
__u8 spareAsBytes[8]; /* OOB */
if (data && !spare)
- retval = mtd->read(mtd, addr, dev->nBytesPerChunk,
+ retval = mtd->read(mtd, addr, dev->n
Data
BytesPerChunk,
&dummy, data);
else if (spare) {
if (dev->useNANDECC) {
&dummy, data);
else if (spare) {
if (dev->useNANDECC) {
@@
-160,7
+160,7
@@
int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
ops.mode = MTD_OOB_RAW;
ops.ooblen = YAFFS_BYTES_PER_SPARE;
}
ops.mode = MTD_OOB_RAW;
ops.ooblen = YAFFS_BYTES_PER_SPARE;
}
- ops.len = data ? dev->nBytesPerChunk : ops.ooblen;
+ ops.len = data ? dev->n
Data
BytesPerChunk : ops.ooblen;
ops.datbuf = data;
ops.ooboffs = 0;
ops.oobbuf = spareAsBytes;
ops.datbuf = data;
ops.ooboffs = 0;
ops.oobbuf = spareAsBytes;
@@
-178,19
+178,19
@@
int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
/* should allocate enough memory for spare, */
/* i.e. [YAFFS_BYTES_PER_SPARE+2*sizeof(int)]. */
retval =
/* should allocate enough memory for spare, */
/* i.e. [YAFFS_BYTES_PER_SPARE+2*sizeof(int)]. */
retval =
- mtd->read_ecc(mtd, addr, dev->nBytesPerChunk,
+ mtd->read_ecc(mtd, addr, dev->n
Data
BytesPerChunk,
&dummy, data, spareAsBytes,
&yaffs_oobinfo);
} else {
retval =
&dummy, data, spareAsBytes,
&yaffs_oobinfo);
} else {
retval =
- mtd->read_ecc(mtd, addr, dev->nBytesPerChunk,
+ mtd->read_ecc(mtd, addr, dev->n
Data
BytesPerChunk,
&dummy, data, spareAsBytes,
&yaffs_noeccinfo);
}
} else {
if (data)
retval =
&dummy, data, spareAsBytes,
&yaffs_noeccinfo);
}
} else {
if (data)
retval =
- mtd->read(mtd, addr, dev->nBytesPerChunk, &dummy,
+ mtd->read(mtd, addr, dev->n
Data
BytesPerChunk, &dummy,
data);
if (spare)
retval =
data);
if (spare)
retval =
@@
-209,14
+209,14
@@
int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
__u32 addr =
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
__u32 addr =
- ((loff_t) blockNumber) * dev->nBytesPerChunk
+ ((loff_t) blockNumber) * dev->n
Data
BytesPerChunk
* dev->nChunksPerBlock;
struct erase_info ei;
int retval = 0;
ei.mtd = mtd;
ei.addr = addr;
* dev->nChunksPerBlock;
struct erase_info ei;
int retval = 0;
ei.mtd = mtd;
ei.addr = addr;
- ei.len = dev->nBytesPerChunk * dev->nChunksPerBlock;
+ ei.len = dev->n
Data
BytesPerChunk * dev->nChunksPerBlock;
ei.time = 1000;
ei.retries = 2;
ei.callback = NULL;
ei.time = 1000;
ei.retries = 2;
ei.callback = NULL;