X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2Fyaffs_ramdisk.c;h=bea5cfb8beaceb81f2bd35d7256390adc89dcab0;hp=e9fe6dcbc6417e317c291d07a64d3261f155f004;hb=6648cbf52d6695755941ff8607fd7a0cda542e05;hpb=976dbeae825b18e6759f3903073a6784248cc244

diff --git a/direct/basic-test/yaffs_ramdisk.c b/direct/basic-test/yaffs_ramdisk.c
index e9fe6dc..bea5cfb 100644
--- a/direct/basic-test/yaffs_ramdisk.c
+++ b/direct/basic-test/yaffs_ramdisk.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -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"
 
 
@@ -80,7 +79,7 @@ static int  CheckInit(struct yaffs_dev *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(struct yaffs_dev *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(struct yaffs_dev *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;
 	}
 	
@@ -139,7 +139,7 @@ int yramdisk_wr_chunk(struct yaffs_dev *dev,int nand_chunk,const u8 *data, const
 	
 	if(tags)
 	{
-		yaffs_packed_tags1 pt;
+		struct yaffs_packed_tags1 pt;
 		
 		yaffs_pack_tags1(&pt,tags);
 		memcpy(&ramdisk.block[blk]->page[pg].data[512],&pt,sizeof(pt));
@@ -170,7 +170,7 @@ int yramdisk_rd_chunk(struct yaffs_dev *dev,int nand_chunk, u8 *data, struct yaf
 	
 	if(tags)
 	{
-		yaffs_packed_tags1 pt;
+		struct yaffs_packed_tags1 pt;
 		
 		memcpy(&pt,&ramdisk.block[blk]->page[pg].data[512],sizeof(pt));
 		yaffs_unpack_tags1(tags,&pt);
@@ -213,7 +213,9 @@ int yramdisk_erase(struct yaffs_dev *dev, int blockNumber)
 	
 	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
@@ -232,4 +234,3 @@ int yramdisk_initialise(struct yaffs_dev *dev)
 	return YAFFS_OK;
 }
 
-