projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs: More clean up.
[yaffs2.git]
/
yaffs_tagscompat.c
diff --git
a/yaffs_tagscompat.c
b/yaffs_tagscompat.c
index 9d2472de6494a488b1e51b0fb6b29547f10ab042..57b1e54798f6eda1fe5cd09e1ae27b34f13d7ae6 100644
(file)
--- a/
yaffs_tagscompat.c
+++ b/
yaffs_tagscompat.c
@@
-17,7
+17,7
@@
#include "yaffs_getblockinfo.h"
#include "yaffs_trace.h"
#include "yaffs_getblockinfo.h"
#include "yaffs_trace.h"
-static void yaffs_handle_rd_data_error(
yaffs_dev_t
*dev, int nand_chunk);
+static void yaffs_handle_rd_data_error(
struct yaffs_dev
*dev, int nand_chunk);
static const char yaffs_count_bits_table[256] = {
static const char yaffs_count_bits_table[256] = {
@@
-39,7
+39,7
@@
static const char yaffs_count_bits_table[256] = {
4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
};
4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
};
-int yaffs_count_bits(
__
u8 x)
+int yaffs_count_bits(u8 x)
{
int ret_val;
ret_val = yaffs_count_bits_table[x];
{
int ret_val;
ret_val = yaffs_count_bits_table[x];
@@
-48,17
+48,17
@@
int yaffs_count_bits(__u8 x)
/********** Tags ECC calculations *********/
/********** Tags ECC calculations *********/
-void yaffs_calc_ecc(const
__u8 *data,
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);
}
-void yaffs_calc_tags_ecc(
yaffs_tags_t
*tags)
+void yaffs_calc_tags_ecc(
struct yaffs_tags
*tags)
{
/* Calculate an ecc */
{
/* Calculate an ecc */
- unsigned char *b = ((
yaffs_tags_union_t
*) tags)->as_bytes;
+ unsigned char *b = ((
union yaffs_tags_union
*) tags)->as_bytes;
unsigned i, j;
unsigned ecc = 0;
unsigned bit = 0;
unsigned i, j;
unsigned ecc = 0;
unsigned bit = 0;
@@
-77,7
+77,7
@@
void yaffs_calc_tags_ecc(yaffs_tags_t *tags)
}
}
-int yaffs_check_tags_ecc(
yaffs_tags_t
*tags)
+int yaffs_check_tags_ecc(
struct yaffs_tags
*tags)
{
unsigned ecc = tags->ecc;
{
unsigned ecc = tags->ecc;
@@
-87,7
+87,7
@@
int yaffs_check_tags_ecc(yaffs_tags_t *tags)
if (ecc && ecc <= 64) {
/* TODO: Handle the failure better. Retire? */
if (ecc && ecc <= 64) {
/* TODO: Handle the failure better. Retire? */
- unsigned char *b = ((
yaffs_tags_union_t
*) tags)->as_bytes;
+ unsigned char *b = ((
union yaffs_tags_union
*) tags)->as_bytes;
ecc--;
ecc--;
@@
-108,10
+108,10
@@
int yaffs_check_tags_ecc(yaffs_tags_t *tags)
/********** Tags **********/
/********** Tags **********/
-static void yaffs_load_tags_to_spare(yaffs_spare *spare_ptr,
-
yaffs_tags_t
*tags_ptr)
+static void yaffs_load_tags_to_spare(
struct
yaffs_spare *spare_ptr,
+
struct yaffs_tags
*tags_ptr)
{
{
-
yaffs_tags_union_t *tu = (yaffs_tags_union_t
*) tags_ptr;
+
union yaffs_tags_union *tu = (union yaffs_tags_union
*) tags_ptr;
yaffs_calc_tags_ecc(tags_ptr);
yaffs_calc_tags_ecc(tags_ptr);
@@
-125,10
+125,10
@@
static void yaffs_load_tags_to_spare(yaffs_spare *spare_ptr,
spare_ptr->tb7 = tu->as_bytes[7];
}
spare_ptr->tb7 = tu->as_bytes[7];
}
-static void yaffs_get_tags_from_spare(
yaffs_dev_t *dev,
yaffs_spare *spare_ptr,
-
yaffs_tags_t
*tags_ptr)
+static void yaffs_get_tags_from_spare(
struct yaffs_dev *dev, struct
yaffs_spare *spare_ptr,
+
struct yaffs_tags
*tags_ptr)
{
{
-
yaffs_tags_union_t *tu = (yaffs_tags_union_t
*) tags_ptr;
+
union yaffs_tags_union *tu = (union yaffs_tags_union
*) tags_ptr;
int result;
tu->as_bytes[0] = spare_ptr->tb0;
int result;
tu->as_bytes[0] = spare_ptr->tb0;
@@
-147,14
+147,14
@@
static void yaffs_get_tags_from_spare(yaffs_dev_t *dev, yaffs_spare *spare_ptr,
dev->n_tags_ecc_unfixed++;
}
dev->n_tags_ecc_unfixed++;
}
-static void yaffs_spare_init(yaffs_spare *spare)
+static void yaffs_spare_init(
struct
yaffs_spare *spare)
{
{
- memset(spare, 0xFF, sizeof(yaffs_spare));
+ memset(spare, 0xFF, sizeof(
struct
yaffs_spare));
}
}
-static int yaffs_wr_nand(struct yaffs_dev
_s
*dev,
- int nand_chunk, const
__
u8 *data,
- yaffs_spare *spare)
+static int yaffs_wr_nand(struct yaffs_dev *dev,
+ int nand_chunk, const u8 *data,
+
struct
yaffs_spare *spare)
{
if (nand_chunk < dev->param.start_block * dev->param.chunks_per_block) {
T(YAFFS_TRACE_ERROR,
{
if (nand_chunk < dev->param.start_block * dev->param.chunks_per_block) {
T(YAFFS_TRACE_ERROR,
@@
-166,15
+166,15
@@
static int yaffs_wr_nand(struct yaffs_dev_s *dev,
return dev->param.write_chunk_fn(dev, nand_chunk, data, spare);
}
return dev->param.write_chunk_fn(dev, nand_chunk, data, spare);
}
-static int yaffs_rd_chunk_nand(struct yaffs_dev
_s
*dev,
+static int yaffs_rd_chunk_nand(struct yaffs_dev *dev,
int nand_chunk,
int nand_chunk,
-
__
u8 *data,
- yaffs_spare *spare,
- yaffs_ecc_result *ecc_result,
+ u8 *data,
+
struct
yaffs_spare *spare,
+
enum
yaffs_ecc_result *ecc_result,
int correct_errors)
{
int ret_val;
int correct_errors)
{
int ret_val;
- yaffs_spare local_spare;
+
struct
yaffs_spare local_spare;
if (!spare && data) {
/* If we don't have a real spare, then we use a local one. */
if (!spare && data) {
/* If we don't have a real spare, then we use a local one. */
@@
-188,7
+188,7
@@
static int yaffs_rd_chunk_nand(struct yaffs_dev_s *dev,
/* Do ECC correction */
/* Todo handle any errors */
int ecc_result1, ecc_result2;
/* Do ECC correction */
/* Todo handle any errors */
int ecc_result1, ecc_result2;
-
__
u8 calc_ecc[3];
+ u8 calc_ecc[3];
yaffs_ecc_cacl(data, calc_ecc);
ecc_result1 =
yaffs_ecc_cacl(data, calc_ecc);
ecc_result1 =
@@
-245,8
+245,8
@@
static int yaffs_rd_chunk_nand(struct yaffs_dev_s *dev,
memset(&nspare, 0, sizeof(nspare));
ret_val = dev->param.read_chunk_fn(dev, nand_chunk, data,
memset(&nspare, 0, sizeof(nspare));
ret_val = dev->param.read_chunk_fn(dev, nand_chunk, data,
- (yaffs_spare *) &nspare);
- memcpy(spare, &nspare, sizeof(yaffs_spare));
+ (
struct
yaffs_spare *) &nspare);
+ memcpy(spare, &nspare, sizeof(
struct
yaffs_spare));
if (data && correct_errors) {
if (nspare.eccres1 > 0) {
T(YAFFS_TRACE_ERROR,
if (data && correct_errors) {
if (nspare.eccres1 > 0) {
T(YAFFS_TRACE_ERROR,
@@
-294,7
+294,7
@@
static int yaffs_rd_chunk_nand(struct yaffs_dev_s *dev,
* Functions for robustisizing
*/
* Functions for robustisizing
*/
-static void yaffs_handle_rd_data_error(
yaffs_dev_t
*dev, int nand_chunk)
+static void yaffs_handle_rd_data_error(
struct yaffs_dev
*dev, int nand_chunk)
{
int flash_block = nand_chunk / dev->param.chunks_per_block;
{
int flash_block = nand_chunk / dev->param.chunks_per_block;
@@
-311,13
+311,13
@@
static void yaffs_handle_rd_data_error(yaffs_dev_t *dev, int nand_chunk)
}
}
-int yaffs_tags_compat_wr(
yaffs_dev_t
*dev,
+int yaffs_tags_compat_wr(
struct yaffs_dev
*dev,
int nand_chunk,
int nand_chunk,
- const
__
u8 *data,
- const yaffs_ext_tags *ext_tags)
+ const u8 *data,
+ const
struct
yaffs_ext_tags *ext_tags)
{
{
- yaffs_spare spare;
-
yaffs_tags_t
tags;
+
struct
yaffs_spare spare;
+
struct yaffs_tags
tags;
yaffs_spare_init(&spare);
yaffs_spare_init(&spare);
@@
-347,17
+347,17
@@
int yaffs_tags_compat_wr(yaffs_dev_t *dev,
return yaffs_wr_nand(dev, nand_chunk, data, &spare);
}
return yaffs_wr_nand(dev, nand_chunk, data, &spare);
}
-int yaffs_tags_compat_rd(
yaffs_dev_t
*dev,
+int yaffs_tags_compat_rd(
struct yaffs_dev
*dev,
int nand_chunk,
int nand_chunk,
-
__
u8 *data,
- yaffs_ext_tags *ext_tags)
+ u8 *data,
+
struct
yaffs_ext_tags *ext_tags)
{
{
- yaffs_spare spare;
-
yaffs_tags_t
tags;
- 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 yaffs_spare spare_ff;
+ static
struct
yaffs_spare spare_ff;
static int init;
if (!init) {
static int init;
if (!init) {
@@
-401,13
+401,13
@@
int yaffs_tags_compat_rd(yaffs_dev_t *dev,
}
}
}
}
-int yaffs_tags_compat_mark_bad(struct yaffs_dev
_s
*dev,
+int yaffs_tags_compat_mark_bad(struct yaffs_dev *dev,
int flash_block)
{
int flash_block)
{
- yaffs_spare spare;
+
struct
yaffs_spare spare;
- memset(&spare, 0xff, sizeof(yaffs_spare));
+ memset(&spare, 0xff, sizeof(
struct
yaffs_spare));
spare.block_status = 'Y';
spare.block_status = 'Y';
@@
-420,16
+420,16
@@
int yaffs_tags_compat_mark_bad(struct yaffs_dev_s *dev,
}
}
-int yaffs_tags_compat_query_block(struct yaffs_dev
_s
*dev,
+int yaffs_tags_compat_query_block(struct yaffs_dev *dev,
int block_no,
int block_no,
-
yaffs_block_state_t
*state,
-
__
u32 *seq_number)
+
enum yaffs_block_state
*state,
+ u32 *seq_number)
{
{
- yaffs_spare spare0, spare1;
- static yaffs_spare spare_ff;
+
struct
yaffs_spare spare0, spare1;
+ static
struct
yaffs_spare spare_ff;
static int init;
static int init;
- yaffs_ecc_result dummy;
+
enum
yaffs_ecc_result dummy;
if (!init) {
memset(&spare_ff, 0xFF, sizeof(spare_ff));
if (!init) {
memset(&spare_ff, 0xFF, sizeof(spare_ff));