yaffs: Change __uxx types to uxx

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

diff --git a/direct/basic-test/yaffs_ramdisk.c b/direct/basic-test/yaffs_ramdisk.c
index 9ca963be12a8f252d3670bf8de388d2507f9bbd4..a65dcc82523f6778ca679bcde0a0efe51754b93e 100644 (file)
--- a/direct/basic-test/yaffs_ramdisk.c
+++ b/direct/basic-test/yaffs_ramdisk.c
@@ -15,7 +15,7 @@
  * yaffs_ramdisk.c: yaffs ram disk component
  * This provides a ram disk under yaffs.
  * NB this is not intended for NAND emulation.
- * Use this with dev->useNANDECC enabled, then ECC overheads are not required.
+ * Use this with dev->use_nand_ecc enabled, then ECC overheads are not required.
  */
 
 const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.6 2010-01-11 04:06:47 charles Exp $";
@@ -42,7 +42,7 @@ const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.6 2010-01-11 04:
 
 typedef struct 
 {
-       __u8 data[528]; // Data + spare
+       u8 data[528]; // Data + spare
 } yramdisk_page;
 
 typedef struct
@@ -61,7 +61,7 @@ typedef struct
 
 static yramdisk_device ramdisk;
 
-static int  CheckInit(yaffs_Device *dev)
+static int  CheckInit(yaffs_dev_t *dev)
 {
        static int initialised = 0;
        
@@ -119,7 +119,7 @@ static int  CheckInit(yaffs_Device *dev)
        return 1;
 }
 
-int yramdisk_wr_chunk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_ExtendedTags *tags)
+int yramdisk_wr_chunk(yaffs_dev_t *dev,int nand_chunk,const u8 *data, const yaffs_ext_tags *tags)
 {
        int blk;
        int pg;
@@ -127,8 +127,8 @@ int yramdisk_wr_chunk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const
 
        CheckInit(dev);
        
-       blk = chunkInNAND/32;
-       pg = chunkInNAND%32;
+       blk = nand_chunk/32;
+       pg = nand_chunk%32;
        
        
        if(data)
@@ -139,9 +139,9 @@ int yramdisk_wr_chunk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const
        
        if(tags)
        {
-               yaffs_PackedTags1 pt;
+               yaffs_packed_tags1 pt;
                
-               yaffs_PackTags1(&pt,tags);
+               yaffs_pack_tags1(&pt,tags);
                memcpy(&ramdisk.block[blk]->page[pg].data[512],&pt,sizeof(pt));
        }
 
@@ -150,7 +150,7 @@ int yramdisk_wr_chunk(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const
 }
 
 
-int yramdisk_rd_chunk(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags)
+int yramdisk_rd_chunk(yaffs_dev_t *dev,int nand_chunk, u8 *data, yaffs_ext_tags *tags)
 {
        int blk;
        int pg;
@@ -158,8 +158,8 @@ int yramdisk_rd_chunk(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_Exten
        
        CheckInit(dev);
        
-       blk = chunkInNAND/32;
-       pg = chunkInNAND%32;
+       blk = nand_chunk/32;
+       pg = nand_chunk%32;
        
        
        if(data)
@@ -170,7 +170,7 @@ int yramdisk_rd_chunk(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_Exten
        
        if(tags)
        {
-               yaffs_PackedTags1 pt;
+               yaffs_packed_tags1 pt;
                
                memcpy(&pt,&ramdisk.block[blk]->page[pg].data[512],sizeof(pt));
                yaffs_unpack_tags1(tags,&pt);
@@ -181,7 +181,7 @@ int yramdisk_rd_chunk(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_Exten
 }
 
 
-int yramdisk_check_chunk_erased(yaffs_Device *dev,int chunkInNAND)
+int yramdisk_check_chunk_erased(yaffs_dev_t *dev,int nand_chunk)
 {
        int blk;
        int pg;
@@ -190,8 +190,8 @@ int yramdisk_check_chunk_erased(yaffs_Device *dev,int chunkInNAND)
        
        CheckInit(dev);
        
-       blk = chunkInNAND/32;
-       pg = chunkInNAND%32;
+       blk = nand_chunk/32;
+       pg = nand_chunk%32;
        
        
        for(i = 0; i < 528; i++)
@@ -206,7 +206,7 @@ int yramdisk_check_chunk_erased(yaffs_Device *dev,int chunkInNAND)
 
 }
 
-int yramdisk_erase(yaffs_Device *dev, int blockNumber)
+int yramdisk_erase(yaffs_dev_t *dev, int blockNumber)
 {
        
        CheckInit(dev);
@@ -224,9 +224,9 @@ int yramdisk_erase(yaffs_Device *dev, int blockNumber)
        
 }
 
-int yramdisk_initialise(yaffs_Device *dev)
+int yramdisk_initialise(yaffs_dev_t *dev)
 {
-       //dev->useNANDECC = 1; // force on useNANDECC which gets faked. 
+       //dev->use_nand_ecc = 1; // force on use_nand_ecc which gets faked. 
                                                 // This saves us doing ECC checks.
        
        return YAFFS_OK;