X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftest-framework%2Fyaffscfg2k.c;h=314531730172c625b80ad55a7ad246583a4bdccb;hp=9e24866783dcc0ec81fa6c34baaecb8a84dc29f5;hb=1f3d64d1d804fef6715126dead54bf30b176c67e;hpb=1c778c3bd4a01a5cad8db6ff52c24c99a3e9fa0e

diff --git a/direct/test-framework/yaffscfg2k.c b/direct/test-framework/yaffscfg2k.c
index 9e24866..3145317 100644
--- a/direct/test-framework/yaffscfg2k.c
+++ b/direct/test-framework/yaffscfg2k.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>
  *
@@ -25,6 +24,7 @@
 #include "yaffs_nandemul2k.h"
 #include "yaffs_trace.h"
 #include "yaffs_osglue.h"
+#include "yaffs_nandsim_file.h"
 
 
 #include <errno.h>
@@ -39,16 +39,16 @@ unsigned yaffs_trace_mask =
 	YAFFS_TRACE_ALLOCATE |
 	YAFFS_TRACE_BAD_BLOCKS |
 	YAFFS_TRACE_VERIFY |
-
 	0;
 
 
 
-// Configuration
+/* Configure the devices that will be used */
 
 #include "yaffs_flashif2.h"
 #include "yaffs_m18_drv.h"
 #include "yaffs_nor_drv.h"
+#include "yaffs_nand_drv.h"
 
 int yaffs_start_up(void)
 {
@@ -58,16 +58,14 @@ int yaffs_start_up(void)
 		return 0;
 	start_up_called = 1;
 
-	// Stuff to configure YAFFS
-	// Stuff to initialise anything special (eg lock semaphore).
+	/* Call the OS initialisation (eg. set up lock semaphore */
 	yaffsfs_OSInitialisation();
 
-
+	/* Install the various devices and their device drivers */
+	yflash2_install_drv("yflash2");
 	yaffs_m18_install_drv("M18-1");
 	yaffs_nor_install_drv("nor");
-
-	// /yaffs2  yaffs2 file emulation
-	yflash2_install_drv("yaffs2");
+	yaffs_nandsim_install_drv("nand", "emfile-nand", 256);
 
 	return 0;
 }