projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs: Change disable-summary option to be consistent with others
[yaffs2.git]
/
yaffs_mtdif2_multi.c
diff --git
a/yaffs_mtdif2_multi.c
b/yaffs_mtdif2_multi.c
index 555f937cebf58d91b86d47de33010dd9fe6c9d38..684ed2a956dac805ccce39e69d8af7102522a972 100644
(file)
--- a/
yaffs_mtdif2_multi.c
+++ b/
yaffs_mtdif2_multi.c
@@
-1,7
+1,7
@@
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-201
0
Aleph One Ltd.
+ * Copyright (C) 2002-201
1
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>
@@
-27,11
+27,11
@@
#include "yaffs_linux.h"
/* NB For use with inband tags....
#include "yaffs_linux.h"
/* NB For use with inband tags....
- * We assume that the data buffer is of size total_bytes_per_chunk so
that we can also
- * use it to load the tags.
+ * We assume that the data buffer is of size total_bytes_per_chunk so
+ *
that we can also
use it to load the tags.
*/
int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
*/
int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
- const u8 *
data,
+ const u8 *data,
const struct yaffs_ext_tags *tags)
{
struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
const struct yaffs_ext_tags *tags)
{
struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
@@
-51,10
+51,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;
@@
-68,11
+67,12
@@
int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
struct yaffs_packed_tags2_tags_only *pt2tp;
pt2tp =
(struct yaffs_packed_tags2_tags_only *)(data +
struct yaffs_packed_tags2_tags_only *pt2tp;
pt2tp =
(struct yaffs_packed_tags2_tags_only *)(data +
-
dev->
-
data_bytes_per_chunk);
+ dev->
+ data_bytes_per_chunk);
yaffs_pack_tags2_tags_only(pt2tp, tags);
yaffs_pack_tags2_tags_only(pt2tp, tags);
- } else
+ } else
{
yaffs_pack_tags2(&pt, tags, !dev->param.no_tags_ecc);
yaffs_pack_tags2(&pt, tags, !dev->param.no_tags_ecc);
+ }
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
ops.mode = MTD_OOB_AUTO;
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17))
ops.mode = MTD_OOB_AUTO;
@@
-102,7
+102,7
@@
int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
}
int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
}
int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
- u8 *
data, struct yaffs_ext_tags *tags)
+ u8 *data, struct yaffs_ext_tags *tags)
{
struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
{
struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
@@
-121,16
+121,15
@@
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 (!data) {
local_data = 1;
if (dev->param.inband_tags) {
if (!data) {
local_data = 1;
- data = yaffs_get_temp_buffer(dev
, __LINE__
);
+ data = yaffs_get_temp_buffer(dev);
}
}
}
}
@@
-169,8
+168,8
@@
int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
if (tags) {
struct yaffs_packed_tags2_tags_only *pt2tp;
pt2tp =
if (tags) {
struct yaffs_packed_tags2_tags_only *pt2tp;
pt2tp =
- (struct yaffs_packed_tags2_tags_only *)&data[dev->
-
data_bytes_per_chunk];
+ (struct yaffs_packed_tags2_tags_only *)
+
&data[dev->
data_bytes_per_chunk];
yaffs_unpack_tags2_tags_only(tags, pt2tp);
}
} else {
yaffs_unpack_tags2_tags_only(tags, pt2tp);
}
} else {
@@
-183,7
+182,7
@@
int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
}
if (local_data)
}
if (local_data)
- yaffs_release_temp_buffer(dev, data
, __LINE__
);
+ yaffs_release_temp_buffer(dev, data);
if (tags && retval == -EBADMSG
&& tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) {
if (tags && retval == -EBADMSG
&& tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) {
@@
-205,8
+204,9
@@
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,
@@
-221,19
+221,19
@@
int nandmtd2_mark_block_bad(struct yaffs_dev *dev, int block_no)
}
int nandmtd2_query_block(struct yaffs_dev *dev, int block_no,
}
int nandmtd2_query_block(struct yaffs_dev *dev, int block_no,
- enum yaffs_block_state *state, u32 *
seq_number)
+ enum yaffs_block_state *state, u32 *seq_number)
{
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;
@@
-244,17
+244,19
@@
int nandmtd2_query_block(struct yaffs_dev *dev, int block_no,
if (t.chunk_used) {
*seq_number = t.seq_number;
if (t.chunk_used) {
*seq_number = t.seq_number;
- *state = YAFFS_BLOCK_STATE_NEEDS_SCAN
NING
;
+ *state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
} else {
*seq_number = 0;
*state = YAFFS_BLOCK_STATE_EMPTY;
}
}
} else {
*seq_number = 0;
*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;
}
+