X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftest-framework%2Fyaffscfg2k.c;h=7f8aba0213db4500dfc6865b9246c26fe28750cc;hp=005a02d975ad79793d11e18046b3ac672fab21e9;hb=99c3936c718cd7bd83a9edbc4327768215872b73;hpb=fd65eb6c02fba80b81f6e6f327ebb73250cbd9f5 diff --git a/direct/test-framework/yaffscfg2k.c b/direct/test-framework/yaffscfg2k.c index 005a02d..7f8aba0 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 * @@ -25,6 +24,7 @@ #include "yaffs_nandemul2k.h" #include "yaffs_trace.h" #include "yaffs_osglue.h" +#include "yaffs_nandsim_file.h" #include @@ -39,12 +39,11 @@ 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" @@ -59,15 +58,15 @@ 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"); - yaffs_nandsim_install_drv("nand", "emfile-nand", 256); + yaffs_nandsim_install_drv("nand", "emfile-nand", 256, 4, 1); + yaffs_nandsim_install_drv("nand128MB", "emfile-nand128MB", 1024, 4, 1); return 0; }