X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fbasic-test%2Fyaffs_fileem.c;h=66ba93a778466d794b3dbc1876a18edecad946c8;hp=90c8f9e3f65dfd1a751bddaaefbaa328fa867ae4;hb=137f935f6d622bffdef2fece0c5194e85f5174e9;hpb=4a700fe570d217c2c5df87070db7c2652bc0eaaf

diff --git a/direct/basic-test/yaffs_fileem.c b/direct/basic-test/yaffs_fileem.c
index 90c8f9e..66ba93a 100644
--- a/direct/basic-test/yaffs_fileem.c
+++ b/direct/basic-test/yaffs_fileem.c
@@ -25,8 +25,6 @@ const char *yaffs_flashif_c_version = "$Id: yaffs_fileem.c,v 1.7 2010-02-18 01:1
 #include "yaffs_flashif.h"
 #include "yaffs_guts.h"
 
-#include "devextras.h"
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -43,7 +41,7 @@ const char *yaffs_flashif_c_version = "$Id: yaffs_fileem.c,v 1.7 2010-02-18 01:1
 
 typedef struct 
 {
-	__u8 data[528]; // Data + spare
+	u8 data[528]; // Data + spare
 } yflash_Page;
 
 typedef struct
@@ -62,7 +60,7 @@ typedef struct
 
 static yflash_Device filedisk;
 
-static int  CheckInit(yaffs_Device *dev)
+static int  CheckInit(struct yaffs_dev *dev)
 {
 	static int initialised = 0;
 	
@@ -118,7 +116,7 @@ static int  CheckInit(yaffs_Device *dev)
 	return 1;
 }
 
-int yflash_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_Spare *spare)
+int yflash_WriteChunkToNAND(struct yaffs_dev *dev,int nand_chunk,const u8 *data, const struct yaffs_spare *spare)
 {
 	int written;
 
@@ -128,7 +126,7 @@ int yflash_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data,
 	
 	if(data)
 	{
-		lseek(filedisk.handle,chunkInNAND * 528,SEEK_SET);
+		lseek(filedisk.handle,nand_chunk * 528,SEEK_SET);
 		written = write(filedisk.handle,data,512);
 		
 		if(written != 512) return YAFFS_FAIL;
@@ -136,7 +134,7 @@ int yflash_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data,
 	
 	if(spare)
 	{
-		lseek(filedisk.handle,chunkInNAND * 528 + 512,SEEK_SET);
+		lseek(filedisk.handle,nand_chunk * 528 + 512,SEEK_SET);
 		written = write(filedisk.handle,spare,16);
 		
 		if(written != 16) return YAFFS_FAIL;
@@ -148,7 +146,7 @@ int yflash_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data,
 }
 
 
-int yflash_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_Spare *spare)
+int yflash_ReadChunkFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *data, struct yaffs_spare *spare)
 {
 	int nread;
 
@@ -158,7 +156,7 @@ int yflash_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaff
 	
 	if(data)
 	{
-		lseek(filedisk.handle,chunkInNAND * 528,SEEK_SET);
+		lseek(filedisk.handle,nand_chunk * 528,SEEK_SET);
 		nread = read(filedisk.handle,data,512);
 		
 		if(nread != 512) return YAFFS_FAIL;
@@ -166,7 +164,7 @@ int yflash_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaff
 	
 	if(spare)
 	{
-		lseek(filedisk.handle,chunkInNAND * 528 + 512,SEEK_SET);
+		lseek(filedisk.handle,nand_chunk * 528 + 512,SEEK_SET);
 		nread= read(filedisk.handle,spare,16);
 		
 		if(nread != 16) return YAFFS_FAIL;
@@ -178,7 +176,7 @@ int yflash_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaff
 }
 
 
-int yflash_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
+int yflash_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber)
 {
 
 	int i;
@@ -187,7 +185,9 @@ int yflash_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
 	
 	if(blockNumber < 0 || blockNumber >= filedisk.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
@@ -208,7 +208,7 @@ int yflash_EraseBlockInNAND(yaffs_Device *dev, int blockNumber)
 	
 }
 
-int yflash_InitialiseNAND(yaffs_Device *dev)
+int yflash_InitialiseNAND(struct yaffs_dev *dev)
 {
 	
 	return YAFFS_OK;