X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2Fyramsim.c;h=0a50fcf3ffd151b74d4f358f4ec7bcbbb6f3b6d6;hp=caa1aac809ba05e1ca4534f9c656088392a1c63e;hb=7396445d7d0d13469b9505791114b9dc6b76ffe4;hpb=497c3cfe39bd95fe6e5a4e9a5938fddf97bbed11

diff --git a/direct/basic-test/yramsim.c b/direct/basic-test/yramsim.c
index caa1aac..0a50fcf 100644
--- a/direct/basic-test/yramsim.c
+++ b/direct/basic-test/yramsim.c
@@ -26,9 +26,9 @@ typedef struct {
 
 SimData *simDevs[N_RAM_SIM_DEVS];
 
-static SimData *DevToSim(yaffs_Device *dev)
+static SimData *DevToSim(yaffs_dev_t *dev)
 {
-	ynandif_Geometry *geom = (ynandif_Geometry *)(dev->driverContext);
+	ynandif_Geometry *geom = (ynandif_Geometry *)(dev->driver_context);
 	SimData * sim = (SimData*)(geom->privateData);
 	return sim;
 }
@@ -39,7 +39,7 @@ static void CheckInitialised(void)
 
 }
 
-static int yramsim_EraseBlockInternal(SimData *sim, unsigned blockId,int force)
+static int yramsim_erase_internal(SimData *sim, unsigned blockId,int force)
 {
 	if(blockId < 0 || blockId >= sim->nBlocks){
 		return 0;
@@ -62,7 +62,7 @@ static int yramsim_EraseBlockInternal(SimData *sim, unsigned blockId,int force)
 
 
 
-static int yramsim_Initialise(yaffs_Device *dev)
+static int yramsim_initialise(yaffs_dev_t *dev)
 {
 	SimData *sim = DevToSim(dev);
 	Block **blockList = sim->blockList;
@@ -70,12 +70,12 @@ static int yramsim_Initialise(yaffs_Device *dev)
 }
 
 
-static int yramsim_Deinitialise(yaffs_Device *dev)
+static int yramsim_deinitialise(yaffs_dev_t *dev)
 {
 	return 1;
 }
 
-static int yramsim_ReadChunk (yaffs_Device *dev, unsigned pageId,
+static int yramsim_rd_chunk (yaffs_dev_t *dev, unsigned pageId,
 					  unsigned char *data, unsigned dataLength,
 					  unsigned char *spare, unsigned spareLength,
 					  int *eccStatus)
@@ -110,7 +110,7 @@ static int yramsim_ReadChunk (yaffs_Device *dev, unsigned pageId,
 	return 1;
 }
 
-static int yramsim_WriteChunk (yaffs_Device *dev,unsigned pageId,
+static int yramsim_wr_chunk (yaffs_dev_t *dev,unsigned pageId,
 					   const unsigned char *data, unsigned dataLength,
 					   const unsigned char *spare, unsigned spareLength)
 {
@@ -142,15 +142,15 @@ static int yramsim_WriteChunk (yaffs_Device *dev,unsigned pageId,
 }
 
 
-static int yramsim_EraseBlock(yaffs_Device *dev,unsigned blockId)
+static int yramsim_erase(yaffs_dev_t *dev,unsigned blockId)
 {
 	SimData *sim = DevToSim(dev);
 
 	CheckInitialised();
-	return yramsim_EraseBlockInternal(sim,blockId,0);
+	return yramsim_erase_internal(sim,blockId,0);
 }
 
-static int yramsim_CheckBlockOk(yaffs_Device *dev,unsigned blockId)
+static int yramsim_check_block_ok(yaffs_dev_t *dev,unsigned blockId)
 {
 	SimData *sim = DevToSim(dev);
 	Block **blockList = sim->blockList;
@@ -161,7 +161,7 @@ static int yramsim_CheckBlockOk(yaffs_Device *dev,unsigned blockId)
 	return blockList[blockId]->blockOk ? 1 : 0;
 }
 
-static int yramsim_MarkBlockBad(yaffs_Device *dev,unsigned blockId)
+static int yramsim_mark_block_bad(yaffs_dev_t *dev,unsigned blockId)
 {
 	SimData *sim = DevToSim(dev);
 	Block **blockList = sim->blockList;
@@ -175,7 +175,7 @@ static int yramsim_MarkBlockBad(yaffs_Device *dev,unsigned blockId)
 }
 
 
-static SimData *yramsim_AllocSimData(__u32 devId, __u32 nBlocks)
+static SimData *yramsim_alloc_sim_data(__u32 devId, __u32 nBlocks)
 {
 	int ok = 1;
 
@@ -214,7 +214,7 @@ static SimData *yramsim_AllocSimData(__u32 devId, __u32 nBlocks)
 		b=  malloc(sizeof(Block));
 		if(b){
 			blockList[i] = b;
-			yramsim_EraseBlockInternal(sim,i,1);
+			yramsim_erase_internal(sim,i,1);
 		}
 		else
 			ok = 0;
@@ -236,14 +236,14 @@ static SimData *yramsim_AllocSimData(__u32 devId, __u32 nBlocks)
 }
 
 
-struct yaffs_DeviceStruct *yramsim_CreateRamSim(const YCHAR *name,
+struct yaffs_dev_s *yramsim_CreateRamSim(const YCHAR *name,
 				__u32 devId, __u32 nBlocks,
-				__u32 startBlock, __u32 endBlock)
+				__u32 start_block, __u32 end_block)
 {
 	SimData *sim;
 	ynandif_Geometry *g;
 
-	sim = yramsim_AllocSimData(devId, nBlocks);
+	sim = yramsim_alloc_sim_data(devId, nBlocks);
 
 	g = YMALLOC(sizeof(ynandif_Geometry));
 
@@ -253,28 +253,28 @@ struct yaffs_DeviceStruct *yramsim_CreateRamSim(const YCHAR *name,
 		return NULL;
 	}
 
-	if(startBlock >= sim->nBlocks)
-		startBlock = 0;
-	if(endBlock == 0 || endBlock >= sim->nBlocks)
-		endBlock = sim->nBlocks - 1;
+	if(start_block >= sim->nBlocks)
+		start_block = 0;
+	if(end_block == 0 || end_block >= sim->nBlocks)
+		end_block = sim->nBlocks - 1;
 
 	memset(g,0,sizeof(ynandif_Geometry));
-	g->startBlock = startBlock;
-	g->endBlock = endBlock;
+	g->start_block = start_block;
+	g->end_block = end_block;
 	g->dataSize = DATA_SIZE;
 	g->spareSize= SPARE_SIZE;
 	g->pagesPerBlock = PAGES_PER_BLOCK;
 	g->hasECC = 1;
-	g->inbandTags = 0;
+	g->inband_tags = 0;
 	g->useYaffs2 = 1;
-	g->initialise = yramsim_Initialise;
-	g->deinitialise = yramsim_Deinitialise;
-	g->readChunk = yramsim_ReadChunk,
-	g->writeChunk = yramsim_WriteChunk,
-	g->eraseBlock = yramsim_EraseBlock,
-	g->checkBlockOk = yramsim_CheckBlockOk,
-	g->markBlockBad = yramsim_MarkBlockBad,
+	g->initialise = yramsim_initialise;
+	g->deinitialise = yramsim_deinitialise;
+	g->readChunk = yramsim_rd_chunk,
+	g->writeChunk = yramsim_wr_chunk,
+	g->eraseBlock = yramsim_erase,
+	g->checkBlockOk = yramsim_check_block_ok,
+	g->markBlockBad = yramsim_mark_block_bad,
 	g->privateData = (void *)sim;
 
-	return yaffs_AddDeviceFromGeometry(name,g);
+	return yaffs_add_dev_from_geometry(name,g);
 }