yaffs Added some more tests to timothy_tests.

[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 0b47adfa131b761cd69bf40026726750c7eeb99f..5d389b973f5a57c9ef9f57d67552646b255b1e5d 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 $";
@@ -26,7 +26,6 @@ const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.6 2010-01-11 04:
 
 #include "yaffs_ramdisk.h"
 #include "yaffs_guts.h"
-#include "devextras.h"
 #include "yaffs_packedtags1.h"
 
 
@@ -42,26 +41,26 @@ const char *yaffs_ramdisk_c_version = "$Id: yaffs_ramdisk.c,v 1.6 2010-01-11 04:
 
 typedef struct 
 {
-       __u8 data[528]; // Data + spare
-} yramdisk_Page;
+       u8 data[528]; // Data + spare
+} yramdisk_page;
 
 typedef struct
 {
-       yramdisk_Page page[32]; // The pages in the block
+       yramdisk_page page[32]; // The pages in the block
        
-} yramdisk_Block;
+} yramdisk_block;
 
 
 
 typedef struct
 {
-       yramdisk_Block **block;
+       yramdisk_block **block;
        int nBlocks;
-} yramdisk_Device;
+} yramdisk_device;
 
-static yramdisk_Device ramdisk;
+static yramdisk_device ramdisk;
 
-static int  CheckInit(yaffs_Device *dev)
+static int  CheckInit(struct yaffs_dev *dev)
 {
        static int initialised = 0;
        
@@ -80,7 +79,7 @@ static int  CheckInit(yaffs_Device *dev)
        
        ramdisk.nBlocks = (SIZE_IN_MB * 1024 * 1024)/(16 * 1024);
        
-       ramdisk.block = YMALLOC(sizeof(yramdisk_Block *) * ramdisk.nBlocks);
+       ramdisk.block = malloc(sizeof(yramdisk_block *) * ramdisk.nBlocks);
        
        if(!ramdisk.block) return 0;
        
@@ -91,13 +90,13 @@ static int  CheckInit(yaffs_Device *dev)
        
        for(i=0; i <ramdisk.nBlocks && !fail; i++)
        {
-               if((ramdisk.block[i] = YMALLOC(sizeof(yramdisk_Block))) == 0)
+               if((ramdisk.block[i] = malloc(sizeof(yramdisk_block))) == 0)
                {
                        fail = 1;
                }
                else
                {
-                       yramdisk_EraseBlockInNAND(dev,i);
+                       yramdisk_erase(dev,i);
                        nAllocated++;
                }
        }
@@ -106,12 +105,13 @@ static int  CheckInit(yaffs_Device *dev)
        {
                for(i = 0; i < nAllocated; i++)
                {
-                       YFREE(ramdisk.block[i]);
+                       kfree(ramdisk.block[i]);
                }
-               YFREE(ramdisk.block);
+               kfree(ramdisk.block);
                
-               T(YAFFS_TRACE_ALWAYS,("Allocation failed, could only allocate %dMB of %dMB requested.\n",
-                  nAllocated/64,ramdisk.nBlocks * 528));
+               yaffs_trace(YAFFS_TRACE_ALWAYS,
+                       "Allocation failed, could only allocate %dMB of %dMB requested.\n",
+                       nAllocated/64,ramdisk.nBlocks * 528);
                return 0;
        }
        
@@ -119,7 +119,7 @@ static int  CheckInit(yaffs_Device *dev)
        return 1;
 }
 
-int yramdisk_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_ExtendedTags *tags)
+int yramdisk_wr_chunk(struct yaffs_dev *dev,int nand_chunk,const u8 *data, const struct yaffs_ext_tags *tags)
 {
        int blk;
        int pg;
@@ -127,8 +127,8 @@ int yramdisk_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,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_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __
        
        if(tags)
        {
-               yaffs_PackedTags1 pt;
+               struct 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_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __
 }
 
 
-int yramdisk_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags)
+int yramdisk_rd_chunk(struct yaffs_dev *dev,int nand_chunk, u8 *data, struct yaffs_ext_tags *tags)
 {
        int blk;
        int pg;
@@ -158,8 +158,8 @@ int yramdisk_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *
        
        CheckInit(dev);
        
-       blk = chunkInNAND/32;
-       pg = chunkInNAND%32;
+       blk = nand_chunk/32;
+       pg = nand_chunk%32;
        
        
        if(data)
@@ -170,7 +170,7 @@ int yramdisk_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *
        
        if(tags)
        {
-               yaffs_PackedTags1 pt;
+               struct 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_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *
 }
 
 
-int yramdisk_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
+int yramdisk_check_chunk_erased(struct yaffs_dev *dev,int nand_chunk)
 {
        int blk;
        int pg;
@@ -190,8 +190,8 @@ int yramdisk_CheckChunkErased(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,30 +206,31 @@ int yramdisk_CheckChunkErased(yaffs_Device *dev,int chunkInNAND)
 
 }
 
-int yramdisk_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
+int yramdisk_erase(struct yaffs_dev *dev, int blockNumber)
 {
        
        CheckInit(dev);
        
        if(blockNumber < 0 || blockNumber >= ramdisk.nBlocks)
        {
-               T(YAFFS_TRACE_ALWAYS,("Attempt to erase non-existant block %d\n",blockNumber));
+               yaffs_trace(YAFFS_TRACE_ALWAYS,
+                       "Attempt to erase non-existant block %d\n",
+                       blockNumber);
                return YAFFS_FAIL;
        }
        else
        {
-               memset(ramdisk.block[blockNumber],0xFF,sizeof(yramdisk_Block));
+               memset(ramdisk.block[blockNumber],0xFF,sizeof(yramdisk_block));
                return YAFFS_OK;
        }
        
 }
 
-int yramdisk_InitialiseNAND(yaffs_Device *dev)
+int yramdisk_initialise(struct yaffs_dev *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;
 }
 
-