X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2Fyaffs_ramem2k.c;h=7f88b7c94a5ec018506a4812352a0dedfcffab86;hp=f0b7c71e1ce916b40680548b8fb79be58923b199;hb=5409719091c79983abc45bcc3070bce6786c8278;hpb=e33554a67753729f6b74677473cf0ec3b8d35a7e

diff --git a/direct/basic-test/yaffs_ramem2k.c b/direct/basic-test/yaffs_ramem2k.c
index f0b7c71..7f88b7c 100644
--- a/direct/basic-test/yaffs_ramem2k.c
+++ b/direct/basic-test/yaffs_ramem2k.c
@@ -31,8 +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 "yaffsinterface.h"
-#include "devextras.h"
 #include "yaffs_packedtags2.h"
 
 
@@ -55,7 +53,7 @@ const char *yaffs_ramem2k_c_version = "$Id: yaffs_ramem2k.c,v 1.8 2010-02-18 01:
 
 typedef struct 
 {
-	__u8 data[PAGE_TOTAL_SIZE]; // Data + spare
+	u8 data[PAGE_TOTAL_SIZE]; // Data + spare
 	int empty;      // is this empty?
 } nandemul_Page;
 
@@ -191,17 +189,17 @@ static int  CheckInit(void)
 	return 1;
 }
 
-int nandemul2k_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_ExtendedTags *tags)
+int nandemul2k_WriteChunkWithTagsToNAND(struct yaffs_dev *dev,int nand_chunk,const u8 *data, const struct yaffs_ext_tags *tags)
 {
 	int blk;
 	int pg;
 	int i;
 	
-	__u8 *x;
+	u8 *x;
 
 	
-	blk = chunkInNAND/PAGES_PER_BLOCK;
-	pg = chunkInNAND%PAGES_PER_BLOCK;
+	blk = nand_chunk/PAGES_PER_BLOCK;
+	pg = nand_chunk%PAGES_PER_BLOCK;
 	
 	
 	if(data)
@@ -221,7 +219,7 @@ int nandemul2k_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const
 	{
 		x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
 		
-		yaffs_PackTags2((yaffs_PackedTags2 *)x,tags, !dev->param.noTagsECC);
+		yaffs_pack_tags2((struct yaffs_packed_tags2 *)x,tags, !dev->param.no_tags_ecc);
 			
 	}
 	
@@ -234,17 +232,17 @@ int nandemul2k_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const
 }
 
 
-int nandemul2k_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags)
+int nandemul2k_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *data, struct yaffs_ext_tags *tags)
 {
 	int blk;
 	int pg;
 	
-	__u8 *x;
+	u8 *x;
 
 	
 	
-	blk = chunkInNAND/PAGES_PER_BLOCK;
-	pg = chunkInNAND%PAGES_PER_BLOCK;
+	blk = nand_chunk/PAGES_PER_BLOCK;
+	pg = nand_chunk%PAGES_PER_BLOCK;
 	
 	
 	if(data)
@@ -257,14 +255,14 @@ int nandemul2k_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8
 	{
 		x = &ned.block[blk]->page[pg]->data[PAGE_DATA_SIZE];
 		
-		yaffs_unpack_tags2(tags,(yaffs_PackedTags2 *)x, !dev->param.noTagsECC);
+		yaffs_unpack_tags2(tags,(struct yaffs_packed_tags2 *)x, !dev->param.no_tags_ecc);
 	}
 
 	return YAFFS_OK;
 }
 
 
-static int nandemul2k_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
+static int nandemul2k_CheckChunkErased(struct yaffs_dev *dev,int nand_chunk)
 {
 	int blk;
 	int pg;
@@ -272,8 +270,8 @@ static int nandemul2k_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
 
 	
 	
-	blk = chunkInNAND/PAGES_PER_BLOCK;
-	pg = chunkInNAND%PAGES_PER_BLOCK;
+	blk = nand_chunk/PAGES_PER_BLOCK;
+	pg = nand_chunk%PAGES_PER_BLOCK;
 	
 	
 	for(i = 0; i < PAGE_TOTAL_SIZE; i++)
@@ -288,7 +286,7 @@ static int nandemul2k_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
 
 }
 
-int nandemul2k_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
+int nandemul2k_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber)
 {
 	
 	
@@ -308,48 +306,48 @@ int nandemul2k_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
 	return YAFFS_OK;
 }
 
-int nandemul2k_InitialiseNAND(yaffs_Device *dev)
+int nandemul2k_InitialiseNAND(struct yaffs_dev *dev)
 {
 	CheckInit();
 	return YAFFS_OK;
 }
  
-int nandemul2k_MarkNANDBlockBad(struct yaffs_DeviceStruct *dev, int blockNo)
+int nandemul2k_MarkNANDBlockBad(struct yaffs_dev *dev, int block_no)
 {
 	
-	__u8 *x;
+	u8 *x;
 	
-	x = &ned.block[blockNo]->page[0]->data[PAGE_DATA_SIZE];
+	x = &ned.block[block_no]->page[0]->data[PAGE_DATA_SIZE];
 	
-	memset(x,0,sizeof(yaffs_PackedTags2));
+	memset(x,0,sizeof(struct yaffs_packed_tags2));
 	
 	
 	return YAFFS_OK;
 	
 }
 
-int nandemul2k_QueryNANDBlock(struct yaffs_DeviceStruct *dev, int blockNo, yaffs_BlockState *state, __u32  *sequenceNumber)
+int nandemul2k_QueryNANDBlock(struct yaffs_dev *dev, int block_no, enum yaffs_block_state *state, u32  *seq_number)
 {
-	yaffs_ExtendedTags tags;
+	struct yaffs_ext_tags tags;
 	int chunkNo;
 
-	*sequenceNumber = 0;
+	*seq_number = 0;
 	
-	chunkNo = blockNo * dev->param.nChunksPerBlock;
+	chunkNo = block_no * dev->param.chunks_per_block;
 	
 	nandemul2k_ReadChunkWithTagsFromNAND(dev,chunkNo,NULL,&tags);
-	if(tags.blockBad)
+	if(tags.block_bad)
 	{
 		*state = YAFFS_BLOCK_STATE_DEAD;
 	}
-	else if(!tags.chunkUsed)
+	else if(!tags.chunk_used)
 	{
 		*state = YAFFS_BLOCK_STATE_EMPTY;
 	}
-	else if(tags.chunkUsed)
+	else if(tags.chunk_used)
 	{
 		*state = YAFFS_BLOCK_STATE_NEEDS_SCANNING;
-		*sequenceNumber = tags.sequenceNumber;
+		*seq_number = tags.seq_number;
 	}
 	return YAFFS_OK;
 }