TBM
/
tbm-mcu
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mufs: clean up code for tree management

Browse Source
tags/0.1.0
S.J.R. van Schaik 7 years ago
parent 2a62bd1f15
commit 0ee4779e5c
1 changed files with 7 additions and 9 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      source/fs/mufs/tree.c

16
source/fs/mufs/tree.c
Unescape View File

@ -44,8 +44,7 @@ static int mufs_do_lookup(struct mufs *fs, uint32_t *page,
unsigned alloc) unsigned alloc)
{ {
struct flash_dev *dev = fs->dev; struct flash_dev *dev = fs->dev;
uint32_t entry; uint32_t offset, entry;
size_t index;
if (!base) if (!base)
return -1; return -1;
@ -55,11 +54,10 @@ static int mufs_do_lookup(struct mufs *fs, uint32_t *page,
return 0; return 0;
} }
base <<= dev->log2_block_size; offset = mufs_get_index(fs, va, depth) * sizeof entry;
index = mufs_get_index(fs, va, depth); offset += base << dev->log2_block_size;
base += index * sizeof entry;
if (flash_read(dev, base, &entry, sizeof entry) == 0) if (flash_read(dev, offset, &entry, sizeof entry) == 0)
return -1; return -1;
if (!entry) { if (!entry) {
@ -71,7 +69,7 @@ static int mufs_do_lookup(struct mufs *fs, uint32_t *page,
} }
} }
if (flash_write(dev, base, &entry, sizeof entry) == 0) if (flash_write(dev, offset, &entry, sizeof entry) == 0)
return -1; return -1;
if (flash_sync(dev) < 0) if (flash_sync(dev) < 0)
@ -92,7 +90,7 @@ int mufs_map_page(struct mufs_tree *tree, uint32_t va, uint32_t page)
{ {
struct mufs *fs = tree->fs; struct mufs *fs = tree->fs;
if (!tree->root && mufs_alloc_block(fs, &tree->root) < 0) if (tree->root == 0 && mufs_alloc_block(fs, &tree->root) < 0)
return -1; return -1;
return mufs_do_lookup(fs, &page, tree->root, tree->depth, va, page, 1); return mufs_do_lookup(fs, &page, tree->root, tree->depth, va, page, 1);
@ -103,7 +101,7 @@ int mufs_alloc_page(struct mufs_tree *tree, uint32_t *page,
{ {
struct mufs *fs = tree->fs; struct mufs *fs = tree->fs;
if (!tree->root && mufs_alloc_block(fs, &tree->root) < 0) if (tree->root == 0 && mufs_alloc_block(fs, &tree->root) < 0)
return -1; return -1;
return mufs_do_lookup(fs, page, tree->root, tree->depth, va, 0, 1); return mufs_do_lookup(fs, page, tree->root, tree->depth, va, 0, 1);

Write Preview
Loading…
Cancel
Save