X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2Fyramsim.c;h=baa31b1e52588f74b8c9d64ccb5759fed342b517;hp=74d5f734ac3a2db21a8d7a4c4a1b2bb69e803567;hb=6648cbf52d6695755941ff8607fd7a0cda542e05;hpb=a34826e701dd381a293bb90b25a48d2bd58e8de8

diff --git a/direct/basic-test/yramsim.c b/direct/basic-test/yramsim.c
index 74d5f73..baa31b1 100644
--- 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,7 +41,7 @@ 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);
 	SimData * sim = (SimData*)(geom->privateData);
@@ -77,7 +77,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 +85,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 +125,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 +157,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 +165,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 +176,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;
@@ -190,14 +190,14 @@ static int yramsim_mark_block_bad(yaffs_dev_t *dev,unsigned blockId)
 }
 
 
-static SimData *yramsim_alloc_sim_data(__u32 devId, __u32 nBlocks)
+static SimData *yramsim_alloc_sim_data(u32 devId, u32 nBlocks)
 {
 	int ok = 1;
 
 	Block **blockList;
 	SimData *sim;
 	Block *b;
-	__u32 i;
+	u32 i;
 
 	if(devId >= N_RAM_SIM_DEVS)
 		return NULL;
@@ -251,20 +251,20 @@ static SimData *yramsim_alloc_sim_data(__u32 devId, __u32 nBlocks)
 }
 
 
-struct yaffs_dev_s *yramsim_CreateRamSim(const YCHAR *name,
-				__u32 devId, __u32 nBlocks,
-				__u32 start_block, __u32 end_block)
+struct yaffs_dev *yramsim_CreateRamSim(const YCHAR *name,
+				u32 devId, u32 nBlocks,
+				u32 start_block, u32 end_block)
 {
 	SimData *sim;
 	ynandif_Geometry *g;
 
 	sim = yramsim_alloc_sim_data(devId, nBlocks);
 
-	g = YMALLOC(sizeof(ynandif_Geometry));
+	g = malloc(sizeof(ynandif_Geometry));
 
 	if(!sim || !g){
 		if(g)
-			YFREE(g);
+			free(g);
 		return NULL;
 	}