X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=direct%2Ftest-framework%2Fyaffs_nor_drv.c;h=c642452daf2bb240cdc117d757eb3a1714f7719c;hb=1f3d64d1d804fef6715126dead54bf30b176c67e;hp=a510979e6d5b6f96d4366ab9369b2fb9029d1cef;hpb=1c778c3bd4a01a5cad8db6ff52c24c99a3e9fa0e;p=yaffs2.git

diff --git a/direct/test-framework/yaffs_nor_drv.c b/direct/test-framework/yaffs_nor_drv.c
index a510979..c642452 100644
--- a/direct/test-framework/yaffs_nor_drv.c
+++ b/direct/test-framework/yaffs_nor_drv.c
@@ -1,8 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2011 Aleph One Ltd.
- *   for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
  *
@@ -199,6 +198,8 @@ static int nor_drv_ReadChunkFromNAND(struct yaffs_dev *dev,int nand_chunk,
 	u32 *dataAddr = Chunk2DataAddr(dev,nand_chunk);
 	u32 *spareAddr = Chunk2SpareAddr(dev,nand_chunk);
 
+	(void) data_len;
+
 	if (data) {
 		nor_drv_FlashRead32(dataAddr,(u32 *)data,dev->param.total_bytes_per_chunk / sizeof(u32));
 	}
@@ -278,7 +279,7 @@ static int nor_drv_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber)
 
 static int nor_drv_InitialiseNAND(struct yaffs_dev *dev)
 {
-	int i;
+	u32 i;
 
 	nor_drv_FlashInit();
 	/* Go through the blocks formatting them if they are not formatted */
@@ -328,6 +329,7 @@ struct yaffs_dev *yaffs_nor_install_drv(const char *name)
 	param->start_block = 0; // Can use block 0
 	param->end_block = BLOCKS_IN_DEVICE - 1; // Last block
 	param->use_nand_ecc = 0; // use YAFFS's ECC
+	param->disable_soft_del = 1;
 
 	drv->drv_write_chunk_fn = nor_drv_WriteChunkToNAND;
 	drv->drv_read_chunk_fn = nor_drv_ReadChunkFromNAND;