projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs Fixing bugs in direct/timothy_tests/mirror_tests
[yaffs2.git]
/
yaffs_mtdif2_single.c
diff --git
a/yaffs_mtdif2_single.c
b/yaffs_mtdif2_single.c
index 0835078fe66c462ca0657a80b5435887052118c4..d1643df2c381b89e92b403a09e12732b39a91aac 100644
(file)
--- a/
yaffs_mtdif2_single.c
+++ b/
yaffs_mtdif2_single.c
@@
-47,10
+47,9
@@
int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
void *packed_tags_ptr =
dev->param.no_tags_ecc ? (void *)&pt.t : (void *)&pt;
void *packed_tags_ptr =
dev->param.no_tags_ecc ? (void *)&pt.t : (void *)&pt;
- T(YAFFS_TRACE_MTD,
- (TSTR
- ("nandmtd2_write_chunk_tags chunk %d data %p tags %p"
- TENDSTR), nand_chunk, data, tags));
+ yaffs_trace(YAFFS_TRACE_MTD,
+ "nandmtd2_write_chunk_tags chunk %d data %p tags %p",
+ nand_chunk, data, tags);
addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
@@
-104,10
+103,9
@@
int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
void *packed_tags_ptr =
dev->param.no_tags_ecc ? (void *)&pt.t : (void *)&pt;
void *packed_tags_ptr =
dev->param.no_tags_ecc ? (void *)&pt.t : (void *)&pt;
- T(YAFFS_TRACE_MTD,
- (TSTR
- ("nandmtd2_read_chunk_tags chunk %d data %p tags %p"
- TENDSTR), nand_chunk, data, tags));
+ yaffs_trace(YAFFS_TRACE_MTD,
+ "nandmtd2_read_chunk_tags chunk %d data %p tags %p",
+ nand_chunk, data, tags);
if (dev->param.inband_tags) {
if (dev->param.inband_tags) {
@@
-171,8
+169,8
@@
int nandmtd2_mark_block_bad(struct yaffs_dev *dev, int block_no)
{
struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
int retval;
{
struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
int retval;
-
T
(YAFFS_TRACE_MTD,
-
(TSTR("nandmtd2_mark_block_bad %d" TENDSTR), block_no)
);
+
yaffs_trace
(YAFFS_TRACE_MTD,
+
"nandmtd2_mark_block_bad %d", block_no
);
retval =
mtd->block_markbad(mtd,
retval =
mtd->block_markbad(mtd,
@@
-192,14
+190,14
@@
int nandmtd2_query_block(struct yaffs_dev *dev, int block_no,
struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
int retval;
struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
int retval;
-
T(YAFFS_TRACE_MTD, (TSTR("nandmtd2_query_block %d" TENDSTR), block_no)
);
+
yaffs_trace(YAFFS_TRACE_MTD, "nandmtd2_query_block %d", block_no
);
retval =
mtd->block_isbad(mtd,
block_no * dev->param.chunks_per_block *
dev->param.total_bytes_per_chunk);
if (retval) {
retval =
mtd->block_isbad(mtd,
block_no * dev->param.chunks_per_block *
dev->param.total_bytes_per_chunk);
if (retval) {
-
T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR))
);
+
yaffs_trace(YAFFS_TRACE_MTD, "block is bad"
);
*state = YAFFS_BLOCK_STATE_DEAD;
*seq_number = 0;
*state = YAFFS_BLOCK_STATE_DEAD;
*seq_number = 0;
@@
-216,11
+214,12
@@
int nandmtd2_query_block(struct yaffs_dev *dev, int block_no,
*state = YAFFS_BLOCK_STATE_EMPTY;
}
}
*state = YAFFS_BLOCK_STATE_EMPTY;
}
}
-
T
(YAFFS_TRACE_MTD,
-
(TSTR("block is bad seq %d state %d" TENDSTR), *seq_number, *state)
);
+
yaffs_trace
(YAFFS_TRACE_MTD,
+
"block is bad seq %d state %d", *seq_number, *state
);
if (retval == 0)
return YAFFS_OK;
else
return YAFFS_FAIL;
}
if (retval == 0)
return YAFFS_OK;
else
return YAFFS_FAIL;
}
+