projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix minor typo.
[yaffs2.git]
/
yaffs_mtdif2.c
diff --git
a/yaffs_mtdif2.c
b/yaffs_mtdif2.c
index b7c973ece8a642dfc1a070c6282971de497cff7d..125ed40f31e0ea9ce930de9753ef5fd0066927a8 100644
(file)
--- a/
yaffs_mtdif2.c
+++ b/
yaffs_mtdif2.c
@@
-1,8
+1,7
@@
/*
/*
- * YAFFS: Yet another FFS. A NAND-flash specific file system.
- * yaffs_mtdif.c NAND mtd wrapper functions.
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
*
- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002
-2007
Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@
-10,13
+9,12
@@
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
- *
*/
/* mtd interface for YAFFS2 */
const char *yaffs_mtdif2_c_version =
*/
/* mtd interface for YAFFS2 */
const char *yaffs_mtdif2_c_version =
- "$Id: yaffs_mtdif2.c,v 1.1
3 2006-09-26 13:28:13 vwool
Exp $";
+ "$Id: yaffs_mtdif2.c,v 1.1
9 2007-12-13 15:35:18 wookey
Exp $";
#include "yportenv.h"
#include "yportenv.h"
@@
-34,14
+32,14
@@
int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
const yaffs_ExtendedTags * tags)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
const yaffs_ExtendedTags * tags)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-#if (
LINUX_VERSION_CODE > KERNEL
_VERSION(2,6,17))
+#if (
MTD_VERSION_CODE > MTD
_VERSION(2,6,17))
struct mtd_oob_ops ops;
#else
size_t dummy;
#endif
int retval = 0;
struct mtd_oob_ops ops;
#else
size_t dummy;
#endif
int retval = 0;
- loff_t addr = ((loff_t) chunkInNAND) * dev->nBytesPerChunk;
+ loff_t addr = ((loff_t) chunkInNAND) * dev->n
Data
BytesPerChunk;
yaffs_PackedTags2 pt;
yaffs_PackedTags2 pt;
@@
-50,7
+48,7
@@
int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
TENDSTR), chunkInNAND, data, tags));
("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
TENDSTR), chunkInNAND, data, tags));
-#if (
LINUX_VERSION_CODE > KERNEL
_VERSION(2,6,17))
+#if (
MTD_VERSION_CODE > MTD
_VERSION(2,6,17))
if (tags)
yaffs_PackTags2(&pt, tags);
else
if (tags)
yaffs_PackTags2(&pt, tags);
else
@@
-59,7
+57,7
@@
int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
if (data) {
ops.mode = MTD_OOB_AUTO;
ops.ooblen = sizeof(pt);
if (data) {
ops.mode = MTD_OOB_AUTO;
ops.ooblen = sizeof(pt);
- ops.len = dev->nBytesPerChunk;
+ ops.len = dev->n
Data
BytesPerChunk;
ops.ooboffs = 0;
ops.datbuf = (__u8 *)data;
ops.oobbuf = (void *)&pt;
ops.ooboffs = 0;
ops.datbuf = (__u8 *)data;
ops.oobbuf = (void *)&pt;
@@
-74,16
+72,16
@@
int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
if (data && tags) {
if (dev->useNANDECC)
retval =
if (data && tags) {
if (dev->useNANDECC)
retval =
- mtd->write_ecc(mtd, addr, dev->nBytesPerChunk,
+ mtd->write_ecc(mtd, addr, dev->n
Data
BytesPerChunk,
&dummy, data, (__u8 *) & pt, NULL);
else
retval =
&dummy, data, (__u8 *) & pt, NULL);
else
retval =
- mtd->write_ecc(mtd, addr, dev->nBytesPerChunk,
+ mtd->write_ecc(mtd, addr, dev->n
Data
BytesPerChunk,
&dummy, data, (__u8 *) & pt, NULL);
} else {
if (data)
retval =
&dummy, data, (__u8 *) & pt, NULL);
} else {
if (data)
retval =
- mtd->write(mtd, addr, dev->nBytesPerChunk, &dummy,
+ mtd->write(mtd, addr, dev->n
Data
BytesPerChunk, &dummy,
data);
if (tags)
retval =
data);
if (tags)
retval =
@@
-103,13
+101,13
@@
int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
__u8 * data, yaffs_ExtendedTags * tags)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
__u8 * data, yaffs_ExtendedTags * tags)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-#if (
LINUX_VERSION_CODE > KERNEL
_VERSION(2,6,17))
+#if (
MTD_VERSION_CODE > MTD
_VERSION(2,6,17))
struct mtd_oob_ops ops;
#endif
size_t dummy;
int retval = 0;
struct mtd_oob_ops ops;
#endif
size_t dummy;
int retval = 0;
- loff_t addr = ((loff_t) chunkInNAND) * dev->nBytesPerChunk;
+ loff_t addr = ((loff_t) chunkInNAND) * dev->n
Data
BytesPerChunk;
yaffs_PackedTags2 pt;
yaffs_PackedTags2 pt;
@@
-118,14
+116,14
@@
int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
TENDSTR), chunkInNAND, data, tags));
("nandmtd2_ReadChunkWithTagsFromNAND chunk %d data %p tags %p"
TENDSTR), chunkInNAND, data, tags));
-#if (
LINUX_VERSION_CODE > KERNEL
_VERSION(2,6,17))
+#if (
MTD_VERSION_CODE > MTD
_VERSION(2,6,17))
if (data && !tags)
if (data && !tags)
- retval = mtd->read(mtd, addr, dev->nBytesPerChunk,
+ retval = mtd->read(mtd, addr, dev->n
Data
BytesPerChunk,
&dummy, data);
else if (tags) {
ops.mode = MTD_OOB_AUTO;
ops.ooblen = sizeof(pt);
&dummy, data);
else if (tags) {
ops.mode = MTD_OOB_AUTO;
ops.ooblen = sizeof(pt);
- ops.len = data ? dev->nBytesPerChunk : sizeof(pt);
+ ops.len = data ? dev->n
Data
BytesPerChunk : sizeof(pt);
ops.ooboffs = 0;
ops.datbuf = data;
ops.oobbuf = dev->spareBuffer;
ops.ooboffs = 0;
ops.datbuf = data;
ops.oobbuf = dev->spareBuffer;
@@
-135,19
+133,19
@@
int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
if (data && tags) {
if (dev->useNANDECC) {
retval =
if (data && tags) {
if (dev->useNANDECC) {
retval =
- mtd->read_ecc(mtd, addr, dev->nBytesPerChunk,
+ mtd->read_ecc(mtd, addr, dev->n
Data
BytesPerChunk,
&dummy, data, dev->spareBuffer,
NULL);
} else {
retval =
&dummy, data, dev->spareBuffer,
NULL);
} else {
retval =
- mtd->read_ecc(mtd, addr, dev->nBytesPerChunk,
+ mtd->read_ecc(mtd, addr, dev->n
Data
BytesPerChunk,
&dummy, data, dev->spareBuffer,
NULL);
}
} else {
if (data)
retval =
&dummy, data, dev->spareBuffer,
NULL);
}
} else {
if (data)
retval =
- mtd->read(mtd, addr, dev->nBytesPerChunk, &dummy,
+ mtd->read(mtd, addr, dev->n
Data
BytesPerChunk, &dummy,
data);
if (tags)
retval =
data);
if (tags)
retval =
@@
-160,7
+158,7
@@
int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
if (tags)
yaffs_UnpackTags2(tags, &pt);
if (tags)
yaffs_UnpackTags2(tags, &pt);
-
+
if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
@@
-180,7
+178,7
@@
int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
retval =
mtd->block_markbad(mtd,
blockNo * dev->nChunksPerBlock *
retval =
mtd->block_markbad(mtd,
blockNo * dev->nChunksPerBlock *
- dev->nBytesPerChunk);
+ dev->n
Data
BytesPerChunk);
if (retval == 0)
return YAFFS_OK;
if (retval == 0)
return YAFFS_OK;
@@
-200,7
+198,7
@@
int nandmtd2_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo,
retval =
mtd->block_isbad(mtd,
blockNo * dev->nChunksPerBlock *
retval =
mtd->block_isbad(mtd,
blockNo * dev->nChunksPerBlock *
- dev->nBytesPerChunk);
+ dev->n
Data
BytesPerChunk);
if (retval) {
T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
if (retval) {
T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));