X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2Fyaffscfg2k.c;h=4849889f8720789f58c20df82a4f49e70ec9f46b;hp=bbaacb9e553c3c433fcd56ce25c04eb9397903a7;hb=5587d9d89d5fb9c31fd723e85949f85da70ef3a9;hpb=126183c558a5f2ad8873ff01e312af62cf7fc9ef

diff --git a/direct/basic-test/yaffscfg2k.c b/direct/basic-test/yaffscfg2k.c
index bbaacb9..4849889 100644
--- a/direct/basic-test/yaffscfg2k.c
+++ b/direct/basic-test/yaffscfg2k.c
@@ -61,7 +61,7 @@ int yaffs_start_up(void)
 	static int start_up_called = 0;
 
 	if(start_up_called)
-		return;
+		return 0;
 	start_up_called = 1;
 
 	// Stuff to configure YAFFS
@@ -69,41 +69,15 @@ int yaffs_start_up(void)
 	yaffsfs_OSInitialisation();
 
 	// Set up devices
-	// /ram1   ram, yaffs1
-	memset(&ram1Dev,0,sizeof(ram1Dev));
-	ram1Dev.param.name = "ram1";
-	ram1Dev.param.total_bytes_per_chunk = 512;
-	ram1Dev.param.chunks_per_block = 32;
-	ram1Dev.param.n_reserved_blocks = 2; // Set this smaller for RAM
-	ram1Dev.param.start_block = 0; // Can use block 0
-	ram1Dev.param.end_block = 127; // Last block in 2MB.
-	//ram1Dev.param.use_nand_ecc = 1;
-	ram1Dev.param.n_caches = 0;	// Disable caching on this device.
-	ram1Dev.driver_context = (void *) 0;	// Used to identify the device in fstat.
-	ram1Dev.param.write_chunk_tags_fn = yramdisk_wr_chunk;
-	ram1Dev.param.read_chunk_tags_fn = yramdisk_rd_chunk;
-	ram1Dev.param.erase_fn = yramdisk_erase;
-	ram1Dev.param.initialise_flash_fn = yramdisk_initialise;
-
-	yaffs_add_device(&ram1Dev);
 
 	// /M18-1 yaffs1 on M18 nor sim
 	memset(&m18_1Dev,0,sizeof(m18_1Dev));
+	ynorif1_install_drv(&m18_1Dev);
 	m18_1Dev.param.name = "M18-1";
-	m18_1Dev.param.total_bytes_per_chunk = 1024;
-	m18_1Dev.param.chunks_per_block =248;
-	m18_1Dev.param.n_reserved_blocks = 2;
-	m18_1Dev.param.start_block = 0; // Can use block 0
-	m18_1Dev.param.end_block = 31; // Last block
-	m18_1Dev.param.use_nand_ecc = 0; // use YAFFS's ECC
 	m18_1Dev.param.n_caches = 10; // Use caches
 	m18_1Dev.param.disable_soft_del = 1;
 	m18_1Dev.driver_context = (void *) 1;	// Used to identify the device in fstat.
-	m18_1Dev.param.write_chunk_fn = ynorif1_WriteChunkToNAND;
-	m18_1Dev.param.read_chunk_fn = ynorif1_ReadChunkFromNAND;
-	m18_1Dev.param.erase_fn = ynorif1_EraseBlockInNAND;
-	m18_1Dev.param.initialise_flash_fn = ynorif1_InitialiseNAND;
-	m18_1Dev.param.deinitialise_flash_fn = ynorif1_Deinitialise_flash_fn;
+
 
 //	m18_1Dev.param.disable_soft_del = 1;
 
@@ -113,31 +87,19 @@ int yaffs_start_up(void)
 	// 2kpage/64chunk per block
 	//
 	memset(&flashDev,0,sizeof(flashDev));
+	yflash2_install_drv(&flashDev);
 	flashDev.param.name = "yaffs2";
-	flashDev.param.total_bytes_per_chunk = 2048;
-	flashDev.param.chunks_per_block = 64;
+
 	flashDev.param.n_reserved_blocks = 5;
-	flashDev.param.inband_tags = 0;
-	flashDev.param.start_block = 0;
-	flashDev.param.end_block = yflash2_GetNumberOfBlocks()-1;
-	flashDev.param.is_yaffs2 = 1;
-	flashDev.param.use_nand_ecc=1;
 	flashDev.param.wide_tnodes_disabled=0;
 	flashDev.param.refresh_period = 1000;
 	flashDev.param.n_caches = 10; // Use caches
 	flashDev.driver_context = (void *) 2;	// Used to identify the device in fstat.
-	flashDev.param.write_chunk_tags_fn = yflash2_WriteChunkWithTagsToNAND;
-	flashDev.param.read_chunk_tags_fn = yflash2_ReadChunkWithTagsFromNAND;
-	flashDev.param.erase_fn = yflash2_EraseBlockInNAND;
-	flashDev.param.initialise_flash_fn = yflash2_InitialiseNAND;
-	flashDev.param.bad_block_fn = yflash2_MarkNANDBlockBad;
-	flashDev.param.query_block_fn = yflash2_QueryNANDBlock;
+
 	flashDev.param.enable_xattr = 1;
 
 	yaffs_add_device(&flashDev);
 
-// todo	yaffs_initialise(yaffsfs_config);
-
 	return 0;
 }