projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs Further name changes and file reorganisation
[yaffs2.git]
/
yaffs_yaffs1.c
diff --git
a/yaffs_yaffs1.c
b/yaffs_yaffs1.c
index 009ab4dd9219bee4178fdabd6d513e9e2ff13965..21933dc370667c26b30cdcdda71175bdf4987f3a 100644
(file)
--- a/
yaffs_yaffs1.c
+++ b/
yaffs_yaffs1.c
@@
-23,9
+23,6
@@
int yaffs1_scan(yaffs_dev_t *dev)
{
yaffs_ext_tags tags;
int blk;
{
yaffs_ext_tags tags;
int blk;
- int blockIterator;
- int startIterator;
- int endIterator;
int result;
int chunk;
int result;
int chunk;
@@
-41,10
+38,10
@@
int yaffs1_scan(yaffs_dev_t *dev)
int alloc_failed = 0;
int alloc_failed = 0;
- struct yaffs_shadow_fixer_s *shadow
FixerList
= NULL;
+ struct yaffs_shadow_fixer_s *shadow
_fixers
= NULL;
- __u8 *chunk
D
ata;
+ __u8 *chunk
_d
ata;
@@
-52,7
+49,7
@@
int yaffs1_scan(yaffs_dev_t *dev)
(TSTR("yaffs1_scan starts intstartblk %d intendblk %d..." TENDSTR),
dev->internal_start_block, dev->internal_end_block));
(TSTR("yaffs1_scan starts intstartblk %d intendblk %d..." TENDSTR),
dev->internal_start_block, dev->internal_end_block));
- chunk
D
ata = yaffs_get_temp_buffer(dev, __LINE__);
+ chunk
_d
ata = yaffs_get_temp_buffer(dev, __LINE__);
dev->seq_number = YAFFS_LOWEST_SEQUENCE_NUMBER;
dev->seq_number = YAFFS_LOWEST_SEQUENCE_NUMBER;
@@
-87,19
+84,13
@@
int yaffs1_scan(yaffs_dev_t *dev)
bi++;
}
bi++;
}
- startIterator = dev->internal_start_block;
- endIterator = dev->internal_end_block;
-
/* For each block.... */
/* For each block.... */
- for (blockIterator = startIterator; !alloc_failed && blockIterator <= endIterator;
- blockIterator++) {
-
- YYIELD();
+ for (blk= dev->internal_start_block;
+ !alloc_failed && blk <= dev->internal_end_block;
+ blk++) {
YYIELD();
YYIELD();
- blk = blockIterator;
-
bi = yaffs_get_block_info(dev, blk);
state = bi->block_state;
bi = yaffs_get_block_info(dev, blk);
state = bi->block_state;
@@
-197,10
+188,10
@@
int yaffs1_scan(yaffs_dev_t *dev)
bi->pages_in_use++;
result = yaffs_rd_chunk_tags_nand(dev, chunk,
bi->pages_in_use++;
result = yaffs_rd_chunk_tags_nand(dev, chunk,
- chunk
D
ata,
+ chunk
_d
ata,
NULL);
NULL);
- oh = (yaffs_obj_header *) chunk
D
ata;
+ oh = (yaffs_obj_header *) chunk
_d
ata;
in = yaffs_find_by_number(dev,
tags.obj_id);
in = yaffs_find_by_number(dev,
tags.obj_id);
@@
-228,8
+219,8
@@
int yaffs1_scan(yaffs_dev_t *dev)
struct yaffs_shadow_fixer_s *fixer;
fixer = YMALLOC(sizeof(struct yaffs_shadow_fixer_s));
if (fixer) {
struct yaffs_shadow_fixer_s *fixer;
fixer = YMALLOC(sizeof(struct yaffs_shadow_fixer_s));
if (fixer) {
- fixer->next = shadow
FixerList
;
- shadow
FixerList
= fixer;
+ fixer->next = shadow
_fixers
;
+ shadow
_fixers
= fixer;
fixer->obj_id = tags.obj_id;
fixer->shadowed_id = oh->shadows_obj;
T(YAFFS_TRACE_SCAN,
fixer->obj_id = tags.obj_id;
fixer->shadowed_id = oh->shadows_obj;
T(YAFFS_TRACE_SCAN,
@@
-244,10
+235,10
@@
int yaffs1_scan(yaffs_dev_t *dev)
if (in && in->valid) {
/* We have already filled this one. We have a duplicate and need to resolve it. */
if (in && in->valid) {
/* We have already filled this one. We have a duplicate and need to resolve it. */
- unsigned existing
S
erial = in->serial;
- unsigned new
S
erial = tags.serial_number;
+ unsigned existing
_s
erial = in->serial;
+ unsigned new
_s
erial = tags.serial_number;
- if (((existing
Serial + 1) & 3) == newS
erial) {
+ if (((existing
_serial + 1) & 3) == new_s
erial) {
/* Use new one - destroy the exisiting one */
yaffs_chunk_del(dev,
in->hdr_chunk,
/* Use new one - destroy the exisiting one */
yaffs_chunk_del(dev,
in->hdr_chunk,
@@
-434,9
+425,9
@@
int yaffs1_scan(yaffs_dev_t *dev)
struct yaffs_shadow_fixer_s *fixer;
yaffs_obj_t *obj;
struct yaffs_shadow_fixer_s *fixer;
yaffs_obj_t *obj;
- while (shadow
FixerList
) {
- fixer = shadow
FixerList
;
- shadow
FixerList
= fixer->next;
+ while (shadow
_fixers
) {
+ fixer = shadow
_fixers
;
+ shadow
_fixers
= fixer->next;
/* Complete the rename transaction by deleting the shadowed object
* then setting the object header to unshadowed.
*/
/* Complete the rename transaction by deleting the shadowed object
* then setting the object header to unshadowed.
*/
@@
-453,7
+444,7
@@
int yaffs1_scan(yaffs_dev_t *dev)
}
}
}
}
- yaffs_release_temp_buffer(dev, chunk
D
ata, __LINE__);
+ yaffs_release_temp_buffer(dev, chunk
_d
ata, __LINE__);
if (alloc_failed)
return YAFFS_FAIL;
if (alloc_failed)
return YAFFS_FAIL;