projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs Forgot to remove some files from last commit.
[yaffs2.git]
/
patches
/
yaffs_mtdif2.c
diff --git
a/patches/yaffs_mtdif2.c
b/patches/yaffs_mtdif2.c
index 6d95651c50bfc41d777aafb424c9ff58591784ea..19677ad47afd524d93a7be86f913a3b75da3ff94 100644
(file)
--- a/
patches/yaffs_mtdif2.c
+++ b/
patches/yaffs_mtdif2.c
@@
-1,7
+1,7
@@
/*
* YAFFS: Yet another FFS. A NAND-flash specific file system.
*
/*
* YAFFS: Yet another FFS. A NAND-flash specific file system.
*
- * Copyright (C) 2002 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>
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@
-28,10
+28,10
@@
const char *yaffs_mtdif2_c_version =
#include "yaffs_packedtags2.h"
#include "yaffs_packedtags2.h"
-void nandmtd2_pt2buf(
yaffs_Device
*dev, yaffs_PackedTags2 *pt, int is_raw)
+void nandmtd2_pt2buf(
struct yaffs_dev
*dev, yaffs_PackedTags2 *pt, int is_raw)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-
__u8 *ptab = (__
u8 *)pt; /* packed tags as bytes */
+
u8 *ptab = (
u8 *)pt; /* packed tags as bytes */
int i, j = 0, k, n;
int i, j = 0, k, n;
@@
-69,11
+69,11
@@
void nandmtd2_pt2buf(yaffs_Device *dev, yaffs_PackedTags2 *pt, int is_raw)
}
}
-void nandmtd2_buf2pt(
yaffs_Device
*dev, yaffs_PackedTags2 *pt, int is_raw)
+void nandmtd2_buf2pt(
struct yaffs_dev
*dev, yaffs_PackedTags2 *pt, int is_raw)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
int i, j = 0, k, n;
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
int i, j = 0, k, n;
-
__u8 *ptab = (__
u8 *)pt; /* packed tags as bytes */
+
u8 *ptab = (
u8 *)pt; /* packed tags as bytes */
if (!is_raw) {
if (!is_raw) {
@@
-107,22
+107,22
@@
void nandmtd2_buf2pt(yaffs_Device *dev, yaffs_PackedTags2 *pt, int is_raw)
}
}
-int nandmtd2_WriteChunkWithTagsToNAND(
yaffs_Device * dev, int chunkInNAND
,
- const
__
u8 * data,
- const
yaffs_ExtendedT
ags * tags)
+int nandmtd2_WriteChunkWithTagsToNAND(
struct yaffs_dev * dev, int nand_chunk
,
+ const u8 * data,
+ const
struct yaffs_ext_t
ags * tags)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
size_t dummy;
int retval = 0;
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
size_t dummy;
int retval = 0;
- loff_t addr = ((loff_t)
chunkInNAND) * dev->nB
ytesPerChunk;
+ loff_t addr = ((loff_t)
nand_chunk) * dev->n_b
ytesPerChunk;
yaffs_PackedTags2 pt;
T(YAFFS_TRACE_MTD,
(TSTR
("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
yaffs_PackedTags2 pt;
T(YAFFS_TRACE_MTD,
(TSTR
("nandmtd2_WriteChunkWithTagsToNAND chunk %d data %p tags %p"
- TENDSTR),
chunkInNAND
, data, tags));
+ TENDSTR),
nand_chunk
, data, tags));
if (tags) {
yaffs_PackTags2(&pt, tags);
if (tags) {
yaffs_PackTags2(&pt, tags);
@@
-131,7
+131,7
@@
int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
if (data && tags) {
nandmtd2_pt2buf(dev, &pt, 0);
retval =
if (data && tags) {
nandmtd2_pt2buf(dev, &pt, 0);
retval =
- mtd->write_ecc(mtd, addr, dev->n
B
ytesPerChunk,
+ mtd->write_ecc(mtd, addr, dev->n
_b
ytesPerChunk,
&dummy, data, dev->spareBuffer,
NULL);
&dummy, data, dev->spareBuffer,
NULL);
@@
-149,32
+149,32
@@
int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
return YAFFS_FAIL;
}
return YAFFS_FAIL;
}
-int nandmtd2_ReadChunkWithTagsFromNAND(
yaffs_Device * dev, int chunkInNAND
,
-
__u8 * data, yaffs_ExtendedT
ags * tags)
+int nandmtd2_ReadChunkWithTagsFromNAND(
struct yaffs_dev * dev, int nand_chunk
,
+
u8 * data, struct yaffs_ext_t
ags * tags)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
size_t dummy;
int retval = 0;
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
size_t dummy;
int retval = 0;
- loff_t addr = ((loff_t)
chunkInNAND) * dev->nB
ytesPerChunk;
+ loff_t addr = ((loff_t)
nand_chunk) * dev->n_b
ytesPerChunk;
yaffs_PackedTags2 pt;
T(YAFFS_TRACE_MTD,
(TSTR
("nandmtd2_ReadChunkWithTagsToNAND chunk %d data %p tags %p"
yaffs_PackedTags2 pt;
T(YAFFS_TRACE_MTD,
(TSTR
("nandmtd2_ReadChunkWithTagsToNAND chunk %d data %p tags %p"
- TENDSTR),
chunkInNAND
, data, tags));
+ TENDSTR),
nand_chunk
, data, tags));
if (0 && data && tags) {
retval =
if (0 && data && tags) {
retval =
- mtd->read_ecc(mtd, addr, dev->n
B
ytesPerChunk,
+ mtd->read_ecc(mtd, addr, dev->n
_b
ytesPerChunk,
&dummy, data, dev->spareBuffer,
NULL);
nandmtd2_buf2pt(dev, &pt, 0);
} else {
if (data)
retval =
&dummy, data, dev->spareBuffer,
NULL);
nandmtd2_buf2pt(dev, &pt, 0);
} else {
if (data)
retval =
- mtd->read(mtd, addr, dev->n
B
ytesPerChunk, &dummy,
+ mtd->read(mtd, addr, dev->n
_b
ytesPerChunk, &dummy,
data);
if (tags) {
retval =
data);
if (tags) {
retval =
@@
-193,17
+193,17
@@
int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
return YAFFS_FAIL;
}
return YAFFS_FAIL;
}
-int nandmtd2_MarkNANDBlockBad(struct yaffs_
DeviceStruct *dev, int blockN
o)
+int nandmtd2_MarkNANDBlockBad(struct yaffs_
dev *dev, int block_n
o)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
int retval;
T(YAFFS_TRACE_MTD,
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
int retval;
T(YAFFS_TRACE_MTD,
- (TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR), block
N
o));
+ (TSTR("nandmtd2_MarkNANDBlockBad %d" TENDSTR), block
_n
o));
retval =
mtd->block_markbad(mtd,
retval =
mtd->block_markbad(mtd,
- block
No * dev->nChunksPerB
lock *
- dev->n
B
ytesPerChunk);
+ block
_no * dev->chunks_per_b
lock *
+ dev->n
_b
ytesPerChunk);
if (retval == 0)
return YAFFS_OK;
if (retval == 0)
return YAFFS_OK;
@@
-212,41
+212,41
@@
int nandmtd2_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
}
}
-int nandmtd2_QueryNANDBlock(struct yaffs_
DeviceStruct *dev, int blockN
o,
-
yaffs_BlockState * state, int *sequenceN
umber)
+int nandmtd2_QueryNANDBlock(struct yaffs_
dev *dev, int block_n
o,
+
enum yaffs_block_state * state, int *seq_n
umber)
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
int retval;
T(YAFFS_TRACE_MTD,
{
struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
int retval;
T(YAFFS_TRACE_MTD,
- (TSTR("nandmtd2_QueryNANDBlock %d" TENDSTR), block
N
o));
+ (TSTR("nandmtd2_QueryNANDBlock %d" TENDSTR), block
_n
o));
retval =
mtd->block_isbad(mtd,
retval =
mtd->block_isbad(mtd,
- block
No * dev->nChunksPerB
lock *
- dev->n
B
ytesPerChunk);
+ block
_no * dev->chunks_per_b
lock *
+ dev->n
_b
ytesPerChunk);
if (retval) {
T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
*state = YAFFS_BLOCK_STATE_DEAD;
if (retval) {
T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
*state = YAFFS_BLOCK_STATE_DEAD;
- *seq
uenceN
umber = 0;
+ *seq
_n
umber = 0;
} else {
} else {
-
yaffs_ExtendedT
ags t;
+
struct yaffs_ext_t
ags t;
nandmtd2_ReadChunkWithTagsFromNAND(dev,
nandmtd2_ReadChunkWithTagsFromNAND(dev,
- block
N
o *
- dev->
nChunksPerB
lock, NULL,
+ block
_n
o *
+ dev->
chunks_per_b
lock, NULL,
&t);
&t);
- if (t.chunk
U
sed) {
- *seq
uenceNumber = t.sequenceN
umber;
+ if (t.chunk
_u
sed) {
+ *seq
_number = t.seq_n
umber;
*state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
} else {
*state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
} else {
- *seq
uenceN
umber = 0;
+ *seq
_n
umber = 0;
*state = YAFFS_BLOCK_STATE_EMPTY;
}
T(YAFFS_TRACE_MTD,
*state = YAFFS_BLOCK_STATE_EMPTY;
}
T(YAFFS_TRACE_MTD,
- (TSTR("block is OK seq %d state %d" TENDSTR), *seq
uenceN
umber,
+ (TSTR("block is OK seq %d state %d" TENDSTR), *seq
_n
umber,
*state));
}
*state));
}