From 0aa6ed4cf5154113580165312674ab6dac1254d8 Mon Sep 17 00:00:00 2001 From: Andrzej Kaczmarek Date: Wed, 26 Jan 2022 17:55:38 +0100 Subject: [PATCH] nimble/ll: Fix HCI event on assert We should use new syscfg in BLE_LL_ASSERT macro definition. Also let's use value of old syscfg as default value for new one since the old one is deprecated, not defunct (yet). --- nimble/controller/include/controller/ble_ll.h | 2 +- nimble/controller/syscfg.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nimble/controller/include/controller/ble_ll.h b/nimble/controller/include/controller/ble_ll.h index 898907a19..f4b8517a8 100644 --- a/nimble/controller/include/controller/ble_ll.h +++ b/nimble/controller/include/controller/ble_ll.h @@ -39,7 +39,7 @@ extern "C" { #error 32.768kHz clock required #endif -#if defined(MYNEWT) && MYNEWT_VAL(BLE_LL_VND_EVENT_ON_ASSERT) +#if defined(MYNEWT) && MYNEWT_VAL(BLE_LL_HCI_VS_EVENT_ON_ASSERT) #ifdef NDEBUG #define BLE_LL_ASSERT(cond) (void(0)) #else diff --git a/nimble/controller/syscfg.yml b/nimble/controller/syscfg.yml index afb385970..bb4631195 100644 --- a/nimble/controller/syscfg.yml +++ b/nimble/controller/syscfg.yml @@ -375,7 +375,7 @@ syscfg.defs: This options enables controller to send a vendor-specific event on an assertion in controller code. The event contains file name and line number where assertion occured. - value: 0 + value: MYNEWT_VAL(BLE_LL_VND_EVENT_ON_ASSERT) BLE_LL_PA: description: Enable PA support