[mynewt-nimble] branch master updated: porting: cleanup porting_init()

[hauke]

This is an automated email from the ASF dual-hosted git repository.

hauke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


The following commit(s) were added to refs/heads/master by this push:
     new cd6da7f  porting: cleanup porting_init()
cd6da7f is described below

commit cd6da7f680b7e080a22ad5700b10c2d9f8cf3c5d
Author: Hauke Petersen <hauke.peter...@fu-berlin.de>
AuthorDate: Thu Jun 4 17:30:03 2020 +0200

    porting: cleanup porting_init()
    
    - code simplification
    - add some more comments
    - call ble_hci_ram_init() before ble_ll_init() to make sure the
      buffers are intialized before they are potentially used
---
 porting/nimble/src/nimble_port.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/porting/nimble/src/nimble_port.c b/porting/nimble/src/nimble_port.c
index 1bad96d..06b5f6d 100644
--- a/porting/nimble/src/nimble_port.c
+++ b/porting/nimble/src/nimble_port.c
@@ -24,31 +24,28 @@
 #include "nimble/nimble_port.h"
 #if NIMBLE_CFG_CONTROLLER
 #include "controller/ble_ll.h"
+#include "transport/ram/ble_hci_ram.h"
 #endif
 
 static struct ble_npl_eventq g_eventq_dflt;
 
+extern void os_msys_init(void);
+
 void
 nimble_port_init(void)
 {
-    void os_msys_init(void);
-
-#if NIMBLE_CFG_CONTROLLER
-    void ble_hci_ram_init(void);
-#endif
-
     /* Initialize default event queue */
     ble_npl_eventq_init(&g_eventq_dflt);
-
+    /* Initialize the global memory pool */
     os_msys_init();
-
+    /* Initialize the host */
     ble_hs_init();
 
 #if NIMBLE_CFG_CONTROLLER
+    ble_hci_ram_init();
     hal_timer_init(5, NULL);
     os_cputime_init(32768);
     ble_ll_init();
-    ble_hci_ram_init();
 #endif
 }