projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing definition for yaffs_strcmp
[yaffs2.git]
/
yaffs_nand.c
diff --git
a/yaffs_nand.c
b/yaffs_nand.c
index a1fe5c4bb1f657420aeddda609d96ff0e1e9be20..165d01004d6efde447d4b88a42f38c74dafa5fed 100644
(file)
--- a/
yaffs_nand.c
+++ b/
yaffs_nand.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>
@@
-13,16
+13,16
@@
#include "yaffs_nand.h"
#include "yaffs_tagscompat.h"
#include "yaffs_nand.h"
#include "yaffs_tagscompat.h"
-#include "yaffs_tagsvalidity.h"
#include "yaffs_getblockinfo.h"
#include "yaffs_getblockinfo.h"
+#include "yaffs_summary.h"
int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
u8 *buffer, struct yaffs_ext_tags *tags)
{
int result;
struct yaffs_ext_tags local_tags;
int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
u8 *buffer, struct yaffs_ext_tags *tags)
{
int result;
struct yaffs_ext_tags local_tags;
- int
realigned
_chunk = nand_chunk - dev->chunk_offset;
+ int
flash
_chunk = nand_chunk - dev->chunk_offset;
dev->n_page_reads++;
dev->n_page_reads++;
@@
-32,11
+32,11
@@
int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
if (dev->param.read_chunk_tags_fn)
result =
if (dev->param.read_chunk_tags_fn)
result =
- dev->param.read_chunk_tags_fn(dev,
realigned
_chunk, buffer,
+ dev->param.read_chunk_tags_fn(dev,
flash
_chunk, buffer,
tags);
else
result = yaffs_tags_compat_rd(dev,
tags);
else
result = yaffs_tags_compat_rd(dev,
-
realigned
_chunk, buffer, tags);
+
flash
_chunk, buffer, tags);
if (tags && tags->ecc_result > YAFFS_ECC_RESULT_NO_ERROR) {
struct yaffs_block_info *bi;
if (tags && tags->ecc_result > YAFFS_ECC_RESULT_NO_ERROR) {
struct yaffs_block_info *bi;
@@
-52,17
+52,14
@@
int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
int nand_chunk,
const u8 *buffer, struct yaffs_ext_tags *tags)
{
int nand_chunk,
const u8 *buffer, struct yaffs_ext_tags *tags)
{
+ int result;
+ int flash_chunk = nand_chunk - dev->chunk_offset;
+
dev->n_page_writes++;
dev->n_page_writes++;
- nand_chunk -= dev->chunk_offset;
if (tags) {
tags->seq_number = dev->seq_number;
tags->chunk_used = 1;
if (tags) {
tags->seq_number = dev->seq_number;
tags->chunk_used = 1;
- if (!yaffs_validate_tags(tags)) {
- yaffs_trace(YAFFS_TRACE_ERROR,
- "Writing uninitialised tags");
- BUG();
- }
yaffs_trace(YAFFS_TRACE_WRITE,
"Writing chunk %d tags %d %d",
nand_chunk, tags->obj_id, tags->chunk_id);
yaffs_trace(YAFFS_TRACE_WRITE,
"Writing chunk %d tags %d %d",
nand_chunk, tags->obj_id, tags->chunk_id);
@@
-73,10
+70,14
@@
int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
}
if (dev->param.write_chunk_tags_fn)
}
if (dev->param.write_chunk_tags_fn)
- return dev->param.write_chunk_tags_fn(dev, nand_chunk, buffer,
- tags);
+ result = dev->param.write_chunk_tags_fn(dev, flash_chunk,
+ buffer, tags);
+ else
+ result = yaffs_tags_compat_wr(dev, flash_chunk, buffer, tags);
- return yaffs_tags_compat_wr(dev, nand_chunk, buffer, tags);
+ yaffs_summary_add(dev, tags, nand_chunk);
+
+ return result;
}
int yaffs_mark_bad(struct yaffs_dev *dev, int block_no)
}
int yaffs_mark_bad(struct yaffs_dev *dev, int block_no)