From c59b06d4c8cc6962cb0c7d01ae3a3ef15f937f77 Mon Sep 17 00:00:00 2001
From: charles <charles>
Date: Wed, 8 Nov 2006 06:24:34 +0000
Subject: [PATCH] Change nBytesPerChunk to nDataBytesPerChunk

---
 yaffs_mtdif.c  | 10 +++++-----
 yaffs_mtdif2.c |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c
index 1e09650..1510a94 100644
--- a/yaffs_mtdif.c
+++ b/yaffs_mtdif.c
@@ -14,7 +14,7 @@
  */
 
 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.16 2006-11-08 06:24:34 charles Exp $";
 
 #include "yportenv.h"
 
@@ -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;
diff --git a/yaffs_mtdif2.c b/yaffs_mtdif2.c
index 2c47951..4e8c335 100644
--- a/yaffs_mtdif2.c
+++ b/yaffs_mtdif2.c
@@ -16,7 +16,7 @@
 /* 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.15 2006-11-08 06:24:34 charles Exp $";
 
 #include "yportenv.h"
 
@@ -59,7 +59,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 +120,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;
-- 
2.30.2