X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2Fyaffs_ramdisk.c;h=5d389b973f5a57c9ef9f57d67552646b255b1e5d;hp=9ca963be12a8f252d3670bf8de388d2507f9bbd4;hb=79d0e028d5b777b2e4cf55d96b737cb024988abe;hpb=70c6bf2ff57c8a2fb778accdd5b4227abf273674

diff --git a/direct/basic-test/yaffs_ramdisk.c b/direct/basic-test/yaffs_ramdisk.c
index 9ca963b..5d389b9 100644
--- a/direct/basic-test/yaffs_ramdisk.c
+++ b/direct/basic-test/yaffs_ramdisk.c
@@ -15,7 +15,7 @@
  * yaffs_ramdisk.c: yaffs ram disk component
  * This provides a ram disk under yaffs.
  * NB this is not intended for NAND emulation.
- * Use this with dev->useNANDECC enabled, then ECC overheads are not required.
+ * Use this with dev->use_nand_ecc enabled, then ECC overheads are not required.
  */
 
 const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.6 2010-01-11 04:06:47 charles Exp $";
@@ -26,7 +26,6 @@ const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.6 2010-01-11 04:
 
 #include "yaffs_ramdisk.h"
 #include "yaffs_guts.h"
-#include "devextras.h"
 #include "yaffs_packedtags1.h"
 
 
@@ -42,7 +41,7 @@ const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.6 2010-01-11 04:
 
 typedef struct 
 {
-	__u8 data[528]; // Data + spare
+	u8 data[528]; // Data + spare
 } yramdisk_page;
 
 typedef struct
@@ -61,7 +60,7 @@ typedef struct
 
 static yramdisk_device ramdisk;
 
-static int  CheckInit(yaffs_Device *dev)
+static int  CheckInit(struct yaffs_dev *dev)
 {
 	static int initialised = 0;
 	
@@ -80,7 +79,7 @@ static int  CheckInit(yaffs_Device *dev)
 	
 	ramdisk.nBlocks = (SIZE_IN_MB * 1024 * 1024)/(16 * 1024);
 	
-	ramdisk.block = YMALLOC(sizeof(yramdisk_block *) * ramdisk.nBlocks);
+	ramdisk.block = malloc(sizeof(yramdisk_block *) * ramdisk.nBlocks);
 	
 	if(!ramdisk.block) return 0;
 	
@@ -91,7 +90,7 @@ static int  CheckInit(yaffs_Device *dev)
 	
 	for(i=0; i <ramdisk.nBlocks && !fail; i++)
 	{
-		if((ramdisk.block[i] = YMALLOC(sizeof(yramdisk_block))) == 0)
+		if((ramdisk.block[i] = malloc(sizeof(yramdisk_block))) == 0)
 		{
 			fail = 1;
 		}
@@ -106,12 +105,13 @@ static int  CheckInit(yaffs_Device *dev)
 	{
 		for(i = 0; i < nAllocated; i++)
 		{
-			YFREE(ramdisk.block[i]);
+			kfree(ramdisk.block[i]);
 		}
-		YFREE(ramdisk.block);
+		kfree(ramdisk.block);
 		
-		T(YAFFS_TRACE_ALWAYS,("Allocation failed, could only allocate %dMB of %dMB requested.\n",
-		   nAllocated/64,ramdisk.nBlocks * 528));
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"Allocation failed, could only allocate %dMB of %dMB requested.\n",
+			nAllocated/64,ramdisk.nBlocks * 528);
 		return 0;
 	}
 	
@@ -119,7 +119,7 @@ static int  CheckInit(yaffs_Device *dev)
 	return 1;
 }
 
