[mynewt-core] 08/13: sys/config & sys/log; use different magic numbers when using FCB vs FCB2.

[marko]

This is an automated email from the ASF dual-hosted git repository.

marko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git

commit 661a2c82090ebe89cc7dee042fe83e98236847c1
Author: Marko Kiiskila <ma...@apache.org>
AuthorDate: Fri Aug 30 10:46:07 2019 +0300

    sys/config & sys/log; use different magic numbers when using FCB vs FCB2.
---
 sys/config/syscfg.yml       | 2 ++
 sys/log/full/src/log_fcb2.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sys/config/syscfg.yml b/sys/config/syscfg.yml
index 684f962..ee9695d 100644
--- a/sys/config/syscfg.yml
+++ b/sys/config/syscfg.yml
@@ -97,3 +97,5 @@ syscfg.defs.CONFIG_NFFS:
         description: 'Limit how many items stored in file before compressing'
         value: 32
 
+syscfg.vals.CONFIG_FCB2:
+    CONFIG_FCB_MAGIC: 0xd0b1d0b1
diff --git a/sys/log/full/src/log_fcb2.c b/sys/log/full/src/log_fcb2.c
index 38b0619..7a141cf 100644
--- a/sys/log/full/src/log_fcb2.c
+++ b/sys/log/full/src/log_fcb2.c
@@ -821,7 +821,7 @@ log_fcb2_rtr_erase(struct log *log, void *arg)
     fcb_scratch.f_ranges = &range;
     fcb_scratch.f_sector_cnt = 1;
     fcb_scratch.f_range_cnt = 1;
-    fcb_scratch.f_magic = 0x7EADBADF;
+    fcb_scratch.f_magic = 0x7EADBAE0;
     fcb_scratch.f_version = g_log_info.li_version;
 
     flash_area_erase(&range.fsr_flash_area, 0, range.fsr_flash_area.fa_size);