X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffs_nandif.h;h=a130f3c3881bc12b9028ec2a889e9fb199114b7c;hp=cf4562c093280dffcc77b620ff3608756bc7c511;hb=86e364669f775e70f32204769217ecf035508c1d;hpb=4a700fe570d217c2c5df87070db7c2652bc0eaaf

diff --git a/direct/yaffs_nandif.h b/direct/yaffs_nandif.h
index cf4562c..a130f3c 100644
--- a/direct/yaffs_nandif.h
+++ b/direct/yaffs_nandif.h
@@ -1,7 +1,7 @@
 /*
  * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
  *
- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -21,52 +21,52 @@
 
 
 typedef struct {
-	unsigned startBlock;
-	unsigned endBlock;
+	unsigned start_block;
+	unsigned end_block;
 	unsigned dataSize;
 	unsigned spareSize;
 	unsigned pagesPerBlock;
 	unsigned hasECC;
-	unsigned inbandTags;
+	unsigned inband_tags;
 	unsigned useYaffs2;
 
-	int (*initialise)(yaffs_Device *dev);
-	int (*deinitialise)(yaffs_Device *dev);
+	int (*initialise)(struct yaffs_dev *dev);
+	int (*deinitialise)(struct yaffs_dev *dev);
 
-	int (*readChunk) (yaffs_Device *dev,
+	int (*readChunk) (struct yaffs_dev *dev,
 					  unsigned pageId, 
 					  unsigned char *data, unsigned dataLength,
 					  unsigned char *spare, unsigned spareLength,
 					  int *eccStatus);
 // ECC status is set to 0 for OK, 1 for fixed, -1 for unfixed.
 
-	int (*writeChunk)(yaffs_Device *dev,
+	int (*writeChunk)(struct yaffs_dev *dev,
 					  unsigned pageId, 
 					  const unsigned char *data, unsigned dataLength,
 					  const unsigned char *spare, unsigned spareLength);
 
-	int (*eraseBlock)(yaffs_Device *dev, unsigned blockId);
+	int (*eraseBlock)(struct yaffs_dev *dev, unsigned blockId);
 
-	int (*checkBlockOk)(yaffs_Device *dev, unsigned blockId);
-	int (*markBlockBad)(yaffs_Device *dev, unsigned blockId);
+	int (*checkBlockOk)(struct yaffs_dev *dev, unsigned blockId);
+	int (*markBlockBad)(struct yaffs_dev *dev, unsigned blockId);
 
 	void *privateData;
 
 } ynandif_Geometry;
 
-struct yaffs_DeviceStruct * 
-	yaffs_AddDeviceFromGeometry(const YCHAR *name,
+struct yaffs_dev * 
+	yaffs_add_dev_from_geometry(const YCHAR *name,
 					const ynandif_Geometry *geometry);
 
 #if 0
 
-int ynandif_WriteChunkWithTagsToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data, const yaffs_ExtendedTags *tags);
-int ynandif_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaffs_ExtendedTags *tags);
-int ynandif_EraseBlockInNAND(yaffs_Device *dev, int blockNumber);
-int ynandif_InitialiseNAND(yaffs_Device *dev);
-int ynandif_MarkNANDBlockBad(yaffs_Device *dev,int blockNumber);
-int ynandif_QueryNANDBlock(yaffs_Device *dev, int blockNo, yaffs_BlockState *state, __u32 *sequenceNumber);
-int ynandif_GetGeometry(yaffs_Device *dev, ynandif_Geometry *geometry);
+int ynandif_WriteChunkWithTagsToNAND(struct yaffs_dev *dev,int nand_chunk,const u8 *data, const struct yaffs_ext_tags *tags);
+int ynandif_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *data, struct yaffs_ext_tags *tags);
+int ynandif_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber);
+int ynandif_InitialiseNAND(struct yaffs_dev *dev);
+int ynandif_MarkNANDBlockBad(struct yaffs_dev *dev,int blockNumber);
+int ynandif_QueryNANDBlock(struct yaffs_dev *dev, int block_no, enum yaffs_block_state *state, u32 *seq_number);
+int ynandif_GetGeometry(struct yaffs_dev *dev, ynandif_Geometry *geometry);
 #endif