projects / yaffs2.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
yaffs Fixed some bugs in direct/timothy_tests/mirror_tests
[yaffs2.git] / yaffs_mtdif2_single.c
diff --git a/yaffs_mtdif2_single.c b/yaffs_mtdif2_single.c
index 667d129adafce954631e6809defb1ac32f4ca142..d1643df2c381b89e92b403a09e12732b39a91aac 100644 (file)
--- a/yaffs_mtdif2_single.c
+++ b/yaffs_mtdif2_single.c
@@ -31,8 +31,8 @@
  * use it to load the tags.
  */
 int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
-                                     const u8 *data,
-                                     const struct yaffs_ext_tags *tags)
+                             const u8 * data,
+                             const struct yaffs_ext_tags *tags)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
        struct mtd_oob_ops ops;
@@ -40,18 +40,18 @@ int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
 
        loff_t addr;
 
-       yaffs_packed_tags2 pt;
+       struct yaffs_packed_tags2 pt;
 
-       int packed_tags_size = dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt);
-       void * packed_tags_ptr = dev->param.no_tags_ecc ? (void *) &pt.t : (void *)&pt;
+       int packed_tags_size =
+           dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt);
+       void *packed_tags_ptr =
+           dev->param.no_tags_ecc ? (void *)&pt.t : (void *)&pt;
 
-       T(YAFFS_TRACE_MTD,
-         (TSTR
-          ("nandmtd2_write_chunk_tags chunk %d data %p tags %p"
-           TENDSTR), nand_chunk, data, tags));
+       yaffs_trace(YAFFS_TRACE_MTD,
+               "nandmtd2_write_chunk_tags chunk %d data %p tags %p",
+               nand_chunk, data, tags);
 
