183130227
/
tn3399_openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fritz-tools: fritz_tffs_nand: exclude oob code when disabled 

Skip unnecessary stuff if checking the oob data is disabled.

Signed-off-by: Andre Heider <a.heider@gmail.com>
This commit is contained in:
Andre Heider 2021-12-15 11:38:20 +01:00 committed by David Bauer
parent f1f3d19387
commit 4e2d5f4f9f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/utils/fritz-tools/src/fritz_tffs_nand_read.c
View File

@ -186,15 +186,18 @@ static int find_entry(uint32_t id, struct tffs_entry *entry)
fprintf(stderr, "ERROR: sector isn't readable, but has been previously!\n");
exit(EXIT_FAILURE);
}
uint32_t oob_id = read_uint32(oobbuf, 0x02);
uint32_t oob_len = read_uint32(oobbuf, 0x06);
uint32_t oob_rev = read_uint32(oobbuf, 0x0a);
uint32_t read_id = read_uint32(readbuf, 0x00);
uint32_t read_len = read_uint32(readbuf, 0x04);
uint32_t read_rev = read_uint32(readbuf, 0x0c);
if (read_oob_sector_health && (oob_id != read_id || oob_len != read_len || oob_rev != read_rev)) {
fprintf(stderr, "Warning: sector has inconsistent metadata\n");
continue;
if (read_oob_sector_health) {
uint32_t oob_id = read_uint32(oobbuf, 0x02);
uint32_t oob_len = read_uint32(oobbuf, 0x06);
uint32_t oob_rev = read_uint32(oobbuf, 0x0a);
if (oob_id != read_id || oob_len != read_len || oob_rev != read_rev) {
fprintf(stderr, "Warning: sector has inconsistent metadata\n");
continue;
}
}
if (read_id == TFFS_ID_END) {
/* no more entries in this block */