More clean up

[yaffs2.git] / yaffs_checkptrw.c

diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c
index b1c4beed2b854a7a0bbff25ff3e5657875d769b0..f67d6be2c2c6e8a2aa3a7b9503f2e931861f4be4 100644 (file)
--- a/yaffs_checkptrw.c
+++ b/yaffs_checkptrw.c
@@ -16,7 +16,7 @@
 
 struct yaffs_checkpt_chunk_hdr {
        int version;
-       int seq;
+       u32 seq;
        u32 sum;
        u32 xor;
 } ;
@@ -72,9 +72,9 @@ static int yaffs2_checkpt_space_ok(struct yaffs_dev *dev)
 
 static int yaffs_checkpt_erase(struct yaffs_dev *dev)
 {
-       int i;
+       u32 i;
 
-       if (!dev->param.drv_erase_fn)
+       if (!dev->drv.drv_erase_fn)
                return 0;
        yaffs_trace(YAFFS_TRACE_CHECKPOINT,
                "checking blocks %d to %d",
@@ -91,14 +91,14 @@ static int yaffs_checkpt_erase(struct yaffs_dev *dev)
 
                        dev->n_erasures++;
 
-                       result = dev->param.drv_erase_fn(dev, offset_i);
+                       result = dev->drv.drv_erase_fn(dev, offset_i);
                        if(result) {
                                bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
                                dev->n_erased_blocks++;
                                dev->n_free_chunks +=
                                    dev->param.chunks_per_block;
                        } else {
-                               dev->param.drv_bad_block_fn(dev, offset_i);
+                               dev->drv.drv_mark_bad_fn(dev, offset_i);
                                bi->block_state = YAFFS_BLOCK_STATE_DEAD;
                        }
                }
@@ -111,7 +111,7 @@ static int yaffs_checkpt_erase(struct yaffs_dev *dev)
 
 static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
 {
-       int i;
+       u32 i;
        int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks;
 
        yaffs_trace(YAFFS_TRACE_CHECKPOINT,
@@ -119,7 +119,7 @@ static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
                dev->n_erased_blocks, dev->param.n_reserved_blocks,
                blocks_avail, dev->checkpt_next_block);
 
-       if (dev->checkpt_next_block >= 0 &&
+       if (dev->checkpt_next_block >= dev->internal_start_block &&
            dev->checkpt_next_block <= dev->internal_end_block &&
            blocks_avail > 0) {
 
@@ -139,13 +139,13 @@ static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev)
        }
        yaffs_trace(YAFFS_TRACE_CHECKPOINT, "out of checkpt blocks");
 
-       dev->checkpt_next_block = -1;
-       dev->checkpt_cur_block = -1;
+       dev->checkpt_next_block = 0;
+       dev->checkpt_cur_block = 0;
 }
 
 static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
 {
-       int i;
+       u32 i;
        struct yaffs_ext_tags tags;
 
        yaffs_trace(YAFFS_TRACE_CHECKPOINT,
@@ -155,11 +155,11 @@ static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
        if (dev->blocks_in_checkpt < dev->checkpt_max_blocks)
                for (i = dev->checkpt_next_block; i <= dev->internal_end_block;
                     i++) {
-                       int chunk = i * dev->param.chunks_per_block;
+                       u32 chunk = i * dev->param.chunks_per_block;
                        enum yaffs_block_state state;
                        u32 seq;
 
-                       dev->param.read_chunk_tags_fn(dev,
+                       dev->tagger.read_chunk_tags_fn(dev,
                                        apply_chunk_offset(dev, chunk),
                                        NULL, &tags);
                        yaffs_trace(YAFFS_TRACE_CHECKPOINT,
@@ -171,7 +171,7 @@ static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
                        if (tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA)
                                continue;
 
-                       dev->param.query_block_fn(dev,
+                       dev->tagger.query_block_fn(dev,
                                                apply_block_offset(dev, i),
                                                &state, &seq);
                        if (state == YAFFS_BLOCK_STATE_DEAD)
@@ -189,8 +189,8 @@ static void yaffs2_checkpt_find_block(struct yaffs_dev *dev)
 
        yaffs_trace(YAFFS_TRACE_CHECKPOINT, "found no more checkpt blocks");
 
-       dev->checkpt_next_block = -1;
-       dev->checkpt_cur_block = -1;
+       dev->checkpt_next_block = 0;
+       dev->checkpt_cur_block = 0;
 }
 
 int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
@@ -200,10 +200,10 @@ int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
        dev->checkpt_open_write = writing;
 
        /* Got the functions we need? */
-       if (!dev->param.write_chunk_tags_fn ||
-           !dev->param.read_chunk_tags_fn ||
-           !dev->param.drv_erase_fn ||
-           !dev->param.drv_mark_bad_fn)
+       if (!dev->tagger.write_chunk_tags_fn ||
+           !dev->tagger.read_chunk_tags_fn ||
+           !dev->drv.drv_erase_fn ||
+           !dev->drv.drv_mark_bad_fn)
                return 0;
 
        if (writing && !yaffs2_checkpt_space_ok(dev))
@@ -219,8 +219,8 @@ int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
        dev->checkpt_byte_count = 0;
        dev->checkpt_sum = 0;
        dev->checkpt_xor = 0;
-       dev->checkpt_cur_block = -1;
-       dev->checkpt_cur_chunk = -1;
+       dev->checkpt_cur_block = 0;
+       dev->checkpt_cur_chunk = 0;
        dev->checkpt_next_block = dev->internal_start_block;
 
        if (writing) {
@@ -264,12 +264,12 @@ static int yaffs2_checkpt_flush_buffer(struct yaffs_dev *dev)
        int offset_chunk;
        struct yaffs_ext_tags tags;
 
-       if (dev->checkpt_cur_block < 0) {
+       if (dev->checkpt_cur_block < dev->internal_start_block) {
                yaffs2_checkpt_find_erased_block(dev);
                dev->checkpt_cur_chunk = 0;
        }
 
-       if (dev->checkpt_cur_block < 0)
+       if (dev->checkpt_cur_block < dev->internal_start_block)
                return 0;
 
        tags.is_deleted = 0;
@@ -299,13 +299,13 @@ static int yaffs2_checkpt_flush_buffer(struct yaffs_dev *dev)
 
        dev->n_page_writes++;
 
-       dev->param.write_chunk_tags_fn(dev, offset_chunk,
+       dev->tagger.write_chunk_tags_fn(dev, offset_chunk,
                                       dev->checkpt_buffer, &tags);
        dev->checkpt_page_seq++;
        dev->checkpt_cur_chunk++;
        if (dev->checkpt_cur_chunk >= dev->param.chunks_per_block) {
                dev->checkpt_cur_chunk = 0;
-               dev->checkpt_cur_block = -1;
+               dev->checkpt_cur_block = 0;
        }
        memset(dev->checkpt_buffer, 0, dev->data_bytes_per_chunk);
 
@@ -337,8 +337,7 @@ int yaffs2_checkpt_wr(struct yaffs_dev *dev, const void *data, int n_bytes)
                data_bytes++;
                dev->checkpt_byte_count++;
 
-               if (dev->checkpt_byte_offs < 0 ||
-                   dev->checkpt_byte_offs >= dev->data_bytes_per_chunk)
+               if (dev->checkpt_byte_offs >= dev->data_bytes_per_chunk)
                        ok = yaffs2_checkpt_flush_buffer(dev);
        }
 
@@ -362,15 +361,16 @@ int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
 
        while (i < n_bytes && ok) {
 
-               if (dev->checkpt_byte_offs < 0 ||
-                   dev->checkpt_byte_offs >= dev->data_bytes_per_chunk) {
+               if (dev->checkpt_byte_offs >= dev->data_bytes_per_chunk) {
 
-                       if (dev->checkpt_cur_block < 0) {
+                       if (dev->checkpt_cur_block <
+                           dev->internal_start_block) {
                                yaffs2_checkpt_find_block(dev);
                                dev->checkpt_cur_chunk = 0;
                        }
 
-                       if (dev->checkpt_cur_block < 0) {
+                       if (dev->checkpt_cur_block <
+                           dev->internal_start_block) {
                                ok = 0;
                                break;
                        }
@@ -383,7 +383,7 @@ int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
                        dev->n_page_reads++;
 
                        /* read in the next chunk */
-                       dev->param.read_chunk_tags_fn(dev,
+                       dev->tagger.read_chunk_tags_fn(dev,
                                                offset_chunk,
                                                dev->checkpt_buffer,
                                                &tags);
@@ -402,9 +402,9 @@ int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes)
                        dev->checkpt_page_seq++;
                        dev->checkpt_cur_chunk++;
 
-                       if (dev->checkpt_cur_chunk >=
+                       if (dev->checkpt_cur_chunk >
                                        dev->param.chunks_per_block)
-                               dev->checkpt_cur_block = -1;
+                               dev->checkpt_cur_block = 0;
 
                }
 
@@ -431,8 +431,8 @@ int yaffs_checkpt_close(struct yaffs_dev *dev)
        } else if (dev->checkpt_block_list) {
                for (i = 0;
                     i < dev->blocks_in_checkpt &&
-                    dev->checkpt_block_list[i] >= 0; i++) {
-                       int blk = dev->checkpt_block_list[i];
+                    dev->checkpt_block_list[i] > 0; i++) {
+                       u32 blk = dev->checkpt_block_list[i];
                        struct yaffs_block_info *bi = NULL;
 
                        if (dev->internal_start_block <= blk &&