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

mufs: get proper virtual address in mufs_shrink_tree()

Browse source
This commit is contained in:
S.J.R. van Schaik 2017-07-24 15:38:23 +02:00
parent 5164ded1fe
commit 7125ddadf9
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/fs/mufs/tree.c
View file

@ -190,7 +190,8 @@ int mufs_shrink_tree(struct mufs_tree *tree, uint32_t max_size)
dev->log2_block_size);
if (index <= 1) {
if (flash_read(dev, base, &tree->root, sizeof tree->root) == 0)
if (flash_read(dev, (base << dev->log2_block_size), &tree->root,
sizeof tree->root) == 0)
return -1;
--tree->depth;
@ -200,8 +201,9 @@ int mufs_shrink_tree(struct mufs_tree *tree, uint32_t max_size)
continue;
}
if (flash_write0(dev, base + index * sizeof(uint32_t), (UINT32_C(1) <<
dev->log2_block_size) - index * sizeof(uint32_t)) == 0)
if (flash_write0(dev, (base << dev->log2_block_size) +
index * sizeof(uint32_t), (UINT32_C(1) << dev->log2_block_size) -
index * sizeof(uint32_t)) == 0)
return -1;
if (flash_sync(dev) < 0)