projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/64_and_32_bit_time_tests'
[yaffs2.git]
/
direct
/
test-framework
/
yaffscfg2k.c
diff --git
a/direct/test-framework/yaffscfg2k.c
b/direct/test-framework/yaffscfg2k.c
index 9e24866783dcc0ec81fa6c34baaecb8a84dc29f5..7f8aba0213db4500dfc6865b9246c26fe28750cc 100644
(file)
--- 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.
*
/*
* 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>
*
*
* 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_nandemul2k.h"
#include "yaffs_trace.h"
#include "yaffs_osglue.h"
+#include "yaffs_nandsim_file.h"
#include <errno.h>
#include <errno.h>
@@
-39,16
+39,16
@@
unsigned yaffs_trace_mask =
YAFFS_TRACE_ALLOCATE |
YAFFS_TRACE_BAD_BLOCKS |
YAFFS_TRACE_VERIFY |
YAFFS_TRACE_ALLOCATE |
YAFFS_TRACE_BAD_BLOCKS |
YAFFS_TRACE_VERIFY |
-
0;
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_flashif2.h"
#include "yaffs_m18_drv.h"
#include "yaffs_nor_drv.h"
+#include "yaffs_nand_drv.h"
int yaffs_start_up(void)
{
int yaffs_start_up(void)
{
@@
-58,16
+58,15
@@
int yaffs_start_up(void)
return 0;
start_up_called = 1;
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();
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_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, 4, 1);
+ yaffs_nandsim_install_drv("nand128MB", "emfile-nand128MB", 1024, 4, 1);
return 0;
}
return 0;
}