Merge branch 'quick_tests'

[yaffs2.git] / yaffs_mtdif.c

diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c
index 9f2b3ab7c4c19b4717e07f06c9ddf6a8f4470e40..7cf53b3d91be5057a0ff9d2dfb6d3994d48b12ac 100644 (file)
--- a/yaffs_mtdif.c
+++ b/yaffs_mtdif.c
@@ -1,8 +1,7 @@
 /*
- * YAFFS: Yet another FFS. A NAND-flash specific file system. 
- * yaffs_mtdif.c  NAND mtd wrapper functions.
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -10,16 +9,10 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
- *
  */
 
-const char *yaffs_mtdif_c_version =
-    "$Id: yaffs_mtdif.c,v 1.10 2005-08-11 01:07:43 marty Exp $";
-
 #include "yportenv.h"
 
-#ifdef CONFIG_YAFFS_YAFFS1
-
 #include "yaffs_mtdif.h"
 
 #include "linux/mtd/mtd.h"
@@ -27,121 +20,26 @@ const char *yaffs_mtdif_c_version =
 #include "linux/time.h"
 #include "linux/mtd/nand.h"
 
-static struct nand_oobinfo yaffs_oobinfo = {
-       .useecc = 1,
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,8))
-       .eccbytes = 6,
-#endif
-       .eccpos = {8, 9, 10, 13, 14, 15}
-};
-
-static struct nand_oobinfo yaffs_noeccinfo = {
-       .useecc = 0,
-};
-
-int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
-                            const __u8 * data, const yaffs_Spare * spare)
-{
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-       size_t dummy;
-       int retval = 0;
-
-       loff_t addr = ((loff_t) chunkInNAND) * dev->nBytesPerChunk;
-
-       __u8 *spareAsBytes = (__u8 *) spare;
-
-       if (data && spare) {
-               if (dev->useNANDECC)
-                       retval =
-                           mtd->write_ecc(mtd, addr, dev->nBytesPerChunk,
-                                          &dummy, data, spareAsBytes,
-                                          &yaffs_oobinfo);
-               else
-                       retval =
-                           mtd->write_ecc(mtd, addr, dev->nBytesPerChunk,
-                                          &dummy, data, spareAsBytes,
-                                          &yaffs_noeccinfo);
-       } else {
-               if (data)
-                       retval =
-                           mtd->write(mtd, addr, dev->nBytesPerChunk, &dummy,
-                                      data);
-               if (spare)
-                       retval =
-                           mtd->write_oob(mtd, addr, YAFFS_BYTES_PER_SPARE,
-                                          &dummy, spareAsBytes);
-       }
-
-       if (retval == 0)
-               return YAFFS_OK;
-       else
-               return YAFFS_FAIL;
-}
-
-int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
-                             yaffs_Spare * spare)
-{
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-       size_t dummy;
-       int retval = 0;
-
-       loff_t addr = ((loff_t) chunkInNAND) * dev->nBytesPerChunk;
-
-       __u8 *spareAsBytes = (__u8 *) spare;
-
-       if (data && spare) {
-               if (dev->useNANDECC) {  /* Careful, this call adds 2 ints */
-                       /* to the end of the spare data.  Calling function */
-                       /* should allocate enough memory for spare, */
-                       /* i.e. [YAFFS_BYTES_PER_SPARE+2*sizeof(int)]. */
-                       retval =
-                           mtd->read_ecc(mtd, addr, dev->nBytesPerChunk,
-                                         &dummy, data, spareAsBytes,
-                                         &yaffs_oobinfo);
-               } else {
-                       retval =
-                           mtd->read_ecc(mtd, addr, dev->nBytesPerChunk,
-                                         &dummy, data, spareAsBytes,
-                                         &yaffs_noeccinfo);
-               }
-       } else {
-               if (data)
-                       retval =
-                           mtd->read(mtd, addr, dev->nBytesPerChunk, &dummy,
-                                     data);
-               if (spare)
-                       retval =
-                           mtd->read_oob(mtd, addr, YAFFS_BYTES_PER_SPARE,
-                                         &dummy, spareAsBytes);
-       }
-
-       if (retval == 0)
-               return YAFFS_OK;
-       else
-               return YAFFS_FAIL;
-}
+#include "yaffs_linux.h"
 
-int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
+int nandmtd_erase_block(struct yaffs_dev *dev, int block_no)
 {
-       struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-       __u32 addr =
-           ((loff_t) blockNumber) * dev->nBytesPerChunk
-               * dev->nChunksPerBlock;
+       struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
+       u32 addr =
+           ((loff_t) block_no) * dev->param.total_bytes_per_chunk
+           * dev->param.chunks_per_block;
        struct erase_info ei;
+
        int retval = 0;
 
        ei.mtd = mtd;
        ei.addr = addr;
-       ei.len = dev->nBytesPerChunk * dev->nChunksPerBlock;
+       ei.len = dev->param.total_bytes_per_chunk * dev->param.chunks_per_block;
        ei.time = 1000;
        ei.retries = 2;
        ei.callback = NULL;
        ei.priv = (u_long) dev;
 
-       /* Todo finish off the ei if required */
-
-       sema_init(&dev->sem, 0);
-
        retval = mtd->erase(mtd, &ei);
 
        if (retval == 0)
@@ -150,9 +48,7 @@ int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
                return YAFFS_FAIL;
 }
 
-int nandmtd_InitialiseNAND(yaffs_Device * dev)
+int nandmtd_initialise(struct yaffs_dev *dev)
 {
        return YAFFS_OK;
 }
-
-#endif /* CONFIG_YAFFS_YAFFS1 */