*** empty log message ***

[yaffs/.git] / yaffs_mtdif.c

diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c
index 4d31736bc6d7ab07e7ac461f49cc230d1ea6952c..5505d55f9a5aae82c98d8208daf89d0a25ea2141 100644 (file)
--- a/yaffs_mtdif.c
+++ b/yaffs_mtdif.c
@@ -13,7 +13,7 @@
  *
  */
 
-const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.4 2002-11-26 01:15:37 charles Exp $";
+const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.5 2002-12-13 00:13:06 charles Exp $";
 
 #ifdef CONFIG_YAFFS_MTD_ENABLED
  
@@ -23,76 +23,84 @@ const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.4 2002-11-26 01:15:3
 
 #include "linux/mtd/mtd.h"
 #include "linux/types.h"
+#include "linux/time.h"
 
 #ifndef        CONFIG_YAFFS_USE_OLD_MTD
 #include "linux/mtd/nand.h"
 #endif
 
-
 int nandmtd_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __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) * YAFFS_BYTES_PER_CHUNK;
        
-       
        __u8 *spareAsBytes = (__u8 *)spare;
 
 #ifndef        CONFIG_YAFFS_USE_OLD_MTD
        if(data && spare)
        {
 #ifdef CONFIG_YAFFS_USE_NANDECC
-               mtd->write_ecc(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data,spareAsBytes,NAND_YAFFS_OOB);
+               retval = mtd->write_ecc(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data,spareAsBytes,NAND_YAFFS_OOB);
 #else
-               mtd->write_ecc(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data,spareAsBytes,NAND_NONE_OOB);
+               retval = mtd->write_ecc(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data,spareAsBytes,NAND_NONE_OOB);
 #endif
        }
        else
        {
 #endif
        if(data)
-               mtd->write(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data);
+               retval = mtd->write(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data);
        if(spare)
-               mtd->write_oob(mtd,addr,YAFFS_BYTES_PER_SPARE,&dummy,spareAsBytes);
+               retval = mtd->write_oob(mtd,addr,YAFFS_BYTES_PER_SPARE,&dummy,spareAsBytes);
 #ifndef        CONFIG_YAFFS_USE_OLD_MTD
        }
 #endif
 
-       return YAFFS_OK;
+    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) * YAFFS_BYTES_PER_CHUNK;
        
        __u8 *spareAsBytes = (__u8 *)spare;
-
        
 #ifndef        CONFIG_YAFFS_USE_OLD_MTD
        if(data && spare)
        {
 #ifdef CONFIG_YAFFS_USE_NANDECC
-               mtd->read_ecc(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data,spareAsBytes,NAND_YAFFS_OOB);
+        u8 tmpSpare[ YAFFS_BYTES_PER_SPARE + (2*sizeof(int)) ];
+               retval = mtd->read_ecc(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data,tmpSpare,NAND_YAFFS_OOB);
+        memcpy(spareAsBytes, tmpSpare, YAFFS_BYTES_PER_SPARE);
 #else
-               mtd->read_ecc(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data,spareAsBytes,NAND_NONE_OOB);
+               retval = mtd->read_ecc(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data,spareAsBytes,NAND_NONE_OOB);
 #endif 
        }
        else
        {
 #endif
        if(data)
-               mtd->read(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data);
+               retval = mtd->read(mtd,addr,YAFFS_BYTES_PER_CHUNK,&dummy,data);
        if(spare)
-               mtd->read_oob(mtd,addr,YAFFS_BYTES_PER_SPARE,&dummy,spareAsBytes);
+               retval = mtd->read_oob(mtd,addr,YAFFS_BYTES_PER_SPARE,&dummy,spareAsBytes);
 #ifndef        CONFIG_YAFFS_USE_OLD_MTD
        }
 #endif
-       return YAFFS_OK;
+
+    if (retval == 0)
+       return YAFFS_OK;
+    else
+        return YAFFS_FAIL;
 }
 
 
@@ -105,10 +113,10 @@ static void nandmtd_EraseCallback(struct erase_info *ei)
 
 int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
 {
-       
        struct mtd_info *mtd = (struct mtd_info *)(dev->genericDevice);
        __u32 addr = ((loff_t) blockNumber) * YAFFS_BYTES_PER_BLOCK;
        struct erase_info ei;
+    int retval = 0;
        
        ei.mtd = mtd;
        ei.addr = addr;
@@ -122,14 +130,14 @@ int nandmtd_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
        
        sema_init(&dev->sem,0);
 
-       mtd->erase(mtd,&ei);
-       
+       retval = mtd->erase(mtd,&ei);   
        
        down(&dev->sem); // Wait for the erasure to complete
-                       
-       //Todo, check result of erasure
-       
-       return YAFFS_OK;
+
+    if (retval == 0)   
+       return YAFFS_OK;
+    else
+        return YAFFS_FAIL;
 }
 
 int nandmtd_InitialiseNAND(yaffs_Device *dev)