X-Git-Url: https://yaffs.net/gitweb/?a=blobdiff_plain;f=direct%2Fbasic-test%2Fyaffs_fileem2k.c;h=072e2f11699bd4135f5e30b646bb10f1bf520cea;hb=757a553001be4016e9c5d8880648d3703f34b10e;hp=44a1e874a0eff879f9b443fcaf19d41e7e569b1f;hpb=cf6888f05f691aa1a357e7e94f9bf7b98174bbc3;p=yaffs2.git

diff --git a/direct/basic-test/yaffs_fileem2k.c b/direct/basic-test/yaffs_fileem2k.c
index 44a1e87..072e2f1 100644
--- a/direct/basic-test/yaffs_fileem2k.c
+++ b/direct/basic-test/yaffs_fileem2k.c
@@ -171,7 +171,7 @@ int yflash2_GetNumberOfBlocks(void)
 	return filedisk.nBlocks;
 }
 
-int yflash2_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const u8 *data, const yaffs_ext_tags *tags)
+int yflash2_WriteChunkWithTagsToNAND(struct yaffs_dev *dev,int nand_chunk,const u8 *data, const struct yaffs_ext_tags *tags)
 {
 	int written;
 	int pos;
@@ -187,8 +187,8 @@ int yflash2_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const u8 *d
 	
 	if(dev->param.inband_tags){
 		
-		yaffs_packed_tags2_tags_only * pt2tp;
-		pt2tp = (yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
+		struct yaffs_packed_tags2_tags_only * pt2tp;
+		pt2tp = (struct yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
 		yaffs_pack_tags2_tags_only(pt2tp,tags);
 		
 		pos = (nand_chunk % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE;
@@ -255,12 +255,12 @@ int yflash2_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const u8 *d
 			if( 0 && dev->param.is_yaffs2)
 			{
 			
-				written = write(h,tags,sizeof(yaffs_ext_tags));
-				if(written != sizeof(yaffs_ext_tags)) return YAFFS_FAIL;
+				written = write(h,tags,sizeof(struct yaffs_ext_tags));
+				if(written != sizeof(struct yaffs_ext_tags)) return YAFFS_FAIL;
 			}
 			else
 			{
-				yaffs_packed_tags2 pt;
+				struct yaffs_packed_tags2 pt;
 				yaffs_pack_tags2(&pt,tags, !dev->param.no_tags_ecc);
 				u8 * ptab = (u8 *)&pt;
 
@@ -333,12 +333,12 @@ int yflash2_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const u8 *d
 			if( 0 && dev->param.is_yaffs2)
 			{
 			
-				written = write(h,tags,sizeof(yaffs_ext_tags));
-				if(written != sizeof(yaffs_ext_tags)) return YAFFS_FAIL;
+				written = write(h,tags,sizeof(struct yaffs_ext_tags));
+				if(written != sizeof(struct yaffs_ext_tags)) return YAFFS_FAIL;
 			}
 			else
 			{
-				yaffs_packed_tags2 pt;
+				struct yaffs_packed_tags2 pt;
 				yaffs_pack_tags2(&pt,tags,!dev->param.no_tags_ecc);
 				u8 * ptab = (u8 *)&pt;
 
@@ -388,7 +388,7 @@ static int fail320 = 1;
 
 static int failRead10 = 2;
 
-int yflash2_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, u8 *data, yaffs_ext_tags *tags)
+int yflash2_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *data, struct yaffs_ext_tags *tags)
 {
 	int nread;
 	int pos;
@@ -412,8 +412,8 @@ int yflash2_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, u8 *data,
 		}
 
 		
-		yaffs_packed_tags2_tags_only * pt2tp;
-		pt2tp = (yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
+		struct yaffs_packed_tags2_tags_only * pt2tp;
+		pt2tp = (struct yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];
 
 		
 		pos = (nand_chunk % (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE)) * PAGE_SIZE;
@@ -458,10 +458,10 @@ int yflash2_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, u8 *data,
 
 			if(0 && dev->param.is_yaffs2)
 			{
-				nread= read(h,tags,sizeof(yaffs_ext_tags));
-				if(nread != sizeof(yaffs_ext_tags))
+				nread= read(h,tags,sizeof(struct yaffs_ext_tags));
+				if(nread != sizeof(struct yaffs_ext_tags))
 					 retval =  YAFFS_FAIL;
-				if(yaffs_check_all_ff((u8 *)tags,sizeof(yaffs_ext_tags)))
+				if(yaffs_check_all_ff((u8 *)tags,sizeof(struct yaffs_ext_tags)))
 				{
 					yaffs_init_tags(tags);
 				}
@@ -472,7 +472,7 @@ int yflash2_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, u8 *data,
 			}
 			else
 			{
-				yaffs_packed_tags2 pt;
+				struct yaffs_packed_tags2 pt;
 				nread= read(h,&pt,sizeof(pt));
 				yaffs_unpack_tags2(tags,&pt, !dev->param.no_tags_ecc);
 #ifdef SIMULATE_FAILURES
@@ -508,12 +508,12 @@ int yflash2_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, u8 *data,
 }
 
 
-int yflash2_MarkNANDBlockBad(struct yaffs_dev_s *dev, int block_no)
+int yflash2_MarkNANDBlockBad(struct yaffs_dev *dev, int block_no)
 {
 	int written;
 	int h;
 	
-	yaffs_packed_tags2 pt;
+	struct yaffs_packed_tags2 pt;
 
 	CheckInit();
 	
@@ -529,7 +529,7 @@ int yflash2_MarkNANDBlockBad(struct yaffs_dev_s *dev, int block_no)
 	
 }
 
-int yflash2_EraseBlockInNAND(yaffs_dev_t *dev, int blockNumber)
+int yflash2_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber)
 {
 
 	int i;
@@ -570,7 +570,7 @@ int yflash2_EraseBlockInNAND(yaffs_dev_t *dev, int blockNumber)
 	
 }
 
-int yflash2_InitialiseNAND(yaffs_dev_t *dev)
+int yflash2_InitialiseNAND(struct yaffs_dev *dev)
 {
 	CheckInit();
 	
@@ -580,9 +580,9 @@ int yflash2_InitialiseNAND(yaffs_dev_t *dev)
 
 
 
-int yflash2_QueryNANDBlock(struct yaffs_dev_s *dev, int block_no, yaffs_block_state_t *state, u32 *seq_number)
+int yflash2_QueryNANDBlock(struct yaffs_dev *dev, int block_no, enum yaffs_block_state *state, u32 *seq_number)
 {
-	yaffs_ext_tags tags;
+	struct yaffs_ext_tags tags;
 	int chunkNo;
 
 	*seq_number = 0;