Clear creation counters when deinitialising.

[yaffs2.git] / yaffs_mtdif.c

diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c
index 04c491844c743faff90eef5a386c86d886598dd3..306e18839e17d23a625bea6316d92741374c2f5c 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-2007 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -10,11 +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.17 2006-11-29 20:21:12 charles Exp $";
+       "$Id: yaffs_mtdif.c,v 1.22 2009-03-06 17:20:51 wookey Exp $";
 
 #include "yportenv.h"
 
@@ -26,7 +24,7 @@ const char *yaffs_mtdif_c_version =
 #include "linux/time.h"
 #include "linux/mtd/nand.h"
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18))
+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 18))
 static struct nand_oobinfo yaffs_oobinfo = {
        .useecc = 1,
        .eccbytes = 6,
@@ -38,7 +36,7 @@ static struct nand_oobinfo yaffs_noeccinfo = {
 };
 #endif
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
 static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
 {
        oob[0] = spare->tagByte0;
@@ -47,8 +45,8 @@ static inline void translate_spare2oob(const yaffs_Spare *spare, __u8 *oob)
        oob[3] = spare->tagByte3;
        oob[4] = spare->tagByte4;
        oob[5] = spare->tagByte5 & 0x3f;
-       oob[5] |= spare->blockStatus == 'Y' ? 0: 0x80;
-       oob[5] |= spare->pageStatus == 0 ? 0: 0x40;
+       oob[5] |= spare->blockStatus == 'Y' ? 0 : 0x80;
+       oob[5] |= spare->pageStatus == 0 ? 0 : 0x40;
        oob[6] = spare->tagByte6;
        oob[7] = spare->tagByte7;
 }
@@ -73,18 +71,18 @@ static inline void translate_oob2spare(yaffs_Spare *spare, __u8 *oob)
 }
 #endif
 
-int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
-                            const __u8 * data, const yaffs_Spare * spare)
+int nandmtd_WriteChunkToNAND(yaffs_Device *dev, int chunkInNAND,
+                            const __u8 *data, const yaffs_Spare *spare)
 {
        struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
        struct mtd_oob_ops ops;
 #endif
        size_t dummy;
        int retval = 0;
 
        loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
        __u8 spareAsBytes[8]; /* OOB */
 
        if (data && !spare)
@@ -137,18 +135,18 @@ int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
                return YAFFS_FAIL;
 }
 
-int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
-                             yaffs_Spare * spare)
+int nandmtd_ReadChunkFromNAND(yaffs_Device *dev, int chunkInNAND, __u8 *data,
+                             yaffs_Spare *spare)
 {
        struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
        struct mtd_oob_ops ops;
 #endif
        size_t dummy;
        int retval = 0;
 
        loff_t addr = ((loff_t) chunkInNAND) * dev->nDataBytesPerChunk;
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
+#if (MTD_VERSION_CODE > MTD_VERSION(2, 6, 17))
        __u8 spareAsBytes[8]; /* OOB */
 
        if (data && !spare)
@@ -174,7 +172,7 @@ int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
        __u8 *spareAsBytes = (__u8 *) spare;
 
        if (data && spare) {
-               if (dev->useNANDECC) {  
+               if (dev->useNANDECC) {
                        /* Careful, this call adds 2 ints */
                        /* to the end of the spare data.  Calling function */
                        /* should allocate enough memory for spare, */
@@ -207,7 +205,7 @@ int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
                return YAFFS_FAIL;
 }
 
-int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
+int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
 {
        struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
        __u32 addr =
@@ -236,7 +234,7 @@ int nandmtd_EraseBlockInNAND(yaffs_Device * dev, int blockNumber)
                return YAFFS_FAIL;
 }
 
-int nandmtd_InitialiseNAND(yaffs_Device * dev)
+int nandmtd_InitialiseNAND(yaffs_Device *dev)
 {
        return YAFFS_OK;
 }