[GitHub] andrzej-kaczmarek closed pull request #673: nimble: Various fixes

[GitBox <gi...@apache.org>]

andrzej-kaczmarek closed pull request #673: nimble: Various fixes
URL: https://github.com/apache/mynewt-core/pull/673
 
 
   

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/net/nimble/host/mesh/include/mesh/glue.h b/net/nimble/host/mesh/include/mesh/glue.h
index 18ed6b227..ec7febcb1 100644
--- a/net/nimble/host/mesh/include/mesh/glue.h
+++ b/net/nimble/host/mesh/include/mesh/glue.h
@@ -49,7 +49,6 @@
 #define u64_t   uint64_t
 #define s64_t   int64_t
 #define s32_t   int32_t
-typedef size_t ssize_t;
 
 /** @brief Helper to declare elements of bt_data arrays
  *
diff --git a/net/nimble/host/mesh/src/beacon.c b/net/nimble/host/mesh/src/beacon.c
index 9558ae58f..ad7464a93 100644
--- a/net/nimble/host/mesh/src/beacon.c
+++ b/net/nimble/host/mesh/src/beacon.c
@@ -16,7 +16,7 @@
 #include "host/ble_hs_log.h"
 
 #include "adv.h"
-#include <mesh_priv.h>
+#include "mesh_priv.h"
 #include "net.h"
 #include "prov.h"
 #include "crypto.h"
diff --git a/net/nimble/host/services/ans/pkg.yml b/net/nimble/host/services/ans/pkg.yml
index 8a14adfe7..345c93b68 100644
--- a/net/nimble/host/services/ans/pkg.yml
+++ b/net/nimble/host/services/ans/pkg.yml
@@ -31,4 +31,4 @@ pkg.deps:
     - net/nimble/host
 
 pkg.init:
-    ble_svc_ans_init: 300
+    ble_svc_ans_init: 303
diff --git a/net/nimble/host/services/gap/pkg.yml b/net/nimble/host/services/gap/pkg.yml
index 1b1900bd4..c68acea25 100644
--- a/net/nimble/host/services/gap/pkg.yml
+++ b/net/nimble/host/services/gap/pkg.yml
@@ -31,4 +31,4 @@ pkg.deps:
     - net/nimble/host
 
 pkg.init:
-    ble_svc_gap_init: 300
+    ble_svc_gap_init: 301
diff --git a/net/nimble/host/services/gatt/pkg.yml b/net/nimble/host/services/gatt/pkg.yml
index 278d67b09..8af1c9eee 100644
--- a/net/nimble/host/services/gatt/pkg.yml
+++ b/net/nimble/host/services/gatt/pkg.yml
@@ -31,4 +31,4 @@ pkg.deps:
     - net/nimble/host
 
 pkg.init:
-    ble_svc_gatt_init: 300
+    ble_svc_gatt_init: 302
diff --git a/net/nimble/host/services/ias/pkg.yml b/net/nimble/host/services/ias/pkg.yml
index a2c674875..0af4d5c07 100644
--- a/net/nimble/host/services/ias/pkg.yml
+++ b/net/nimble/host/services/ias/pkg.yml
@@ -31,4 +31,4 @@ pkg.deps:
     - net/nimble/host
 
 pkg.init:
-    ble_svc_ias_init: 300
+    ble_svc_ias_init: 303
diff --git a/net/nimble/host/services/lls/pkg.yml b/net/nimble/host/services/lls/pkg.yml
index 0a228847c..bab70ff0c 100644
--- a/net/nimble/host/services/lls/pkg.yml
+++ b/net/nimble/host/services/lls/pkg.yml
@@ -31,4 +31,4 @@ pkg.deps:
     - net/nimble/host
 
 pkg.init:
-    ble_svc_lls_init: 300
+    ble_svc_lls_init: 303
diff --git a/net/nimble/host/services/tps/pkg.yml b/net/nimble/host/services/tps/pkg.yml
index 59e536f0a..821d389dd 100644
--- a/net/nimble/host/services/tps/pkg.yml
+++ b/net/nimble/host/services/tps/pkg.yml
@@ -31,4 +31,4 @@ pkg.deps:
     - net/nimble/host
 
 pkg.init:
-    ble_svc_tps_init: 300
+    ble_svc_tps_init: 303
diff --git a/net/nimble/host/src/ble_gap.c b/net/nimble/host/src/ble_gap.c
index ed8fb0c13..ba58f79e7 100644
--- a/net/nimble/host/src/ble_gap.c
+++ b/net/nimble/host/src/ble_gap.c
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include "bsp/bsp.h"
 #include "os/os.h"
-#include "mem/mem.h"
 #include "nimble/nimble_opt.h"
 #include "host/ble_hs_adv.h"
 #include "host/ble_hs_hci.h"
@@ -172,7 +171,9 @@ struct ble_gap_snapshot {
     void *cb_arg;
 };
 
-static void *ble_gap_update_entry_mem;
+static os_membuf_t ble_gap_update_entry_mem[
+                        OS_MEMPOOL_SIZE(BLE_GAP_MAX_UPDATE_ENTRIES,
+                                        sizeof (struct ble_gap_update_entry))];
 static struct os_mempool ble_gap_update_entry_pool;
 static struct ble_gap_update_entry_list ble_gap_update_entries;
 
@@ -4413,18 +4414,16 @@ ble_gap_init(void)
 {
     int rc;
 
-    free(ble_gap_update_entry_mem);
-
     memset(&ble_gap_master, 0, sizeof ble_gap_master);
     memset(ble_gap_slave, 0, sizeof ble_gap_slave);
 
     SLIST_INIT(&ble_gap_update_entries);
 
-    rc = mem_malloc_mempool(&ble_gap_update_entry_pool,
-                            BLE_GAP_MAX_UPDATE_ENTRIES,
-                            sizeof (struct ble_gap_update_entry),
-                            "ble_gap_update",
-                            &ble_gap_update_entry_mem);
+    rc = os_mempool_init(&ble_gap_update_entry_pool,
+                         BLE_GAP_MAX_UPDATE_ENTRIES,
+                         sizeof (struct ble_gap_update_entry),
+                         ble_gap_update_entry_mem,
+                         "ble_gap_update");
     switch (rc) {
     case 0:
         break;
@@ -4446,8 +4445,5 @@ ble_gap_init(void)
     return 0;
 
 err:
-    free(ble_gap_update_entry_mem);
-    ble_gap_update_entry_mem = NULL;
-
     return rc;
 }


 

----------------------------------------------------------------
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:
users@infra.apache.org


With regards,
Apache Git Services