From 323aee97a2ad1f96e91ce1163ed72ad4bb8eb350 Mon Sep 17 00:00:00 2001 From: Andrzej Kaczmarek Date: Fri, 27 Sep 2019 20:04:52 +0200 Subject: [PATCH] nimble/ll: Rename DTM syscfg --- nimble/controller/src/ble_ll_dtm.c | 2 +- nimble/controller/src/ble_ll_hci.c | 2 +- nimble/controller/syscfg.yml | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/nimble/controller/src/ble_ll_dtm.c b/nimble/controller/src/ble_ll_dtm.c index 70a6ab2e0..4a92d8efa 100644 --- a/nimble/controller/src/ble_ll_dtm.c +++ b/nimble/controller/src/ble_ll_dtm.c @@ -20,7 +20,7 @@ #include "syscfg/syscfg.h" #include "sysinit/sysinit.h" -#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) +#if MYNEWT_VAL(BLE_LL_DTM) #include #include "os/os.h" diff --git a/nimble/controller/src/ble_ll_hci.c b/nimble/controller/src/ble_ll_hci.c index 18daf5354..c809a5ac5 100644 --- a/nimble/controller/src/ble_ll_hci.c +++ b/nimble/controller/src/ble_ll_hci.c @@ -980,7 +980,7 @@ ble_ll_hci_le_cmd_proc(uint8_t *cmdbuf, uint16_t ocf, uint8_t *rsplen, rc = ble_ll_hci_le_read_supp_states(rspbuf, rsplen); } break; -#if MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) +#if MYNEWT_VAL(BLE_LL_DTM) case BLE_HCI_OCF_LE_TX_TEST: if (len == BLE_HCI_TX_TEST_LEN) { rc = ble_ll_dtm_tx_test(cmdbuf, false); diff --git a/nimble/controller/syscfg.yml b/nimble/controller/syscfg.yml index 40b2e0f6e..91b4bdc8a 100644 --- a/nimble/controller/syscfg.yml +++ b/nimble/controller/syscfg.yml @@ -292,10 +292,10 @@ syscfg.defs: be used. value: "(uint8_t[6]){0x00, 0x00, 0x00, 0x00, 0x00, 0x00}" - BLE_LL_DIRECT_TEST_MODE: + BLE_LL_DTM: description: > Enables HCI Test commands needed for Bluetooth SIG certification - value: 0 + value: MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) BLE_LL_VND_EVENT_ON_ASSERT: description: > @@ -322,6 +322,11 @@ syscfg.defs: was sent from controller. value: -1 +# deprecated settings (to be defunct/removed eventually) + BLE_LL_DIRECT_TEST_MODE: + description: use BLE_LL_DTM instead + value: 0 + # defunct settings (to be removed eventually) BLE_DEVICE: description: Superseded by BLE_CONTROLLER