yaffs: More clean up
[yaffs2.git] / yaffs_tagscompat.c
index 1e910f2f3c69988d6688c76c8898c72f0a9d175c..f3fe9e87d3a8946c9c01982769cb092105487bf0 100644 (file)
 #include "yaffs_getblockinfo.h"
 #include "yaffs_trace.h"
 
-static void yaffs_handle_rd_data_error(yaffs_dev_t *dev, int nand_chunk);
-#ifdef NOTYET
-static void yaffs_check_written_block(yaffs_dev_t *dev, int nand_chunk);
-static void yaffs_handle_chunk_wr_ok(yaffs_dev_t *dev, int nand_chunk,
-                                    const __u8 *data,
-                                    const yaffs_spare *spare);
-static void yaffs_handle_chunk_update(yaffs_dev_t *dev, int nand_chunk,
-                                   const yaffs_spare *spare);
-static void yaffs_handle_chunk_wr_error(yaffs_dev_t *dev, int nand_chunk);
-#endif
+static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk);
+
 
 static const char yaffs_count_bits_table[256] = {
        0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
@@ -47,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
 };
 
-int yaffs_count_bits(__u8 x)
+int yaffs_count_bits(u8 x)
 {
        int ret_val;
        ret_val = yaffs_count_bits_table[x];
@@ -56,13 +48,13 @@ int yaffs_count_bits(__u8 x)
 
 /********** Tags ECC calculations  *********/
 
-void yaffs_calc_ecc(const __u8 *data, yaffs_spare *spare)
+void yaffs_calc_ecc(const u8 *data, yaffs_spare *spare)
 {
        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 */
 
@@ -85,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;
 
@@ -117,7 +109,7 @@ int yaffs_check_tags_ecc(yaffs_tags_t *tags)
 /********** Tags **********/
 
 static void yaffs_load_tags_to_spare(yaffs_spare *spare_ptr,
-                               yaffs_tags_t *tags_ptr)
+                               struct yaffs_tags *tags_ptr)
 {
        yaffs_tags_union_t *tu = (yaffs_tags_union_t *) tags_ptr;
 
@@ -133,8 +125,8 @@ static void yaffs_load_tags_to_spare(yaffs_spare *spare_ptr,
        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, yaffs_spare *spare_ptr,
+                               struct yaffs_tags *tags_ptr)
 {
        yaffs_tags_union_t *tu = (yaffs_tags_union_t *) tags_ptr;
        int result;
@@ -160,8 +152,8 @@ static void yaffs_spare_init(yaffs_spare *spare)
        memset(spare, 0xFF, sizeof(yaffs_spare));
 }
 
-static int yaffs_wr_nand(struct yaffs_dev_s *dev,
-                               int nand_chunk, const __u8 *data,
+static int yaffs_wr_nand(struct yaffs_dev *dev,
+                               int nand_chunk, const u8 *data,
                                yaffs_spare *spare)
 {
        if (nand_chunk < dev->param.start_block * dev->param.chunks_per_block) {
@@ -174,9 +166,9 @@ static int yaffs_wr_nand(struct yaffs_dev_s *dev,
        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,
-                                  __u8 *data,
+                                  u8 *data,
                                   yaffs_spare *spare,
                                   yaffs_ecc_result *ecc_result,
                                   int correct_errors)
@@ -196,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;
-                       __u8 calc_ecc[3];
+                       u8 calc_ecc[3];
 
                        yaffs_ecc_cacl(data, calc_ecc);
                        ecc_result1 =
@@ -297,39 +289,12 @@ static int yaffs_rd_chunk_nand(struct yaffs_dev_s *dev,
        return ret_val;
 }
 
-#ifdef NOTYET
-static int yaffs_check_chunk_erased(struct yaffs_dev_s *dev,
-                                 int nand_chunk)
-{
-       static int init;
-       static __u8 cmpbuf[YAFFS_BYTES_PER_CHUNK];
-       static __u8 data[YAFFS_BYTES_PER_CHUNK];
-       /* Might as well always allocate the larger size for */
-       /* dev->param.use_nand_ecc == true; */
-       static __u8 spare[sizeof(struct yaffs_nand_spare)];
-
-       dev->param.read_chunk_fn(dev, nand_chunk, data, (yaffs_spare *) spare);
-
-       if (!init) {
-               memset(cmpbuf, 0xff, YAFFS_BYTES_PER_CHUNK);
-               init = 1;
-       }
-
-       if (memcmp(cmpbuf, data, YAFFS_BYTES_PER_CHUNK))
-               return YAFFS_FAIL;
-       if (memcmp(cmpbuf, spare, 16))
-               return YAFFS_FAIL;
-
-       return YAFFS_OK;
-
-}
-#endif
 
 /*
  * 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;
 
@@ -345,64 +310,14 @@ static void yaffs_handle_rd_data_error(yaffs_dev_t *dev, int nand_chunk)
         */
 }
 
-#ifdef NOTYET
-static void yaffs_check_written_block(yaffs_dev_t *dev, int nand_chunk)
-{
-}
-
-static void yaffs_handle_chunk_wr_ok(yaffs_dev_t *dev, int nand_chunk,
-                                    const __u8 *data,
-                                    const yaffs_spare *spare)
-{
-}
-
-static void yaffs_handle_chunk_update(yaffs_dev_t *dev, int nand_chunk,
-                                   const yaffs_spare *spare)
-{
-}
-
-static void yaffs_handle_chunk_wr_error(yaffs_dev_t *dev, int nand_chunk)
-{
-       int flash_block = nand_chunk / dev->param.chunks_per_block;
-
-       /* Mark the block for retirement */
-       yaffs_get_block_info(dev, flash_block)->needs_retiring = 1;
-       /* Delete the chunk */
-       yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
-}
-
-static int yaffs_verify_cmp(const __u8 *d0, const __u8 *d1,
-                              const yaffs_spare *s0, const yaffs_spare *s1)
-{
-
-       if (memcmp(d0, d1, YAFFS_BYTES_PER_CHUNK) != 0 ||
-           s0->tb0 != s1->tb0 ||
-           s0->tb1 != s1->tb1 ||
-           s0->tb2 != s1->tb2 ||
-           s0->tb3 != s1->tb3 ||
-           s0->tb4 != s1->tb4 ||
-           s0->tb5 != s1->tb5 ||
-           s0->tb6 != s1->tb6 ||
-           s0->tb7 != s1->tb7 ||
-           s0->ecc1[0] != s1->ecc1[0] ||
-           s0->ecc1[1] != s1->ecc1[1] ||
-           s0->ecc1[2] != s1->ecc1[2] ||
-           s0->ecc2[0] != s1->ecc2[0] ||
-           s0->ecc2[1] != s1->ecc2[1] || s0->ecc2[2] != s1->ecc2[2]) {
-               return 0;
-       }
-
-       return 1;
-}
-#endif                         /* NOTYET */
 
-int yaffs_tags_compat_wr(yaffs_dev_t *dev,
+int yaffs_tags_compat_wr(struct yaffs_dev *dev,
                                                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_tags tags;
 
        yaffs_spare_init(&spare);
 
@@ -432,14 +347,14 @@ int yaffs_tags_compat_wr(yaffs_dev_t *dev,
        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,
-                                                    __u8 *data,
-                                                    yaffs_ext_tags *ext_tags)
+                                                    u8 *data,
+                                                    struct yaffs_ext_tags *ext_tags)
 {
 
        yaffs_spare spare;
-       yaffs_tags_t tags;
+       struct yaffs_tags tags;
        yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_UNKNOWN;
 
        static yaffs_spare spare_ff;
@@ -486,7 +401,7 @@ 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)
 {
 
@@ -505,10 +420,10 @@ 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,
                                          yaffs_block_state_t *state,
-                                         __u32 *seq_number)
+                                         u32 *seq_number)
 {
 
        yaffs_spare spare0, spare1;