projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pass correct argument to markSuperBlockDirty
[yaffs2.git]
/
direct
/
yaffs_norif1.c
diff --git
a/direct/yaffs_norif1.c
b/direct/yaffs_norif1.c
index 4e660d083144dd15bba0e14ffe3d360bd4ef9436..376d330d5c8fe26161322c810fe7c79b06bafb2f 100644
(file)
--- 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.
3 2008-11-13 01:50:16
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_norif1.h"
#include "yportenv.h"
+#include "yaffs_trace.h"
#include "yaffs_flashif.h"
#include "yaffs_guts.h"
#include "yaffs_flashif.h"
#include "yaffs_guts.h"
@@
-112,8
+113,8
@@
__u32 *Chunk2DataAddr(yaffs_Device *dev,int chunkId)
unsigned chunkInBlock;
__u32 addr;
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;
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;
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;
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(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));
memcpy(&tmpSpare,spare,sizeof(yaffs_Spare));
@@
-212,7
+213,7
@@
int ynorif1_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaf
if(data)
{
if(data)
{
- ynorif1_FlashRead32(dataAddr,(__u32 *)data,dev->totalBytesPerChunk / 4);
+ ynorif1_FlashRead32(dataAddr,(__u32 *)data,dev->
param.
totalBytesPerChunk / 4);
}
if(spare)
}
if(spare)
@@
-225,7
+226,7
@@
int ynorif1_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, yaf
if(spare->pageStatus == YNOR_POSTMARKER)
spare->pageStatus = 0xFF;
else if(spare->pageStatus != 0xff &&
if(spare->pageStatus == YNOR_POSTMARKER)
spare->pageStatus = 0xFF;
else if(spare->pageStatus != 0xff &&
- (spare->pageStatus | YNOR_PREMARKER
!= 0xff)
)
+ (spare->pageStatus | YNOR_PREMARKER
) != 0xff
)
spare->pageStatus = YNOR_PREMARKER;
}
spare->pageStatus = YNOR_PREMARKER;
}
@@
-290,7
+291,7
@@
int ynorif1_InitialiseNAND(yaffs_Device *dev)
ynorif1_FlashInit();
/* Go through the blocks formatting them if they are not formatted */
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);
}
if(!ynorif1_IsBlockFormatted(dev,i)){
ynorif1_FormatBlock(dev,i);
}