Updated headers so they really are the same

[yaffs2.git] / yaffs_mtdif2.c

diff --git a/yaffs_mtdif2.c b/yaffs_mtdif2.c
index 2c4795112621538728f30b387726e38fe03c81dd..d927c76737ebc796c0bdaf2f50efa5515010bc54 100644 (file)
--- a/yaffs_mtdif2.c
+++ b/yaffs_mtdif2.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,13 +9,12 @@
  * 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.
- *
  */
 
 /* mtd interface for YAFFS2 */
 
 const char *yaffs_mtdif2_c_version =
-    "$Id: yaffs_mtdif2.c,v 1.14 2006-10-03 10:13:03 charles Exp $";
+    "$Id: yaffs_mtdif2.c,v 1.17 2007-02-14 01:09:06 wookey Exp $";
 
 #include "yportenv.h"
 
@@ -59,7 +57,7 @@ int nandmtd2_WriteChunkWithTagsToNAND(yaffs_Device * dev, int chunkInNAND,
        if (data) {
                ops.mode = MTD_OOB_AUTO;
                ops.ooblen = sizeof(pt);
-               ops.len = dev->nBytesPerChunk;
+               ops.len = dev->nDataBytesPerChunk;
                ops.ooboffs = 0;
                ops.datbuf = (__u8 *)data;
                ops.oobbuf = (void *)&pt;
@@ -120,12 +118,12 @@ int nandmtd2_ReadChunkWithTagsFromNAND(yaffs_Device * dev, int chunkInNAND,
 
 #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17))
        if (data && !tags)
-               retval = mtd->read(mtd, addr, dev->nBytesPerChunk,
+               retval = mtd->read(mtd, addr, dev->nDataBytesPerChunk,
                                &dummy, data);
        else if (tags) {
                ops.mode = MTD_OOB_AUTO;
                ops.ooblen = sizeof(pt);
-               ops.len = data ? dev->nBytesPerChunk : sizeof(pt);
+               ops.len = data ? dev->nDataBytesPerChunk : sizeof(pt);
                ops.ooboffs = 0;
                ops.datbuf = data;
                ops.oobbuf = dev->spareBuffer;