X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Fyaffs_norif1.c;h=376d330d5c8fe26161322c810fe7c79b06bafb2f;hp=06bea3dc7218b2aa5be273faa7185bd0400ed410;hb=a48028210bd3547399ecaed7b0138d6c43a1f547;hpb=52191f6a41e2d965de7721c32546bf82150b5cc4

diff --git a/direct/yaffs_norif1.c b/direct/yaffs_norif1.c
index 06bea3d..376d330 100644
--- a/direct/yaffs_norif1.c
+++ b/direct/yaffs_norif1.c
@@ -35,11 +35,12 @@
  *   
  */
 
-const char *yaffs_norif1_c_version = "$Id: yaffs_norif1.c,v 1.4 2009-01-09 02:54:14 charles Exp $";
+const char *yaffs_norif1_c_version = "$Id: yaffs_norif1.c,v 1.6 2010-02-18 01:18:04 charles Exp $";
 
 #include "yaffs_norif1.h"
 
 #include "yportenv.h"
+#include "yaffs_trace.h"
 
 #include "yaffs_flashif.h"
 #include "yaffs_guts.h"
@@ -112,8 +113,8 @@ __u32 *Chunk2DataAddr(yaffs_Device *dev,int chunkId)
 	unsigned chunkInBlock;
 	__u32  addr;
 	
-	block = chunkId/dev->nChunksPerBlock;
-	chunkInBlock = chunkId % dev->nChunksPerBlock;
+	block = chunkId/dev->param.nChunksPerBlock;
+	chunkInBlock = chunkId % dev->param.nChunksPerBlock;
 	
 	addr = (__u32) Block2Addr(dev,block);
 	addr += chunkInBlock * DATA_BYTES_PER_CHUNK;
@@ -127,8 +128,8 @@ __u32 *Chunk2SpareAddr(yaffs_Device *dev,int chunkId)
 	unsigned chunkInBlock;
 	__u32 addr;
 	
-	block = chunkId/dev->nChunksPerBlock;
-	chunkInBlock = chunkId % dev->nChunksPerBlock;
+	block = chunkId/dev->param.nChunksPerBlock;
+	chunkInBlock = chunkId % dev->param.nChunksPerBlock;
 	
 	addr = (__u32) Block2Addr(dev,block);
 	addr += SPARE_AREA_OFFSET;
@@ -173,7 +174,7 @@ int ynorif1_WriteChunkToNAND(yaffs_Device *dev,int chunkInNAND,const __u8 *data,
                 ynorif1_FlashWrite32(spareAddr,(__u32 *)&tmpSpare,sizeof(yaffs_Spare)/4);
 
                 /* Write the data */            
-                ynorif1_FlashWrite32(dataAddr,(__u32 *)data,dev->totalBytesPerChunk / 4);
+                ynorif1_FlashWrite32(dataAddr,(__u32 *)data,dev->param.totalBytesPerChunk / 4);
                 
                 
                 memcpy(&tmpSpare,spare,sizeof(yaffs_Spare));
@@ -212,7 +213,7 @@ int ynorif1_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaf
 	
 	if(data)
 	{
-		ynorif1_FlashRead32(dataAddr,(__u32 *)data,dev->totalBytesPerChunk / 4);
+		ynorif1_FlashRead32(dataAddr,(__u32 *)data,dev->param.totalBytesPerChunk / 4);
 	}
 	
         if(spare)
@@ -290,7 +291,7 @@ int ynorif1_InitialiseNAND(yaffs_Device *dev)
 	
 	ynorif1_FlashInit();
 	/* Go through the blocks formatting them if they are not formatted */
-	for(i = dev->startBlock; i <= dev->endBlock; i++){
+	for(i = dev->param.startBlock; i <= dev->param.endBlock; i++){
 		if(!ynorif1_IsBlockFormatted(dev,i)){
 			ynorif1_FormatBlock(dev,i);
 		}