You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/10/05 17:28:48 UTC
incubator-mynewt-core git commit: slinky/splitty: Remove all traces
of NFFS.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 04318b86d -> 5c253ba18
slinky/splitty: Remove all traces of NFFS.
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/5c253ba1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/5c253ba1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/5c253ba1
Branch: refs/heads/develop
Commit: 5c253ba187a190016e9b58072f1c4068d3783796
Parents: 04318b8
Author: Christopher Collins <cc...@apache.org>
Authored: Wed Oct 5 10:28:52 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Wed Oct 5 10:28:52 2016 -0700
----------------------------------------------------------------------
apps/slinky/src/main.c | 22 ----------------------
apps/splitty/src/main.c | 10 ----------
2 files changed, 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5c253ba1/apps/slinky/src/main.c
----------------------------------------------------------------------
diff --git a/apps/slinky/src/main.c b/apps/slinky/src/main.c
index d24d060..f8b8793 100755
--- a/apps/slinky/src/main.c
+++ b/apps/slinky/src/main.c
@@ -33,16 +33,6 @@
#if MYNEWT_VAL(SPLIT_LOADER)
#include "split/split.h"
#endif
-#if MYNEWT_VAL(CONFIG_NFFS)
-#include <fs/fs.h>
-#include <nffs/nffs.h>
-#include <config/config_file.h>
-#elif MYNEWT_VAL(CONFIG_FCB)
-#include <fcb/fcb.h>
-#include <config/config_fcb.h>
-#else
-#error "Need NFFS or FCB for config storage"
-#endif
#include <newtmgr/newtmgr.h>
#include <bootutil/image.h>
#include <bootutil/bootutil_misc.h>
@@ -77,10 +67,6 @@ static struct os_task task2;
static struct log my_log;
-#if MYNEWT_VAL(CONFIG_NFFS)
-extern struct log nffs_log; /* defined in the OS module */
-#endif
-
static volatile int g_task2_loops;
/* Global test semaphore */
@@ -119,9 +105,6 @@ static char test_str[32];
static uint32_t cbmem_buf[MAX_CBMEM_BUF];
static struct cbmem cbmem;
-static uint32_t nffs_cbmem_buf[MAX_CBMEM_BUF];
-static struct cbmem nffs_cbmem;
-
static char *
test_conf_get(int argc, char **argv, char *buf, int max_len)
{
@@ -280,13 +263,8 @@ main(int argc, char **argv)
assert(rc == 0);
cbmem_init(&cbmem, cbmem_buf, MAX_CBMEM_BUF);
- cbmem_init(&nffs_cbmem, nffs_cbmem_buf, MAX_CBMEM_BUF);
log_register("log", &my_log, &log_cbmem_handler, &cbmem);
-#if MYNEWT_VAL(CONFIG_NFFS)
- log_register("nffs", &nffs_log, &log_cbmem_handler, &nffs_cbmem);
-#endif
-
stats_init(STATS_HDR(g_stats_gpio_toggle),
STATS_SIZE_INIT_PARMS(g_stats_gpio_toggle, STATS_SIZE_32),
STATS_NAME_INIT_PARMS(gpio_stats));
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5c253ba1/apps/splitty/src/main.c
----------------------------------------------------------------------
diff --git a/apps/splitty/src/main.c b/apps/splitty/src/main.c
index 99176ca..19f01dd 100755
--- a/apps/splitty/src/main.c
+++ b/apps/splitty/src/main.c
@@ -28,16 +28,6 @@
#include <config/config.h>
#include <hal/flash_map.h>
#include <hal/hal_system.h>
-#if MYNEWT_VAL(CONFIG_NFFS)
-#include <fs/fs.h>
-#include <nffs/nffs.h>
-#include <config/config_file.h>
-#elif MYNEWT_VAL(CONFIG_FCB)
-#include <fcb/fcb.h>
-#include <config/config_fcb.h>
-#else
-#error "Need NFFS or FCB for config storage"
-#endif
#include <newtmgr/newtmgr.h>
#include <bootutil/image.h>
#include <bootutil/bootutil_misc.h>