X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2Fyramsim.c;h=10c9c072740eb9eb83135f853858dad1136e65bc;hp=0a50fcf3ffd151b74d4f358f4ec7bcbbb6f3b6d6;hb=d634851c1f36e7995726602d3af784478ccb472e;hpb=41573908f821bcb40750e7c069ea8f5178f630e5

diff --git a/direct/basic-test/yramsim.c b/direct/basic-test/yramsim.c
index 0a50fcf..10c9c07 100644
--- a/direct/basic-test/yramsim.c
+++ b/direct/basic-test/yramsim.c
@@ -1,4 +1,19 @@
-// NAND Simulator for testing YAFFS
+/*
+ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
+ *
+ * Copyright (C) 2002-2011 Aleph One Ltd.
+ *   for Toby Churchill Ltd and Brightstar Engineering
+ *
+ * Created by Charles Manning <charles@aleph1.co.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ * NAND Simulator for testing YAFFS
+ */
 
 #include <string.h>
 
@@ -26,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;
 }
@@ -62,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;
@@ -70,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)
@@ -110,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)
 {
@@ -142,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);
 
@@ -150,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;
@@ -161,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;
@@ -175,14 +191,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;
@@ -236,20 +252,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;
+	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;
 	}
 
@@ -258,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;