X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=direct%2Fbasic-test%2Fyaffs_ramem2k.c;h=bbfae31d57c46c8c592a1ee52a1bc1c6117d66b5;hb=976dbeae825b18e6759f3903073a6784248cc244;hp=1a9765dbadd2261da36da54e5751e85196ad4b14;hpb=f330fefa27f2c87f7dff414fe6227261327663b7;p=yaffs2.git

diff --git a/direct/basic-test/yaffs_ramem2k.c b/direct/basic-test/yaffs_ramem2k.c
index 1a9765d..bbfae31 100644
--- a/direct/basic-test/yaffs_ramem2k.c
+++ b/direct/basic-test/yaffs_ramem2k.c
@@ -54,7 +54,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;
 
@@ -190,13 +190,13 @@ static int  CheckInit(void)
 	return 1;
 }
 
-int nandemul2k_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const __u8 *data, const yaffs_ext_tags *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 = nand_chunk/PAGES_PER_BLOCK;
@@ -233,12 +233,12 @@ int nandemul2k_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const __
 }
 
 
-int nandemul2k_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, __u8 *data, yaffs_ext_tags *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;
 
 	
 	
@@ -263,7 +263,7 @@ int nandemul2k_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, __u8 *
 }
 
 
-static int nandemul2k_CheckChunkErased(yaffs_dev_t *dev,int nand_chunk)
+static int nandemul2k_CheckChunkErased(struct yaffs_dev *dev,int nand_chunk)
 {
 	int blk;
 	int pg;
@@ -287,7 +287,7 @@ static int nandemul2k_CheckChunkErased(yaffs_dev_t *dev,int nand_chunk)
 
 }
 
-int nandemul2k_EraseBlockInNAND(yaffs_dev_t *dev, int blockNumber)
+int nandemul2k_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber)
 {
 	
 	
@@ -307,16 +307,16 @@ int nandemul2k_EraseBlockInNAND(yaffs_dev_t *dev, int blockNumber)
 	return YAFFS_OK;
 }
 
-int nandemul2k_InitialiseNAND(yaffs_dev_t *dev)
+int nandemul2k_InitialiseNAND(struct yaffs_dev *dev)
 {
 	CheckInit();
 	return YAFFS_OK;
 }
  
-int nandemul2k_MarkNANDBlockBad(struct yaffs_dev_s *dev, int block_no)
+int nandemul2k_MarkNANDBlockBad(struct yaffs_dev *dev, int block_no)
 {
 	
-	__u8 *x;
+	u8 *x;
 	
 	x = &ned.block[block_no]->page[0]->data[PAGE_DATA_SIZE];
 	
@@ -327,9 +327,9 @@ int nandemul2k_MarkNANDBlockBad(struct yaffs_dev_s *dev, int block_no)
 	
 }
 
-int nandemul2k_QueryNANDBlock(struct yaffs_dev_s *dev, int block_no, yaffs_block_state_t *state, __u32  *seq_number)
+int nandemul2k_QueryNANDBlock(struct yaffs_dev *dev, int block_no, yaffs_block_state_t *state, u32  *seq_number)
 {
-	yaffs_ext_tags tags;
+	struct yaffs_ext_tags tags;
 	int chunkNo;
 
 	*seq_number = 0;