X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=direct%2Fbasic-test%2Fyaffs_ramem2k.c;h=9a857fd116f6554b10790d2c302b052c2877b07b;hb=fb1a7ee223619260cfd9b6366fd78747cc572cd5;hp=8b3c028b9060bad98dfe1f169438b90311ac0987;hpb=9131fecc79ad4e5fbdb775cdc067bc80aae5adb8;p=yaffs2.git

diff --git a/direct/basic-test/yaffs_ramem2k.c b/direct/basic-test/yaffs_ramem2k.c
index 8b3c028..9a857fd 100644
--- a/direct/basic-test/yaffs_ramem2k.c
+++ b/direct/basic-test/yaffs_ramem2k.c
@@ -31,7 +31,6 @@ const char *yaffs_ramem2k_c_version = "$Id: yaffs_ramem2k.c,v 1.8 2010-02-18 01:
 
 #include "yaffs_nandemul2k.h"
 #include "yaffs_guts.h"
-#include "devextras.h"
 #include "yaffs_packedtags2.h"
 
 
@@ -136,7 +135,7 @@ static int  CheckInit(void)
 	ned.nBlocks = nBlocks = nandemul2k_CalcNBlocks();
 
 	
-	ned.block = YMALLOC(sizeof(nandemul_Block*) * nBlocks );
+	ned.block = malloc(sizeof(nandemul_Block*) * nBlocks );
 	
 	if(!ned.block) return YAFFS_FAIL;
 	
@@ -149,7 +148,7 @@ static int  CheckInit(void)
 		
 		nandemul_Block *blk;
 		
-		if(!(blk = ned.block[i] = YMALLOC(sizeof(nandemul_Block))))
+		if(!(blk = ned.block[i] = malloc(sizeof(nandemul_Block))))
 		{
 		 fail = 1;
 		}  
@@ -157,7 +156,7 @@ static int  CheckInit(void)
 		{
 			for(j = 0; j < PAGES_PER_BLOCK; j++)
 			{
-				if((blk->page[j] = YMALLOC(sizeof(nandemul_Page))) == 0)
+				if((blk->page[j] = malloc(sizeof(nandemul_Page))) == 0)
 				{
 					fail = 1;
 				}
@@ -174,9 +173,9 @@ static int  CheckInit(void)
 		
 		for(i = 0; i < nAllocated; i++)
 		{
-			YFREE(ned.block[i]);
+			kfree(ned.block[i]);
 		}
-		YFREE(ned.block);
+		kfree(ned.block);
 		
 		T(YAFFS_TRACE_ALWAYS,("Allocation failed, could only allocate %dMB of %dMB requested.\n",
 		   nAllocated/64,sizeInMB));
@@ -220,7 +219,7 @@ int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_dev *dev,int nand_chunk,con
 	{
 		x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
 		
-		yaffs_pack_tags2((yaffs_packed_tags2 *)x,tags, !dev->param.no_tags_ecc);
+		yaffs_pack_tags2((struct yaffs_packed_tags2 *)x,tags, !dev->param.no_tags_ecc);
 			
 	}
 	
@@ -256,7 +255,7 @@ int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u
 	{
 		x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
 		
-		yaffs_unpack_tags2(tags,(yaffs_packed_tags2 *)x, !dev->param.no_tags_ecc);
+		yaffs_unpack_tags2(tags,(struct yaffs_packed_tags2 *)x, !dev->param.no_tags_ecc);
 	}
 
 	return YAFFS_OK;
@@ -320,7 +319,7 @@ int nandemul2k_MarkNANDBlockBad(struct yaffs_dev *dev, int block_no)
 	
 	x = &ned.block[block_no]->page[0]->data[PAGE_DATA_SIZE];
 	
-	memset(x,0,sizeof(yaffs_packed_tags2));
+	memset(x,0,sizeof(struct yaffs_packed_tags2));
 	
 	
 	return YAFFS_OK;