commit dd7ebf179f351a403027d1b216049d1a5b88e2cd
author Szymon Janc <szymon.janc@codecoup.pl> Mon Apr 12 00:13:05 2021 +0200
committer Szymon Janc <szymon.janc@codecoup.pl> Mon Apr 12 11:02:11 2021 +0200
tree cc1fbb021a326423b6e62dfdaf088759de0d4c0a
parent 250cd70c6b2c27b2ce9ee083186511c6aaa96e80

porting: Fix mempool initialization

This fix crash on init due to changes in mmepool init after recent
sync with core.

porting/examples/linux/main.c

diff --git a/porting/examples/linux/main.c b/porting/examples/linux/main.c
index 86b6fb9..a2e255d 100644
--- a/porting/examples/linux/main.c
+++ b/porting/examples/linux/main.c
@@ -65,8 +65,8 @@
         ble_hci_sock_set_device(atoi(argv[1]));
     }
 
-    ble_hci_sock_init();
     nimble_port_init();
+    ble_hci_sock_init();
 
     /* This example provides GATT Alert service */
     ble_svc_gap_init();

porting/examples/linux_blemesh/main.c

diff --git a/porting/examples/linux_blemesh/main.c b/porting/examples/linux_blemesh/main.c
index 0913551..f5c5e4f 100644
--- a/porting/examples/linux_blemesh/main.c
+++ b/porting/examples/linux_blemesh/main.c
@@ -77,8 +77,8 @@
         ble_hci_sock_set_device(atoi(argv[1]));
     }
 
-    ble_hci_sock_init();
     nimble_port_init();
+    ble_hci_sock_init();
 
     ble_svc_gap_init();
     ble_svc_gatt_init();

porting/examples/nuttx/main.c

diff --git a/porting/examples/nuttx/main.c b/porting/examples/nuttx/main.c
index acfc9fc..8258257 100644
--- a/porting/examples/nuttx/main.c
+++ b/porting/examples/nuttx/main.c
@@ -71,11 +71,12 @@
         ble_hci_sock_set_device(atoi(argv[1]));
     }
 
-    printf("hci init\n");
-    ble_hci_sock_init();
     printf("port init\n");
     nimble_port_init();
 
+    printf("hci init\n");
+    ble_hci_sock_init();
+
     /* This example provides GATT Alert service */
     printf("gap init\n");
     ble_svc_gap_init();

porting/nimble/src/nimble_port.c

diff --git a/porting/nimble/src/nimble_port.c b/porting/nimble/src/nimble_port.c
index 06b5f6d..484e379 100644
--- a/porting/nimble/src/nimble_port.c
+++ b/porting/nimble/src/nimble_port.c
@@ -30,6 +30,7 @@
 static struct ble_npl_eventq g_eventq_dflt;
 
 extern void os_msys_init(void);
+extern void os_mempool_module_init(void);
 
 void
 nimble_port_init(void)
@@ -37,6 +38,7 @@
     /* Initialize default event queue */
     ble_npl_eventq_init(&g_eventq_dflt);
     /* Initialize the global memory pool */
+    os_mempool_module_init();
     os_msys_init();
     /* Initialize the host */
     ble_hs_init();