You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by an...@apache.org on 2019/07/24 22:32:16 UTC
[mynewt-nimble] 01/02: nimble/ll: Fix initialization order
This is an automated email from the ASF dual-hosted git repository.
andk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 70142326fdc4e84405cb9c0e0fc796ac4d340758
Author: Andrzej Kaczmarek <an...@codecoup.pl>
AuthorDate: Wed Jul 24 12:17:26 2019 +0200
nimble/ll: Fix initialization order
Transport should be configured before sending nop.
Since transport is configured after os_task_init, it won't happen until
ble_ll_task sleeps on eventq. This means LL will send nop without
transport configured, which depending on transport may or may not work.
os_task_init should be the last step of LL init and transport should be
registered just before nop is sent.
---
nimble/controller/src/ble_ll.c | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/nimble/controller/src/ble_ll.c b/nimble/controller/src/ble_ll.c
index 94ab950..d59acf5 100644
--- a/nimble/controller/src/ble_ll.c
+++ b/nimble/controller/src/ble_ll.c
@@ -1155,6 +1155,9 @@ ble_ll_task(void *arg)
/* Set output power to 1mW (0 dBm) */
ble_phy_txpwr_set(MYNEWT_VAL(BLE_LL_TX_PWR_DBM));
+ /* Register callback for transport */
+ ble_hci_trans_cfg_ll(ble_ll_hci_cmd_rx, NULL, ble_ll_hci_acl_rx, NULL);
+
/* Tell the host that we are ready to receive packets */
ble_ll_hci_send_noop();
@@ -1619,6 +1622,16 @@ ble_ll_init(void)
lldata->ll_supp_features = features;
+ rc = stats_init_and_reg(STATS_HDR(ble_ll_stats),
+ STATS_SIZE_INIT_PARMS(ble_ll_stats, STATS_SIZE_32),
+ STATS_NAME_INIT_PARMS(ble_ll_stats),
+ "ble_ll");
+ SYSINIT_PANIC_ASSERT(rc == 0);
+
+#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
+ ble_ll_dtm_init();
+#endif
+
#if MYNEWT
/* Initialize the LL task */
os_task_init(&g_ble_ll_task, "ble_ll", ble_ll_task, NULL,
@@ -1632,16 +1645,4 @@ ble_ll_init(void)
*/
#endif
-
- rc = stats_init_and_reg(STATS_HDR(ble_ll_stats),
- STATS_SIZE_INIT_PARMS(ble_ll_stats, STATS_SIZE_32),
- STATS_NAME_INIT_PARMS(ble_ll_stats),
- "ble_ll");
- SYSINIT_PANIC_ASSERT(rc == 0);
-
- ble_hci_trans_cfg_ll(ble_ll_hci_cmd_rx, NULL, ble_ll_hci_acl_rx, NULL);
-
-#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
- ble_ll_dtm_init();
-#endif
}