Updated headers so they really are the same

[yaffs2.git] / yaffs_mtdif.c

diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c
index 1e096502c0a891657bae9060b46ca108207e4a9d..6e2a9de22267318f34bb7c42deabdea3a3e8dca8 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.15 2006-10-03 10:13:03 charles Exp $";
+    "$Id: yaffs_mtdif.c,v 1.19 2007-02-14 01:09:06 wookey Exp $";
 
 #include "yportenv.h"
 
@@ -64,8 +62,10 @@ static inline void translate_oob2spare(yaffs_Spare *spare, __u8 *oob)
        spare->tagByte5 = oob[5] == 0xff ? 0xff : oob[5] & 0x3f;
        spare->blockStatus = oob[5] & 0x80 ? 0xff : 'Y';
        spare->pageStatus = oob[5] & 0x40 ? 0xff : 0;
+       spare->ecc1[0] = spare->ecc1[1] = spare->ecc1[2] = 0xff;
        spare->tagByte6 = oob[6];
        spare->tagByte7 = oob[7];
+       spare->ecc2[0] = spare->ecc2[1] = spare->ecc2[2] = 0xff;
 
        nspare->eccres1 = nspare->eccres2 = 0; /* FIXME */
 }
@@ -86,7 +86,7 @@ int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
        __u8 spareAsBytes[8]; /* OOB */
 
        if (data && !spare)
-               retval = mtd->write(mtd, addr, dev->nBytesPerChunk,
+               retval = mtd->write(mtd, addr, dev->nDataBytesPerChunk,
                                &dummy, data);
        else if (spare) {
                if (dev->useNANDECC) {
@@ -97,7 +97,7 @@ int nandmtd_WriteChunkToNAND(yaffs_Device * dev, int chunkInNAND,
                        ops.mode = MTD_OOB_RAW;
                        ops.ooblen = YAFFS_BYTES_PER_SPARE;
                }
-               ops.len = data ? dev->nBytesPerChunk : ops.ooblen;
+               ops.len = data ? dev->nDataBytesPerChunk : ops.ooblen;
                ops.datbuf = (u8 *)data;
                ops.ooboffs = 0;
                ops.oobbuf = spareAsBytes;
@@ -150,7 +150,7 @@ int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
        __u8 spareAsBytes[8]; /* OOB */
 
        if (data && !spare)
-               retval = mtd->read(mtd, addr, dev->nBytesPerChunk,
+               retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
                                &dummy, data);
        else if (spare) {
                if (dev->useNANDECC) {
@@ -160,7 +160,7 @@ int nandmtd_ReadChunkFromNAND(yaffs_Device * dev, int chunkInNAND, __u8 * data,
                        ops.mode = MTD_OOB_RAW;
                        ops.ooblen = YAFFS_BYTES_PER_SPARE;
                }
-               ops.len = data ? dev->nBytesPerChunk : ops.ooblen;
+               ops.len = data ? dev->nDataBytesPerChunk : ops.ooblen;
                ops.datbuf = data;
                ops.ooboffs = 0;
                ops.oobbuf = spareAsBytes;