X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffs_nandif.c;h=032017ce1ddd3bf089d82a4428217cd78eb1ebf7;hp=8a8f3fb61f8dfbd3ceaa86d70103e3e1752f1603;hb=cf6888f05f691aa1a357e7e94f9bf7b98174bbc3;hpb=7396445d7d0d13469b9505791114b9dc6b76ffe4

diff --git a/direct/yaffs_nandif.c b/direct/yaffs_nandif.c
index 8a8f3fb..032017c 100644
--- a/direct/yaffs_nandif.c
+++ b/direct/yaffs_nandif.c
@@ -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>
@@ -30,12 +30,12 @@
  * use it to load the tags.
  */
 int ynandif_WriteChunkWithTagsToNAND(yaffs_dev_t * dev, int nand_chunk,
-				      const __u8 * data,
+				      const u8 * data,
 				      const yaffs_ext_tags * tags)
 {
 
 	int retval = 0;
-	yaffs_PackedTags2 pt;
+	yaffs_packed_tags2 pt;
 	void *spare;
 	unsigned spareSize = 0;
 	ynandif_Geometry *geometry = (ynandif_Geometry *)(dev->driver_context);
@@ -52,16 +52,16 @@ int ynandif_WriteChunkWithTagsToNAND(yaffs_dev_t * dev, int nand_chunk,
 	 */
 
 	if(dev->param.inband_tags){
-		yaffs_PackedTags2TagsPart *pt2tp;
-		pt2tp = (yaffs_PackedTags2TagsPart *)(data + dev->data_bytes_per_chunk);
-		yaffs_PackTags2TagsPart(pt2tp,tags);
+		yaffs_packed_tags2_tags_only *pt2tp;
+		pt2tp = (yaffs_packed_tags2_tags_only *)(data + dev->data_bytes_per_chunk);
+		yaffs_pack_tags2_tags_only(pt2tp,tags);
 		spare = NULL;
 		spareSize = 0;
 	}
 	else{
-		yaffs_PackTags2(&pt, tags,!dev->param.no_tags_ecc);
+		yaffs_pack_tags2(&pt, tags,!dev->param.no_tags_ecc);
 		spare = &pt;
-		spareSize = sizeof(yaffs_PackedTags2);
+		spareSize = sizeof(yaffs_packed_tags2);
 	}
 	
 	retval = geometry->writeChunk(dev,nand_chunk,
@@ -71,9 +71,9 @@ int ynandif_WriteChunkWithTagsToNAND(yaffs_dev_t * dev, int nand_chunk,
 }
 
 int ynandif_ReadChunkWithTagsFromNAND(yaffs_dev_t * dev, int nand_chunk,
-				       __u8 * data, yaffs_ext_tags * tags)
+				       u8 * data, yaffs_ext_tags * tags)
 {
-	yaffs_PackedTags2 pt;
+	yaffs_packed_tags2 pt;
 	int localData = 0;
 	void *spare = NULL;
 	unsigned spareSize;
@@ -100,7 +100,7 @@ int ynandif_ReadChunkWithTagsFromNAND(yaffs_dev_t * dev, int nand_chunk,
 	}
 	else {
 		spare = &pt;
-		spareSize = sizeof(yaffs_PackedTags2);
+		spareSize = sizeof(yaffs_packed_tags2);
 	}
 
 	retval = geometry->readChunk(dev,nand_chunk,
@@ -111,9 +111,9 @@ int ynandif_ReadChunkWithTagsFromNAND(yaffs_dev_t * dev, int nand_chunk,
 
 	if(dev->param.inband_tags){
 		if(tags){
-			yaffs_PackedTags2TagsPart * pt2tp;
-			pt2tp = (yaffs_PackedTags2TagsPart *)&data[dev->data_bytes_per_chunk];	
-			yaffs_unpack_tags2tags_part(tags,pt2tp);
+			yaffs_packed_tags2_tags_only * pt2tp;
+			pt2tp = (yaffs_packed_tags2_tags_only *)&data[dev->data_bytes_per_chunk];	
+			yaffs_unpack_tags2_tags_only(tags,pt2tp);
 		}
 	}
 	else {
@@ -162,7 +162,7 @@ static int ynandif_IsBlockOk(struct yaffs_dev_s *dev, int blockId)
 	return geometry->checkBlockOk(dev,blockId);
 }
 
-int ynandif_QueryNANDBlock(struct yaffs_dev_s *dev, int blockId, yaffs_block_state_t *state, __u32 *seq_number)
+int ynandif_QueryNANDBlock(struct yaffs_dev_s *dev, int blockId, yaffs_block_state_t *state, u32 *seq_number)
 {
 	unsigned chunkNo;
 	yaffs_ext_tags tags;