projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs More symbol changes
[yaffs2.git]
/
yaffs_nand.c
diff --git
a/yaffs_nand.c
b/yaffs_nand.c
index 0a76ca020d23ef2f59c55740b09e52d7ee259fec..bd1f05806ee56386efa957a1c4031f3eed5a7d3f 100644
(file)
--- a/
yaffs_nand.c
+++ b/
yaffs_nand.c
@@
-1,7
+1,7
@@
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-20
07
Aleph One Ltd.
+ * Copyright (C) 2002-20
10
Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@
-11,16
+11,13
@@
* published by the Free Software Foundation.
*/
* published by the Free Software Foundation.
*/
-const char *yaffs_nand_c_version =
- "$Id: yaffs_nand.c,v 1.11 2009-09-09 03:03:01 charles Exp $";
-
#include "yaffs_nand.h"
#include "yaffs_tagscompat.h"
#include "yaffs_tagsvalidity.h"
#include "yaffs_getblockinfo.h"
#include "yaffs_nand.h"
#include "yaffs_tagscompat.h"
#include "yaffs_tagsvalidity.h"
#include "yaffs_getblockinfo.h"
-int yaffs_
ReadChunkWithTagsFromNAND
(yaffs_Device *dev, int chunkInNAND,
+int yaffs_
rd_chunk_tags_nand
(yaffs_Device *dev, int chunkInNAND,
__u8 *buffer,
yaffs_ExtendedTags *tags)
{
__u8 *buffer,
yaffs_ExtendedTags *tags)
{
@@
-35,25
+32,26
@@
int yaffs_ReadChunkWithTagsFromNAND(yaffs_Device *dev, int chunkInNAND,
if (!tags)
tags = &localTags;
if (!tags)
tags = &localTags;
- if (dev->readChunkWithTagsFromNAND)
- result = dev->readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
+ if (dev->
param.
readChunkWithTagsFromNAND)
+ result = dev->
param.
readChunkWithTagsFromNAND(dev, realignedChunkInNAND, buffer,
tags);
else
tags);
else
- result = yaffs_
TagsCompatabilityReadChunkWithTagsFromNAND
(dev,
+ result = yaffs_
tags_compat_rd
(dev,
realignedChunkInNAND,
buffer,
tags);
if (tags &&
tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
realignedChunkInNAND,
buffer,
tags);
if (tags &&
tags->eccResult > YAFFS_ECC_RESULT_NO_ERROR) {
- yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev, chunkInNAND/dev->nChunksPerBlock);
- yaffs_HandleChunkError(dev, bi);
+ yaffs_BlockInfo *bi;
+ bi = yaffs_get_block_info(dev, chunkInNAND/dev->param.nChunksPerBlock);
+ yaffs_handle_chunk_error(dev, bi);
}
return result;
}
}
return result;
}
-int yaffs_
WriteChunkWithTagsToNAND
(yaffs_Device *dev,
+int yaffs_
wr_chunk_tags_nand
(yaffs_Device *dev,
int chunkInNAND,
const __u8 *buffer,
yaffs_ExtendedTags *tags)
int chunkInNAND,
const __u8 *buffer,
yaffs_ExtendedTags *tags)
@@
-67,7
+65,7
@@
int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
if (tags) {
tags->sequenceNumber = dev->sequenceNumber;
tags->chunkUsed = 1;
if (tags) {
tags->sequenceNumber = dev->sequenceNumber;
tags->chunkUsed = 1;
- if (!yaffs_
ValidateT
ags(tags)) {
+ if (!yaffs_
validate_t
ags(tags)) {
T(YAFFS_TRACE_ERROR,
(TSTR("Writing uninitialised tags" TENDSTR)));
YBUG();
T(YAFFS_TRACE_ERROR,
(TSTR("Writing uninitialised tags" TENDSTR)));
YBUG();
@@
-80,44
+78,44
@@
int yaffs_WriteChunkWithTagsToNAND(yaffs_Device *dev,
YBUG();
}
YBUG();
}
- if (dev->writeChunkWithTagsToNAND)
- return dev->writeChunkWithTagsToNAND(dev, chunkInNAND, buffer,
+ if (dev->
param.
writeChunkWithTagsToNAND)
+ return dev->
param.
writeChunkWithTagsToNAND(dev, chunkInNAND, buffer,
tags);
else
tags);
else
- return yaffs_
TagsCompatabilityWriteChunkWithTagsToNAND
(dev,
+ return yaffs_
tags_compat_wr
(dev,
chunkInNAND,
buffer,
tags);
}
chunkInNAND,
buffer,
tags);
}
-int yaffs_
MarkBlockB
ad(yaffs_Device *dev, int blockNo)
+int yaffs_
mark_b
ad(yaffs_Device *dev, int blockNo)
{
blockNo -= dev->blockOffset;
{
blockNo -= dev->blockOffset;
- if (dev->markNANDBlockBad)
- return dev->markNANDBlockBad(dev, blockNo);
+ if (dev->
param.
markNANDBlockBad)
+ return dev->
param.
markNANDBlockBad(dev, blockNo);
else
else
- return yaffs_
TagsCompatabilityMarkNANDBlockB
ad(dev, blockNo);
+ return yaffs_
tags_compat_mark_b
ad(dev, blockNo);
}
}
-int yaffs_
QueryInitialBlockS
tate(yaffs_Device *dev,
+int yaffs_
query_init_block_s
tate(yaffs_Device *dev,
int blockNo,
yaffs_BlockState *state,
__u32 *sequenceNumber)
{
blockNo -= dev->blockOffset;
int blockNo,
yaffs_BlockState *state,
__u32 *sequenceNumber)
{
blockNo -= dev->blockOffset;
- if (dev->queryNANDBlock)
- return dev->queryNANDBlock(dev, blockNo, state, sequenceNumber);
+ if (dev->
param.
queryNANDBlock)
+ return dev->
param.
queryNANDBlock(dev, blockNo, state, sequenceNumber);
else
else
- return yaffs_
TagsCompatabilityQueryNANDB
lock(dev, blockNo,
+ return yaffs_
tags_compat_query_b
lock(dev, blockNo,
state,
sequenceNumber);
}
state,
sequenceNumber);
}
-int yaffs_
EraseBlockInNAND
(struct yaffs_DeviceStruct *dev,
+int yaffs_
erase_block
(struct yaffs_DeviceStruct *dev,
int blockInNAND)
{
int result;
int blockInNAND)
{
int result;
@@
-126,14
+124,16
@@
int yaffs_EraseBlockInNAND(struct yaffs_DeviceStruct *dev,
dev->nBlockErasures++;
dev->nBlockErasures++;
- result = dev->eraseBlockInNAND(dev, blockInNAND);
+ result = dev->
param.
eraseBlockInNAND(dev, blockInNAND);
return result;
}
return result;
}
-int yaffs_
InitialiseNAND
(struct yaffs_DeviceStruct *dev)
+int yaffs_
init_nand
(struct yaffs_DeviceStruct *dev)
{
{
- return dev->initialiseNAND(dev);
+ if(dev->param.initialiseNAND)
+ return dev->param.initialiseNAND(dev);
+ return YAFFS_OK;
}
}