mehulhirpara closed pull request #160: Added fixes to make NimBLE work with
all ported OS
URL: https://github.com/apache/mynewt-nimble/pull/160
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/nimble/host/mesh/src/settings.c b/nimble/host/mesh/src/settings.c
index 189692d3..afd6e4ea 100644
--- a/nimble/host/mesh/src/settings.c
+++ b/nimble/host/mesh/src/settings.c
@@ -10,6 +10,9 @@
#define BT_DBG_ENABLED MYNEWT_VAL(BLE_MESH_DEBUG_SETTINGS)
+#include "sysinit/sysinit.h"
+#include "stdio.h"
+#include "stdlib.h"
#include "mesh/mesh.h"
#include "mesh/glue.h"
#include "net.h"
@@ -1571,9 +1574,11 @@ void bt_mesh_settings_init(void)
int rc;
rc = conf_register(&bt_mesh_settings_conf_handler);
+ if (rc != 0) {
+ BT_ERR("Failed to register bt_mesh_settings conf");
+ }
- SYSINIT_PANIC_ASSERT_MSG(rc == 0,
- "Failed to register bt_mesh_settings conf");
+ SYSINIT_PANIC_ASSERT(rc == 0);
k_delayed_work_init(&pending_store, store_pending);
}
diff --git a/porting/nimble/src/nimble_port.c b/porting/nimble/src/nimble_port.c
index bf1803cb..f46dd929 100644
--- a/porting/nimble/src/nimble_port.c
+++ b/porting/nimble/src/nimble_port.c
@@ -25,6 +25,10 @@
#include "controller/ble_ll.h"
#endif
+#if MYNEWT_VAL(BLE_MESH_SETTINGS)
+#include "config/config.h"
+#endif
+
static struct ble_npl_eventq g_eventq_dflt;
void
@@ -46,6 +50,10 @@ nimble_port_init(void)
/* XXX Need to have template for store */
ble_store_ram_init();
+#if MYNEWT_VAL(BLE_MESH_SETTINGS)
+ conf_init();
+#endif
+
#if NIMBLE_CFG_CONTROLLER
hal_timer_init(5, NULL);
os_cputime_init(32768);
diff --git a/version.yml b/version.yml
index 13e5152b..97074cd7 100644
--- a/version.yml
+++ b/version.yml
@@ -19,4 +19,4 @@
# Newt uses this file to determine the version of a checked out repo.
# This should always be 0.0.0 in the master branch.
-repo.version: 0.0.0
+repo.version: 1.0.0
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
