projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master'
[yaffs2.git]
/
direct
/
basic-test
/
yaffs_fileem2k.c
diff --git
a/direct/basic-test/yaffs_fileem2k.c
b/direct/basic-test/yaffs_fileem2k.c
index 28c5d2f90345a91654ba0822b3db6ad528171a0e..836d1f7b97b263a6fcb561045371fb051d45d775 100644
(file)
--- a/
direct/basic-test/yaffs_fileem2k.c
+++ b/
direct/basic-test/yaffs_fileem2k.c
@@
-26,7
+26,6
@@
const char *yaffs_flashif2_c_version = "$Id: yaffs_fileem2k.c,v 1.24 2010-02-18
#include "yaffs_guts.h"
#include "yaffs_fileem2k.h"
#include "yaffs_packedtags2.h"
#include "yaffs_guts.h"
#include "yaffs_fileem2k.h"
#include "yaffs_packedtags2.h"
-#include "yaffs_tagsvalidity.h"
#include <sys/types.h>
#include <sys/types.h>
@@
-407,7
+406,7
@@
int yflash2_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *
/* Got to suck the tags out of the data area */
if(!data) {
localData=1;
/* Got to suck the tags out of the data area */
if(!data) {
localData=1;
- data = yaffs_get_temp_buffer(dev
,__LINE__
);
+ data = yaffs_get_temp_buffer(dev);
}
}
@@
-428,7
+427,7
@@
int yflash2_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *
retval = YAFFS_FAIL;
if(localData)
retval = YAFFS_FAIL;
if(localData)
- yaffs_release_temp_buffer(dev,
data,__LINE__
);
+ yaffs_release_temp_buffer(dev,
data
);
@@
-460,14
+459,10
@@
int yflash2_ReadChunkWithTagsFromNAND(struct yaffs_dev *dev,int nand_chunk, u8 *
nread= read(h,tags,sizeof(struct yaffs_ext_tags));
if(nread != sizeof(struct yaffs_ext_tags))
retval = YAFFS_FAIL;
nread= read(h,tags,sizeof(struct yaffs_ext_tags));
if(nread != sizeof(struct yaffs_ext_tags))
retval = YAFFS_FAIL;
- if(yaffs_check_all_ff((u8 *)tags,sizeof(struct yaffs_ext_tags)))
- {
- yaffs_init_tags(tags);
- }
+ if(yaffs_check_all_ff((u8 *)tags, sizeof(struct yaffs_ext_tags)))
+ memset(tags, 0, sizeof(struct yaffs_ext_tags));
else
else
- {
tags->chunk_used = 1;
tags->chunk_used = 1;
- }
}
else
{
}
else
{
@@
-599,7
+594,7
@@
int yflash2_QueryNANDBlock(struct yaffs_dev *dev, int block_no, enum yaffs_block
}
else if(tags.chunk_used)
{
}
else if(tags.chunk_used)
{
- *state = YAFFS_BLOCK_STATE_NEEDS_SCAN
NING
;
+ *state = YAFFS_BLOCK_STATE_NEEDS_SCAN;
*seq_number = tags.seq_number;
}
return YAFFS_OK;
*seq_number = tags.seq_number;
}
return YAFFS_OK;