yaffs u-boot: Fix erase for inband tags.

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

diff --git a/direct/basic-test/yramsim.c b/direct/basic-test/yramsim.c
index 05437ff9c04bf11f7895bc08b3f250ef5f63f551..10c9c072740eb9eb83135f853858dad1136e65bc 100644 (file)
--- a/direct/basic-test/yramsim.c
+++ b/direct/basic-test/yramsim.c
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2010 Aleph One Ltd.
+ * Copyright (C) 2002-2011 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -41,9 +41,10 @@ typedef struct {
 
 SimData *simDevs[N_RAM_SIM_DEVS];
 
-static SimData *DevToSim(yaffs_dev_t *dev)
+static SimData *DevToSim(struct yaffs_dev *dev)
 {
-       ynandif_Geometry *geom = (ynandif_Geometry *)(dev->driver_context);
+       struct ynandif_Geometry *geom = 
+               (struct ynandif_Geometry *)(dev->driver_context);
        SimData * sim = (SimData*)(geom->privateData);
        return sim;
 }
@@ -77,7 +78,7 @@ static int yramsim_erase_internal(SimData *sim, unsigned blockId,int force)
 
 
 
-static int yramsim_initialise(yaffs_dev_t *dev)
+static int yramsim_initialise(struct yaffs_dev *dev)
 {
        SimData *sim = DevToSim(dev);
        Block **blockList = sim->blockList;
@@ -85,12 +86,12 @@ static int yramsim_initialise(yaffs_dev_t *dev)
 }
 
 
-static int yramsim_deinitialise(yaffs_dev_t *dev)
+static int yramsim_deinitialise(struct yaffs_dev *dev)
 {
        return 1;
 }
 
-static int yramsim_rd_chunk (yaffs_dev_t *dev, unsigned pageId,
+static int yramsim_rd_chunk (struct yaffs_dev *dev, unsigned pageId,
                                          unsigned char *data, unsigned dataLength,
                                          unsigned char *spare, unsigned spareLength,
                                          int *eccStatus)
@@ -125,7 +126,7 @@ static int yramsim_rd_chunk (yaffs_dev_t *dev, unsigned pageId,
        return 1;
 }
 
-static int yramsim_wr_chunk (yaffs_dev_t *dev,unsigned pageId,
+static int yramsim_wr_chunk (struct yaffs_dev *dev,unsigned pageId,
                                           const unsigned char *data, unsigned dataLength,
                                           const unsigned char *spare, unsigned spareLength)
 {
@@ -157,7 +158,7 @@ static int yramsim_wr_chunk (yaffs_dev_t *dev,unsigned pageId,
 }
 
 
-static int yramsim_erase(yaffs_dev_t *dev,unsigned blockId)
+static int yramsim_erase(struct yaffs_dev *dev,unsigned blockId)
 {
        SimData *sim = DevToSim(dev);
 
@@ -165,7 +166,7 @@ static int yramsim_erase(yaffs_dev_t *dev,unsigned blockId)
        return yramsim_erase_internal(sim,blockId,0);
 }
 
-static int yramsim_check_block_ok(yaffs_dev_t *dev,unsigned blockId)
+static int yramsim_check_block_ok(struct yaffs_dev *dev,unsigned blockId)
 {
        SimData *sim = DevToSim(dev);
        Block **blockList = sim->blockList;
@@ -176,7 +177,7 @@ static int yramsim_check_block_ok(yaffs_dev_t *dev,unsigned blockId)
        return blockList[blockId]->blockOk ? 1 : 0;
 }
 
-static int yramsim_mark_block_bad(yaffs_dev_t *dev,unsigned blockId)
+static int yramsim_mark_block_bad(struct yaffs_dev *dev,unsigned blockId)
 {
        SimData *sim = DevToSim(dev);
        Block **blockList = sim->blockList;
@@ -251,20 +252,20 @@ static SimData *yramsim_alloc_sim_data(u32 devId, u32 nBlocks)
 }
 
 
-struct yaffs_dev_s *yramsim_CreateRamSim(const YCHAR *name,
+struct yaffs_dev *yramsim_CreateRamSim(const YCHAR *name,
                                u32 devId, u32 nBlocks,
                                u32 start_block, u32 end_block)
 {
        SimData *sim;
-       ynandif_Geometry *g;
+       struct ynandif_Geometry *g;
 
        sim = yramsim_alloc_sim_data(devId, nBlocks);
 
-       g = YMALLOC(sizeof(ynandif_Geometry));
+       g = malloc(sizeof(*g));
 
        if(!sim || !g){
                if(g)
-                       YFREE(g);
+                       free(g);
                return NULL;
        }
 
@@ -273,7 +274,7 @@ struct yaffs_dev_s *yramsim_CreateRamSim(const YCHAR *name,
        if(end_block == 0 || end_block >= sim->nBlocks)
                end_block = sim->nBlocks - 1;
 
-       memset(g,0,sizeof(ynandif_Geometry));
+       memset(g,0,sizeof(*g));
        g->start_block = start_block;
        g->end_block = end_block;
        g->dataSize = DATA_SIZE;