X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=direct%2Fyaffs_nandif.h;h=c38834db0fbc8ed8b436c69cfb999a1a9b110e05;hb=3fb0edc9f04818ed9f3ffe966d125a0e442843c2;hp=9009b6268b7e667dba9d8c81d28d5d5a789f8745;hpb=e33554a67753729f6b74677473cf0ec3b8d35a7e;p=yaffs2.git

diff --git a/direct/yaffs_nandif.h b/direct/yaffs_nandif.h
index 9009b62..c38834d 100644
--- a/direct/yaffs_nandif.h
+++ b/direct/yaffs_nandif.h
@@ -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)(yaffs_dev_t *dev);
+	int (*deinitialise)(yaffs_dev_t *dev);
 
-	int (*readChunk) (yaffs_Device *dev,
+	int (*readChunk) (yaffs_dev_t *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)(yaffs_dev_t *dev,
 					  unsigned pageId, 
 					  const unsigned char *data, unsigned dataLength,
 					  const unsigned char *spare, unsigned spareLength);
 
-	int (*eraseBlock)(yaffs_Device *dev, unsigned blockId);
+	int (*eraseBlock)(yaffs_dev_t *dev, unsigned blockId);
 
-	int (*checkBlockOk)(yaffs_Device *dev, unsigned blockId);
-	int (*markBlockBad)(yaffs_Device *dev, unsigned blockId);
+	int (*checkBlockOk)(yaffs_dev_t *dev, unsigned blockId);
+	int (*markBlockBad)(yaffs_dev_t *dev, unsigned blockId);
 
 	void *privateData;
 
 } ynandif_Geometry;
 
-struct yaffs_DeviceStruct * 
+struct yaffs_dev_s * 
 	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(yaffs_dev_t *dev,int nand_chunk,const __u8 *data, const yaffs_ext_tags *tags);
+int ynandif_ReadChunkWithTagsFromNAND(yaffs_dev_t *dev,int nand_chunk, __u8 *data, yaffs_ext_tags *tags);
+int ynandif_EraseBlockInNAND(yaffs_dev_t *dev, int blockNumber);
+int ynandif_InitialiseNAND(yaffs_dev_t *dev);
+int ynandif_MarkNANDBlockBad(yaffs_dev_t *dev,int blockNumber);
+int ynandif_QueryNANDBlock(yaffs_dev_t *dev, int block_no, yaffs_block_state_t *state, __u32 *seq_number);
+int ynandif_GetGeometry(yaffs_dev_t *dev, ynandif_Geometry *geometry);
 #endif