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 2016/10/24 23:34:51 UTC
incubator-mynewt-core git commit: ffs2native; get this to build again.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop e4e98aad1 -> 87fe2727d
ffs2native; get this to build again.
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/87fe2727
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/87fe2727
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/87fe2727
Branch: refs/heads/develop
Commit: 87fe2727dd9aab8dbd4e28f88d67172381ce1d4b
Parents: e4e98aa
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Mon Oct 24 16:34:04 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Mon Oct 24 16:34:40 2016 -0700
----------------------------------------------------------------------
apps/ffs2native/src/main.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/87fe2727/apps/ffs2native/src/main.c
----------------------------------------------------------------------
diff --git a/apps/ffs2native/src/main.c b/apps/ffs2native/src/main.c
index 5c322c4..fce739f 100644
--- a/apps/ffs2native/src/main.c
+++ b/apps/ffs2native/src/main.c
@@ -6,7 +6,7 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
@@ -31,6 +31,11 @@
#include <nffs/nffs.h>
#include <hal/hal_flash.h>
#include <flash_map/flash_map.h>
+
+#include <sysinit/sysinit.h>
+#include <syscfg/syscfg.h>
+#include <sysflash/sysflash.h>
+
#ifdef ARCH_sim
#include <mcu/mcu_sim.h>
#endif
@@ -634,7 +639,7 @@ main(int argc, char **argv)
int cnt;
struct stat st;
int standalone = 0;
-
+
progname = argv[0];
force_version = -1;
@@ -691,7 +696,8 @@ main(int argc, char **argv)
return 0;
}
- rc = nffs_misc_desc_from_flash_area(FLASH_AREA_NFFS, &cnt, area_descs);
+ rc = nffs_misc_desc_from_flash_area(MYNEWT_VAL(NFFS_FLASH_AREA), &cnt,
+ area_descs);
assert(rc == 0);
if (copy_in_dir) {