You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2017/02/21 21:55:08 UTC
[1/2] incubator-mynewt-core git commit: MYNEWT-492;
sys/config - TBD -> descriptions.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop a42c0c109 -> c00eeee7c
MYNEWT-492; sys/config - TBD -> descriptions.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/7944913e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/7944913e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/7944913e
Branch: refs/heads/develop
Commit: 7944913eb3f8f8931cc52471dd47bc5dacf8b091
Parents: a42c0c1
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Tue Feb 21 13:50:28 2017 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Tue Feb 21 13:50:28 2017 -0800
----------------------------------------------------------------------
sys/config/syscfg.yml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/7944913e/sys/config/syscfg.yml
----------------------------------------------------------------------
diff --git a/sys/config/syscfg.yml b/sys/config/syscfg.yml
index 1a80d61..462f168 100644
--- a/sys/config/syscfg.yml
+++ b/sys/config/syscfg.yml
@@ -20,43 +20,43 @@
syscfg.defs:
CONFIG_FCB:
- description: 'TBD'
+ description: 'Config default storage is in FCB'
value: 0
restrictions:
- '!CONFIG_NFFS'
- 'CONFIG_FCB_FLASH_AREA'
CONFIG_NFFS:
- description: 'TBD'
+ description: 'Config default storage is in NFFS'
value: 0
restrictions:
- '!CONFIG_FCB'
CONFIG_NEWTMGR:
- description: 'TBD'
+ description: 'Newtmgr access to config'
value: 0
CONFIG_CLI:
- description: 'TBD'
+ description: 'CLI commands for accessing config'
value: 0
restrictions:
- 'SHELL_TASK'
syscfg.defs.CONFIG_FCB:
CONFIG_FCB_FLASH_AREA:
- description: 'TBD'
+ description: 'BSP flash area for config'
type: 'flash_owner'
value:
CONFIG_FCB_MAGIC:
- description: 'TBD'
- value: 0xc09f6e5e
+ description: 'Magic to identify valid configuration area'
+ value: 0xc0ffeeee
syscfg.defs.CONFIG_NFFS:
CONFIG_NFFS_DIR:
- description: 'TBD'
+ description: 'Directory where config is stored'
value: '"/cfg"'
CONFIG_NFFS_FILE:
- description: 'TBD'
+ description: 'Name for the default config file'
value: '"/cfg/run"'
CONFIG_NFFS_MAX_LINES:
- description: 'TBD'
+ description: 'Limit how many items stored in file before compressing'
value: 32
[2/2] incubator-mynewt-core git commit: MYNEWT-560;
conf_fcb_src() always set f_magic.
Posted by ma...@apache.org.
MYNEWT-560; conf_fcb_src() always set f_magic.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/c00eeee7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/c00eeee7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/c00eeee7
Branch: refs/heads/develop
Commit: c00eeee7c4cdbe5dd474b03b95c8870d7eda20c9
Parents: 7944913
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Tue Feb 21 13:54:23 2017 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Tue Feb 21 13:54:23 2017 -0800
----------------------------------------------------------------------
sys/config/src/config_fcb.c | 2 --
sys/config/test-fcb/src/testcases/config_test_compress_reset.c | 2 ++
sys/config/test-fcb/src/testcases/config_test_empty_fcb.c | 1 +
sys/config/test-fcb/src/testcases/config_test_save_1_fcb.c | 1 +
sys/config/test-fcb/src/testcases/config_test_save_2_fcb.c | 1 +
sys/config/test-fcb/src/testcases/config_test_save_3_fcb.c | 1 +
sys/config/test-fcb/src/testcases/config_test_save_one_fcb.c | 1 +
7 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c00eeee7/sys/config/src/config_fcb.c
----------------------------------------------------------------------
diff --git a/sys/config/src/config_fcb.c b/sys/config/src/config_fcb.c
index 334ae58..080ad45 100644
--- a/sys/config/src/config_fcb.c
+++ b/sys/config/src/config_fcb.c
@@ -29,7 +29,6 @@
#include "config/config_fcb.h"
#include "config_priv.h"
-#define CONF_FCB_MAGIC 0xc0ffeeee
#define CONF_FCB_VERS 1
struct conf_fcb_load_cb_arg {
@@ -51,7 +50,6 @@ conf_fcb_src(struct conf_fcb *cf)
{
int rc;
- cf->cf_fcb.f_magic = CONF_FCB_MAGIC;
cf->cf_fcb.f_version = CONF_FCB_VERS;
cf->cf_fcb.f_scratch_cnt = 1;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c00eeee7/sys/config/test-fcb/src/testcases/config_test_compress_reset.c
----------------------------------------------------------------------
diff --git a/sys/config/test-fcb/src/testcases/config_test_compress_reset.c b/sys/config/test-fcb/src/testcases/config_test_compress_reset.c
index 46606f2..123d151 100644
--- a/sys/config/test-fcb/src/testcases/config_test_compress_reset.c
+++ b/sys/config/test-fcb/src/testcases/config_test_compress_reset.c
@@ -30,6 +30,7 @@ TEST_CASE(config_test_compress_reset)
config_wipe_srcs();
config_wipe_fcb(fcb_areas, sizeof(fcb_areas) / sizeof(fcb_areas[0]));
+ cf.cf_fcb.f_magic = MYNEWT_VAL(CONFIG_FCB_MAGIC);
cf.cf_fcb.f_sectors = fcb_areas;
cf.cf_fcb.f_sector_cnt = sizeof(fcb_areas) / sizeof(fcb_areas[0]);
@@ -72,6 +73,7 @@ TEST_CASE(config_test_compress_reset)
memset(&cf, 0, sizeof(cf));
+ cf.cf_fcb.f_magic = MYNEWT_VAL(CONFIG_FCB_MAGIC);
cf.cf_fcb.f_sectors = fcb_areas;
cf.cf_fcb.f_sector_cnt = sizeof(fcb_areas) / sizeof(fcb_areas[0]);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c00eeee7/sys/config/test-fcb/src/testcases/config_test_empty_fcb.c
----------------------------------------------------------------------
diff --git a/sys/config/test-fcb/src/testcases/config_test_empty_fcb.c b/sys/config/test-fcb/src/testcases/config_test_empty_fcb.c
index a72d1c5..d6c1fd9 100644
--- a/sys/config/test-fcb/src/testcases/config_test_empty_fcb.c
+++ b/sys/config/test-fcb/src/testcases/config_test_empty_fcb.c
@@ -26,6 +26,7 @@ TEST_CASE(config_test_empty_fcb)
config_wipe_srcs();
config_wipe_fcb(fcb_areas, sizeof(fcb_areas) / sizeof(fcb_areas[0]));
+ cf.cf_fcb.f_magic = MYNEWT_VAL(CONFIG_FCB_MAGIC);
cf.cf_fcb.f_sectors = fcb_areas;
cf.cf_fcb.f_sector_cnt = sizeof(fcb_areas) / sizeof(fcb_areas[0]);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c00eeee7/sys/config/test-fcb/src/testcases/config_test_save_1_fcb.c
----------------------------------------------------------------------
diff --git a/sys/config/test-fcb/src/testcases/config_test_save_1_fcb.c b/sys/config/test-fcb/src/testcases/config_test_save_1_fcb.c
index 68dc711..e49386a 100644
--- a/sys/config/test-fcb/src/testcases/config_test_save_1_fcb.c
+++ b/sys/config/test-fcb/src/testcases/config_test_save_1_fcb.c
@@ -25,6 +25,7 @@ TEST_CASE(config_test_save_1_fcb)
config_wipe_srcs();
+ cf.cf_fcb.f_magic = MYNEWT_VAL(CONFIG_FCB_MAGIC);
cf.cf_fcb.f_sectors = fcb_areas;
cf.cf_fcb.f_sector_cnt = sizeof(fcb_areas) / sizeof(fcb_areas[0]);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c00eeee7/sys/config/test-fcb/src/testcases/config_test_save_2_fcb.c
----------------------------------------------------------------------
diff --git a/sys/config/test-fcb/src/testcases/config_test_save_2_fcb.c b/sys/config/test-fcb/src/testcases/config_test_save_2_fcb.c
index ade741a..bfdcc21 100644
--- a/sys/config/test-fcb/src/testcases/config_test_save_2_fcb.c
+++ b/sys/config/test-fcb/src/testcases/config_test_save_2_fcb.c
@@ -27,6 +27,7 @@ TEST_CASE(config_test_save_2_fcb)
config_wipe_srcs();
+ cf.cf_fcb.f_magic = MYNEWT_VAL(CONFIG_FCB_MAGIC);
cf.cf_fcb.f_sectors = fcb_areas;
cf.cf_fcb.f_sector_cnt = sizeof(fcb_areas) / sizeof(fcb_areas[0]);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c00eeee7/sys/config/test-fcb/src/testcases/config_test_save_3_fcb.c
----------------------------------------------------------------------
diff --git a/sys/config/test-fcb/src/testcases/config_test_save_3_fcb.c b/sys/config/test-fcb/src/testcases/config_test_save_3_fcb.c
index 3cb7cee..99d79ef 100644
--- a/sys/config/test-fcb/src/testcases/config_test_save_3_fcb.c
+++ b/sys/config/test-fcb/src/testcases/config_test_save_3_fcb.c
@@ -27,6 +27,7 @@ TEST_CASE(config_test_save_3_fcb)
config_wipe_srcs();
config_wipe_fcb(fcb_areas, sizeof(fcb_areas) / sizeof(fcb_areas[0]));
+ cf.cf_fcb.f_magic = MYNEWT_VAL(CONFIG_FCB_MAGIC);
cf.cf_fcb.f_sectors = fcb_areas;
cf.cf_fcb.f_sector_cnt = 4;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c00eeee7/sys/config/test-fcb/src/testcases/config_test_save_one_fcb.c
----------------------------------------------------------------------
diff --git a/sys/config/test-fcb/src/testcases/config_test_save_one_fcb.c b/sys/config/test-fcb/src/testcases/config_test_save_one_fcb.c
index a9a5efc..90e17d9 100644
--- a/sys/config/test-fcb/src/testcases/config_test_save_one_fcb.c
+++ b/sys/config/test-fcb/src/testcases/config_test_save_one_fcb.c
@@ -26,6 +26,7 @@ TEST_CASE(config_test_save_one_fcb)
config_wipe_srcs();
config_wipe_fcb(fcb_areas, sizeof(fcb_areas) / sizeof(fcb_areas[0]));
+ cf.cf_fcb.f_magic = MYNEWT_VAL(CONFIG_FCB_MAGIC);
cf.cf_fcb.f_sectors = fcb_areas;
cf.cf_fcb.f_sector_cnt = sizeof(fcb_areas) / sizeof(fcb_areas[0]);