projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs: Remove malloc allocator
[yaffs2.git]
/
yaffs_tagscompat.c
diff --git
a/yaffs_tagscompat.c
b/yaffs_tagscompat.c
index 818f72bbc64c17ea8f47cc61133289f3c386dff1..35d33c91fcee285ec557bac232e909a5faee31e4 100644
(file)
--- a/
yaffs_tagscompat.c
+++ b/
yaffs_tagscompat.c
@@
-22,7
+22,7
@@
static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk);
/********** Tags ECC calculations *********/
/********** Tags ECC calculations *********/
-void yaffs_calc_ecc(const u8 *
data, struct yaffs_spare *spare)
+void yaffs_calc_ecc(const u8 *data, struct yaffs_spare *spare)
{
yaffs_ecc_cacl(data, spare->ecc1);
yaffs_ecc_cacl(&data[256], spare->ecc2);
{
yaffs_ecc_cacl(data, spare->ecc1);
yaffs_ecc_cacl(&data[256], spare->ecc2);
@@
-31,7
+31,6
@@
void yaffs_calc_ecc(const u8 * data, struct yaffs_spare *spare)
void yaffs_calc_tags_ecc(struct yaffs_tags *tags)
{
/* Calculate an ecc */
void yaffs_calc_tags_ecc(struct yaffs_tags *tags)
{
/* Calculate an ecc */
-
unsigned char *b = ((union yaffs_tags_union *)tags)->as_bytes;
unsigned i, j;
unsigned ecc = 0;
unsigned char *b = ((union yaffs_tags_union *)tags)->as_bytes;
unsigned i, j;
unsigned ecc = 0;
@@
-46,9
+45,7
@@
void yaffs_calc_tags_ecc(struct yaffs_tags *tags)
ecc ^= bit;
}
}
ecc ^= bit;
}
}
-
tags->ecc = ecc;
tags->ecc = ecc;
-
}
int yaffs_check_tags_ecc(struct yaffs_tags *tags)
}
int yaffs_check_tags_ecc(struct yaffs_tags *tags)
@@
-76,7
+73,6
@@
int yaffs_check_tags_ecc(struct yaffs_tags *tags)
/* TODO Need to do somethiong here */
return -1; /* unrecovered error */
}
/* TODO Need to do somethiong here */
return -1; /* unrecovered error */
}
-
return 0;
}
return 0;
}
@@
-128,7
+124,7
@@
static void yaffs_spare_init(struct yaffs_spare *spare)
}
static int yaffs_wr_nand(struct yaffs_dev *dev,
}
static int yaffs_wr_nand(struct yaffs_dev *dev,
- int nand_chunk, const u8 *
data,
+ int nand_chunk, const u8 *data,
struct yaffs_spare *spare)
{
if (nand_chunk < dev->param.start_block * dev->param.chunks_per_block) {
struct yaffs_spare *spare)
{
if (nand_chunk < dev->param.start_block * dev->param.chunks_per_block) {
@@
-143,7
+139,7
@@
static int yaffs_wr_nand(struct yaffs_dev *dev,
static int yaffs_rd_chunk_nand(struct yaffs_dev *dev,
int nand_chunk,
static int yaffs_rd_chunk_nand(struct yaffs_dev *dev,
int nand_chunk,
- u8 *
data,
+ u8 *data,
struct yaffs_spare *spare,
enum yaffs_ecc_result *ecc_result,
int correct_errors)
struct yaffs_spare *spare,
enum yaffs_ecc_result *ecc_result,
int correct_errors)
@@
-268,9
+264,8
@@
static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk)
int flash_block = nand_chunk / dev->param.chunks_per_block;
/* Mark the block for retirement */
int flash_block = nand_chunk / dev->param.chunks_per_block;
/* Mark the block for retirement */
- yaffs_get_block_info(dev,
- flash_block + dev->block_offset)->needs_retiring =
- 1;
+ yaffs_get_block_info(dev, flash_block + dev->block_offset)->
+ needs_retiring = 1;
yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
"**>>Block %d marked for retirement",
flash_block);
yaffs_trace(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
"**>>Block %d marked for retirement",
flash_block);
@@
-284,13
+279,13
@@
static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk)
int yaffs_tags_compat_wr(struct yaffs_dev *dev,
int nand_chunk,
int yaffs_tags_compat_wr(struct yaffs_dev *dev,
int nand_chunk,
- const u8 *
data, const struct yaffs_ext_tags *ext_tags)
+ const u8 *data, const struct yaffs_ext_tags *ext_tags)
{
struct yaffs_spare spare;
struct yaffs_tags tags;
yaffs_spare_init(&spare);
{
struct yaffs_spare spare;
struct yaffs_tags tags;
yaffs_spare_init(&spare);
-
+
if (ext_tags->is_deleted)
spare.page_status = 0;
else {
if (ext_tags->is_deleted)
spare.page_status = 0;
else {
@@
-318,13
+313,11
@@
int yaffs_tags_compat_wr(struct yaffs_dev *dev,
int yaffs_tags_compat_rd(struct yaffs_dev *dev,
int nand_chunk,
int yaffs_tags_compat_rd(struct yaffs_dev *dev,
int nand_chunk,
- u8 *
data, struct yaffs_ext_tags *ext_tags)
+ u8 *data, struct yaffs_ext_tags *ext_tags)
{
{
-
struct yaffs_spare spare;
struct yaffs_tags tags;
enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
struct yaffs_spare spare;
struct yaffs_tags tags;
enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
-
static struct yaffs_spare spare_ff;
static int init;
static struct yaffs_spare spare_ff;
static int init;
@@
-333,7
+326,8
@@
int yaffs_tags_compat_rd(struct yaffs_dev *dev,
init = 1;
}
init = 1;
}
- if (yaffs_rd_chunk_nand(dev, nand_chunk, data, &spare, &ecc_result, 1)) {
+ if (yaffs_rd_chunk_nand(dev, nand_chunk,
+ data, &spare, &ecc_result, 1)) {
/* ext_tags may be NULL */
if (ext_tags) {
/* ext_tags may be NULL */
if (ext_tags) {
@@
-372,7
+366,6
@@
int yaffs_tags_compat_rd(struct yaffs_dev *dev,
int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int flash_block)
{
int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int flash_block)
{
-
struct yaffs_spare spare;
memset(&spare, 0xff, sizeof(struct yaffs_spare));
struct yaffs_spare spare;
memset(&spare, 0xff, sizeof(struct yaffs_spare));
@@
-385,15
+378,13
@@
int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev, int flash_block)
NULL, &spare);
return YAFFS_OK;
NULL, &spare);
return YAFFS_OK;
-
}
int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
int block_no,
enum yaffs_block_state *state,
}
int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
int block_no,
enum yaffs_block_state *state,
- u32 *
seq_number)
+ u32 *seq_number)
{
{
-
struct yaffs_spare spare0, spare1;
static struct yaffs_spare spare_ff;
static int init;
struct yaffs_spare spare0, spare1;
static struct yaffs_spare spare_ff;
static int init;