yaffs: More clean up

[yaffs2.git] / direct / basic-test / yaffs_fileem2k.c

diff --git a/direct/basic-test/yaffs_fileem2k.c b/direct/basic-test/yaffs_fileem2k.c
index ad76c0179254a7b83604a57e6f5cb575e34b2a8f..072e2f11699bd4135f5e30b646bb10f1bf520cea 100644 (file)
--- a/direct/basic-test/yaffs_fileem2k.c
+++ b/direct/basic-test/yaffs_fileem2k.c
@@ -40,7 +40,7 @@ const char *yaffs_flashif2_c_version = "$Id: yaffs_fileem2k.c,v 1.24 2010-02-18
 
 typedef struct 
 {
-       __u8 data[PAGE_SIZE]; // Data + spare
+       u8 data[PAGE_SIZE]; // Data + spare
 } yflash_Page;
 
 typedef struct
@@ -93,7 +93,7 @@ static void yflash2_MaybePowerFail(unsigned int nand_chunk, int failPoint)
 
 
 
-static __u8 localBuffer[PAGE_SIZE];
+static u8 localBuffer[PAGE_SIZE];
 
 static char *NToName(char *buf,int n)
 {
@@ -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,9 +187,9 @@ int yflash2_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const __u8
        
        if(dev->param.inband_tags){
                
-               yaffs_PackedTags2TagsPart * pt2tp;
-               pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->data_bytes_per_chunk];
-               yaffs_PackTags2TagsPart(pt2tp,tags);
+               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;
                h = filedisk.handle[(nand_chunk / (PAGES_PER_BLOCK * BLOCKS_PER_HANDLE))];
@@ -255,14 +255,14 @@ int yflash2_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const __u8
                        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_PackedTags2 pt;
-                               yaffs_PackTags2(&pt,tags, !dev->param.no_tags_ecc);
-                               __u8 * ptab = (__u8 *)&pt;
+                               struct yaffs_packed_tags2 pt;
+                               yaffs_pack_tags2(&pt,tags, !dev->param.no_tags_ecc);
+                               u8 * ptab = (u8 *)&pt;
 
                                nRead = read(h,localBuffer,sizeof(pt));
                                for(i = error = 0; REPORT_ERROR && i < sizeof(pt) && !error; i++){
@@ -333,14 +333,14 @@ int yflash2_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const __u8
                        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_PackedTags2 pt;
-                               yaffs_PackTags2(&pt,tags,!dev->param.no_tags_ecc);
-                               __u8 * ptab = (__u8 *)&pt;
+                               struct yaffs_packed_tags2 pt;
+                               yaffs_pack_tags2(&pt,tags,!dev->param.no_tags_ecc);
+                               u8 * ptab = (u8 *)&pt;
 
                                nRead = read(h,localBuffer,sizeof(pt));
                                for(i = error = 0; REPORT_ERROR && i < sizeof(pt) && !error; i++){
@@ -371,7 +371,7 @@ int yflash2_WriteChunkWithTagsToNAND(yaffs_dev_t *dev,int nand_chunk,const __u8
 
 }
 
-int yaffs_check_all_ff(const __u8 *ptr, int n)
+int yaffs_check_all_ff(const u8 *ptr, int n)
 {
        while(n)
        {
@@ -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 *dat
                }
 
                
-               yaffs_PackedTags2TagsPart * pt2tp;
-               pt2tp = (yaffs_PackedTags2TagsPart *)&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;
@@ -423,7 +423,7 @@ int yflash2_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, __u8 *dat
 
                nRead = read(h, data,dev->param.total_bytes_per_chunk);
 
-               yaffs_unpack_tags2tags_part(tags,pt2tp);
+               yaffs_unpack_tags2_tags_only(tags,pt2tp);
                
                if(nread != dev->param.total_bytes_per_chunk)
                        retval = YAFFS_FAIL;
@@ -458,10 +458,10 @@ int yflash2_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, __u8 *dat
 
                        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 *dat
                        }
                        else
                        {
-                               yaffs_PackedTags2 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 *dat
 }
 
 
-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_PackedTags2 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;
@@ -550,7 +550,7 @@ int yflash2_EraseBlockInNAND(yaffs_dev_t *dev, int blockNumber)
        else
        {
        
-               __u8 pg[PAGE_SIZE];
+               u8 pg[PAGE_SIZE];
                int syz = PAGE_SIZE;
                int pos;
                
@@ -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;