X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftest-framework%2Fyaffscfg2k.c;h=b053ce46801bd47f170b6a7f7d6aa3bb4dc359e4;hp=b9a09a7784f1c2aa45b906d7fcb5361f756945b3;hb=bfde38bff96a421dcb73ffbb8b9b69f3f6500677;hpb=54721f22512e7c859c4c4a4ae7e5374ecf7fb570

diff --git a/direct/test-framework/yaffscfg2k.c b/direct/test-framework/yaffscfg2k.c
index b9a09a7..b053ce4 100644
--- a/direct/test-framework/yaffscfg2k.c
+++ b/direct/test-framework/yaffscfg2k.c
@@ -39,15 +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)
 {
@@ -57,15 +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");
-
-	// /yaffs2  yaffs2 file emulation
-	yflash2_install_drv("yaffs2");
+	yaffs_nor_install_drv("nor");
+	yaffs_nandsim_install_drv("nand", "emfile-nand", 256);
 
 	return 0;
 }