-
-       addr  = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
+       addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
 
        /* For yaffs2 writing there must be both data and tags.
         * If we're using inband tags, then the tags are stuffed into
@@ -60,21 +60,24 @@ int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
        if (!data || !tags)
                BUG();
        else if (dev->param.inband_tags) {
-               yaffs_packed_tags2_tags_only *pt2tp;
-               pt2tp = (yaffs_packed_tags2_tags_only *)(data + dev->data_bytes_per_chunk);
+               struct yaffs_packed_tags2_tags_only *pt2tp;
+               pt2tp =
+                   (struct yaffs_packed_tags2_tags_only *)(data +
+                                                           dev->
+                                                           data_bytes_per_chunk);
                yaffs_pack_tags2_tags_only(pt2tp, tags);
-       } else
+       } else {
                yaffs_pack_tags2(&pt, tags, !dev->param.no_tags_ecc);
+        }
 
        ops.mode = MTD_OOB_AUTO;
        ops.ooblen = (dev->param.inband_tags) ? 0 : packed_tags_size;
        ops.len = dev->param.total_bytes_per_chunk;
        ops.ooboffs = 0;
-       ops.datbuf = (u8 *)data;
+       ops.datbuf = (u8 *) data;
        ops.oobbuf = (dev->param.inband_tags) ? NULL : packed_tags_ptr;
        retval = mtd->write_oob(mtd, addr, &ops);
 
-
        if (retval == 0)
                return YAFFS_OK;
        else
@@ -82,7 +85,7 @@ int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
 }
 
 int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
-                                      u8 *data, struct yaffs_ext_tags *tags)
+                            u8 * data, struct yaffs_ext_tags *tags)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
        struct mtd_oob_ops ops;
@@ -93,15 +96,16 @@ int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
 
        loff_t addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk;
 
-       yaffs_packed_tags2 pt;
+       struct yaffs_packed_tags2 pt;
 
-       int packed_tags_size = dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt);
-       void * packed_tags_ptr = dev->param.no_tags_ecc ? (void *) &pt.t: (void *)&pt;
+       int packed_tags_size =
+           dev->param.no_tags_ecc ? sizeof(pt.t) : sizeof(pt);
+       void *packed_tags_ptr =
+           dev->param.no_tags_ecc ? (void *)&pt.t : (void *)&pt;
 
-       T(YAFFS_TRACE_MTD,
-         (TSTR
-          ("nandmtd2_read_chunk_tags chunk %d data %p tags %p"
-           TENDSTR), nand_chunk, data, tags));
+       yaffs_trace(YAFFS_TRACE_MTD,
+               "nandmtd2_read_chunk_tags chunk %d data %p tags %p",
+               nand_chunk, data, tags);
 
        if (dev->param.inband_tags) {
 
@@ -110,13 +114,11 @@ int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
                        data = yaffs_get_temp_buffer(dev, __LINE__);
                }
 
-
        }
 
-
        if (dev->param.inband_tags || (data && !tags))
                retval = mtd->read(mtd, addr, dev->param.total_bytes_per_chunk,
-                               &dummy, data);
+                                  &dummy, data);
        else if (tags) {
                ops.mode = MTD_OOB_AUTO;
                ops.ooblen = packed_tags_size;
@@ -129,13 +131,17 @@ int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
 
        if (dev->param.inband_tags) {
                if (tags) {
-                       yaffs_packed_tags2_tags_only *pt2tp;
-                       pt2tp = (yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
+                       struct yaffs_packed_tags2_tags_only *pt2tp;
+                       pt2tp =
+                           (struct yaffs_packed_tags2_tags_only *)&data[dev->
+                                                                        data_bytes_per_chunk];
                        yaffs_unpack_tags2_tags_only(tags, pt2tp);
                }
        } else {
                if (tags) {
-                       memcpy(packed_tags_ptr, yaffs_dev_to_lc(dev)->spare_buffer, packed_tags_size);
+                       memcpy(packed_tags_ptr,
+                              yaffs_dev_to_lc(dev)->spare_buffer,
+                              packed_tags_size);
                        yaffs_unpack_tags2(tags, &pt, !dev->param.no_tags_ecc);
                }
        }
@@ -143,11 +149,13 @@ int nandmtd2_read_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
        if (local_data)
                yaffs_release_temp_buffer(dev, data, __LINE__);
 
-       if (tags && retval == -EBADMSG && tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) {
+       if (tags && retval == -EBADMSG
+           && tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) {
                tags->ecc_result = YAFFS_ECC_RESULT_UNFIXED;
                dev->n_ecc_unfixed++;
        }
-       if(tags && retval == -EUCLEAN && tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) {
+       if (tags && retval == -EUCLEAN
+           && tags->ecc_result == YAFFS_ECC_RESULT_NO_ERROR) {
                tags->ecc_result = YAFFS_ECC_RESULT_FIXED;
                dev->n_ecc_fixed++;
        }
@@ -161,8 +169,8 @@ int nandmtd2_mark_block_bad(struct yaffs_dev *dev, int block_no)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
        int retval;
-       T(YAFFS_TRACE_MTD,
-         (TSTR("nandmtd2_mark_block_bad %d" TENDSTR), block_no));
+       yaffs_trace(YAFFS_TRACE_MTD,
+               "nandmtd2_mark_block_bad %d", block_no);
 
        retval =
            mtd->block_markbad(mtd,
@@ -177,28 +185,26 @@ int nandmtd2_mark_block_bad(struct yaffs_dev *dev, int block_no)
 }
 
 int nandmtd2_query_block(struct yaffs_dev *dev, int block_no,
-                           enum yaffs_block_state *state, u32 *seq_number)
+                        enum yaffs_block_state *state, u32 * seq_number)
 {
        struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
        int retval;
 
-       T(YAFFS_TRACE_MTD,
-         (TSTR("nandmtd2_query_block %d" TENDSTR), block_no));
+       yaffs_trace(YAFFS_TRACE_MTD, "nandmtd2_query_block %d", block_no);
        retval =
            mtd->block_isbad(mtd,
                             block_no * dev->param.chunks_per_block *
                             dev->param.total_bytes_per_chunk);
 
        if (retval) {
-               T(YAFFS_TRACE_MTD, (TSTR("block is bad" TENDSTR)));
+               yaffs_trace(YAFFS_TRACE_MTD, "block is bad");
 
                *state = YAFFS_BLOCK_STATE_DEAD;
                *seq_number = 0;
        } else {
                struct yaffs_ext_tags t;
                nandmtd2_read_chunk_tags(dev, block_no *
-                                                  dev->param.chunks_per_block, NULL,
-                                                  &t);
+                                        dev->param.chunks_per_block, NULL, &t);
 
                if (t.chunk_used) {
                        *seq_number = t.seq_number;
@@ -208,12 +214,12 @@ int nandmtd2_query_block(struct yaffs_dev *dev, int block_no,
                        *state = YAFFS_BLOCK_STATE_EMPTY;
                }
        }
-       T(YAFFS_TRACE_MTD,
-         (TSTR("block is bad seq %d state %d" TENDSTR), *seq_number,
-          *state));
+       yaffs_trace(YAFFS_TRACE_MTD,
+               "block is bad seq %d state %d", *seq_number, *state);
 
        if (retval == 0)
                return YAFFS_OK;
        else
                return YAFFS_FAIL;
 }
+
The YAFFS2 repository.