-int yramdisk_wr_chunk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_ExtendedTags *tags)
+int yramdisk_wr_chunk(struct yaffs_dev *dev,int nand_chunk,const u8 *data, const struct yaffs_ext_tags *tags)
 {
 	int blk;
 	int pg;
@@ -127,8 +127,8 @@ int yramdisk_wr_chunk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const
 
 	CheckInit(dev);
 	
-	blk = chunkInNAND/32;
-	pg = chunkInNAND%32;
+	blk = nand_chunk/32;
+	pg = nand_chunk%32;
 	
 	
 	if(data)
@@ -139,9 +139,9 @@ int yramdisk_wr_chunk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const
 	
 	if(tags)
 	{
-		yaffs_PackedTags1 pt;
+		struct yaffs_packed_tags1 pt;
 		
-		yaffs_PackTags1(&pt,tags);
+		yaffs_pack_tags1(&pt,tags);
 		memcpy(&ramdisk.block[blk]->page[pg].data[512],&pt,sizeof(pt));
 	}
 
@@ -150,7 +150,7 @@ int yramdisk_wr_chunk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const
 }
 
 
-int yramdisk_rd_chunk(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags)
+int yramdisk_rd_chunk(struct yaffs_dev *dev,int nand_chunk, u8 *data, struct yaffs_ext_tags *tags)
 {
 	int blk;
 	int pg;
@@ -158,8 +158,8 @@ int yramdisk_rd_chunk(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_Exten
 	
 	CheckInit(dev);
 	
-	blk = chunkInNAND/32;
-	pg = chunkInNAND%32;
+	blk = nand_chunk/32;
+	pg = nand_chunk%32;
 	
 	
 	if(data)
@@ -170,7 +170,7 @@ int yramdisk_rd_chunk(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_Exten
 	
 	if(tags)
 	{
-		yaffs_PackedTags1 pt;
+		struct yaffs_packed_tags1 pt;
 		
 		memcpy(&pt,&ramdisk.block[blk]->page[pg].data[512],sizeof(pt));
 		yaffs_unpack_tags1(tags,&pt);
@@ -181,7 +181,7 @@ int yramdisk_rd_chunk(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_Exten
 }
 
 
-int yramdisk_check_chunk_erased(yaffs_Device *dev,int chunkInNAND)
+int yramdisk_check_chunk_erased(struct yaffs_dev *dev,int nand_chunk)
 {
 	int blk;
 	int pg;
@@ -190,8 +190,8 @@ int yramdisk_check_chunk_erased(yaffs_Device *dev,int chunkInNAND)
 	
 	CheckInit(dev);
 	
-	blk = chunkInNAND/32;
-	pg = chunkInNAND%32;
+	blk = nand_chunk/32;
+	pg = nand_chunk%32;
 	
 	
 	for(i = 0; i < 528; i++)
@@ -206,14 +206,16 @@ int yramdisk_check_chunk_erased(yaffs_Device *dev,int chunkInNAND)
 
 }
 
-int yramdisk_erase(yaffs_Device *dev, int blockNumber)
+int yramdisk_erase(struct yaffs_dev *dev, int blockNumber)
 {
 	
 	CheckInit(dev);
 	
 	if(blockNumber < 0 || blockNumber >= ramdisk.nBlocks)
 	{
-		T(YAFFS_TRACE_ALWAYS,("Attempt to erase non-existant block %d\n",blockNumber));
+		yaffs_trace(YAFFS_TRACE_ALWAYS,
+			"Attempt to erase non-existant block %d\n",
+			blockNumber);
 		return YAFFS_FAIL;
 	}
 	else
@@ -224,12 +226,11 @@ int yramdisk_erase(yaffs_Device *dev, int blockNumber)
 	
 }
 
-int yramdisk_initialise(yaffs_Device *dev)
+int yramdisk_initialise(struct yaffs_dev *dev)
 {
-	//dev->useNANDECC = 1; // force on useNANDECC which gets faked. 
+	//dev->use_nand_ecc = 1; // force on use_nand_ecc which gets faked. 
 						 // This saves us doing ECC checks.
 	
 	return YAFFS_OK;
 }
 
-