yaffs direct: Fix yaffs direct offset handling for pwrite

[yaffs2.git] / direct / yaffs_ramem2k.c

diff --git a/direct/yaffs_ramem2k.c b/direct/yaffs_ramem2k.c
index b496cc64befba775c35b2bf4e10b5a2e56cff0dd..b3a8724536fc3066a016bd3cd331bad299572b15 100644 (file)
--- a/direct/yaffs_ramem2k.c
+++ b/direct/yaffs_ramem2k.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -16,7 +16,7 @@
  */
 
 
-const char *yaffs_ramem2k_c_version = "$Id: yaffs_ramem2k.c,v 1.4 2008-05-05 07:58:58 charles Exp $";
+const char *yaffs_ramem2k_c_version = "$Id: yaffs_ramem2k.c,v 1.8 2010-02-18 01:18:04 charles Exp $";
 
 #ifndef __KERNEL__
 #define CONFIG_YAFFS_RAM_ENABLED
@@ -27,6 +27,7 @@ const char *yaffs_ramem2k_c_version = "$Id: yaffs_ramem2k.c,v 1.4 2008-05-05 07:
 #ifdef CONFIG_YAFFS_RAM_ENABLED
 
 #include "yportenv.h"
+#include "yaffs_trace.h"
 
 #include "yaffs_nandemul2k.h"
 #include "yaffs_guts.h"
@@ -220,7 +221,7 @@ int nandemul2k_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const
        {
                x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
                
-               yaffs_PackTags2((yaffs_PackedTags2 *)x,tags);
+               yaffs_PackTags2((yaffs_PackedTags2 *)x,tags, !dev->param.noTagsECC);
                        
        }
        
@@ -256,7 +257,7 @@ int nandemul2k_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8
        {
                x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
                
-               yaffs_UnpackTags2(tags,(yaffs_PackedTags2 *)x);
+               yaffs_UnpackTags2(tags,(yaffs_PackedTags2 *)x, !dev->param.noTagsECC);
        }
 
        return YAFFS_OK;
@@ -334,7 +335,7 @@ int nandemul2k_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, yaffs
 
        *sequenceNumber = 0;
        
-       chunkNo = blockNo * dev->nChunksPerBlock;
+       chunkNo = blockNo * dev->param.nChunksPerBlock;
        
        nandemul2k_ReadChunkWithTagsFromNAND(dev,chunkNo,NULL,&tags);
        if(tags.blockBad)