This is an automated email from the ASF dual-hosted git repository. janc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit 421e1c051c5999d950ece6da1b0f0fd9a2aed02a Author: Szymon Janc <[email protected]> AuthorDate: Thu Feb 19 16:51:58 2026 +0100 nimble: Remove deprecated and defunced configuration options Those are deprecated for quite a long time already and shall not be used anymore. --- babblesim/hw/mcu/nordic/nrf52_bsim/syscfg.yml | 49 ------------ babblesim/targets/blehci/syscfg.yml | 2 +- babblesim/targets/edtthci/syscfg.yml | 2 +- nimble/controller/src/ble_ll.c | 2 - nimble/controller/syscfg.defunct.yml | 106 -------------------------- nimble/controller/syscfg.yml | 26 +++---- nimble/transport/syscfg.defunct.yml | 40 ---------- nimble/transport/syscfg.yml | 3 +- 8 files changed, 15 insertions(+), 215 deletions(-) diff --git a/babblesim/hw/mcu/nordic/nrf52_bsim/syscfg.yml b/babblesim/hw/mcu/nordic/nrf52_bsim/syscfg.yml index d6b669590..4f6711b57 100644 --- a/babblesim/hw/mcu/nordic/nrf52_bsim/syscfg.yml +++ b/babblesim/hw/mcu/nordic/nrf52_bsim/syscfg.yml @@ -415,43 +415,6 @@ syscfg.defs: description: 'Enable pin reset' value: 0 -# Deprecated settings - - MCU_NRF52832: - description: Use MCU_TARGET instead - value: 0 - restrictions: - - "!MCU_NRF52840" - deprecated: 1 - MCU_NRF52840: - description: Use MCU_TARGET instead - value: 0 - restrictions: - - "!MCU_NRF52832" - deprecated: 1 - - XTAL_32768: - description: Use MCU_LFCLK_SOURCE instead - value: 0 - restrictions: - - "!XTAL_RC" - - "!XTAL_32768_SYNTH" - deprecated: 1 - XTAL_RC: - description: Use MCU_LFCLK_SOURCE instead - value: 0 - restrictions: - - "!XTAL_32768" - - "!XTAL_32768_SYNTH" - deprecated: 1 - XTAL_32768_SYNTH: - description: Use MCU_LFCLK_SOURCE instead - value: 0 - restrictions: - - "!XTAL_32768" - - "!XTAL_RC" - deprecated: 1 - MCU_NATIVE_USE_SIGNALS: description: > Whether to use POSIX signals to implement context switches. Valid @@ -499,18 +462,6 @@ syscfg.defs: syscfg.vals: OS_TICKS_PER_SEC: 128 -syscfg.vals.MCU_NRF52832: - MCU_TARGET: nRF52832 -syscfg.vals.MCU_NRF52840: - MCU_TARGET: nRF52840 - -syscfg.vals.XTAL_32768: - MCU_LFCLK_SOURCE: LFXO -syscfg.vals.XTAL_RC: - MCU_LFCLK_SOURCE: LFRC -syscfg.vals.XTAL_32768_SYNTH: - MCU_LFCLK_SOURCE: LFSYNTH - syscfg.restrictions: - "!I2C_0 || (I2C_0_PIN_SCL && I2C_0_PIN_SDA)" - "!I2C_1 || (I2C_1_PIN_SCL && I2C_1_PIN_SDA)" diff --git a/babblesim/targets/blehci/syscfg.yml b/babblesim/targets/blehci/syscfg.yml index 14a909e91..82fedc37a 100644 --- a/babblesim/targets/blehci/syscfg.yml +++ b/babblesim/targets/blehci/syscfg.yml @@ -18,4 +18,4 @@ syscfg.vals: BLE_LL_PUBLIC_DEV_ADDR: 0xbabb1e000001 - BLE_HCI_TRANSPORT_HS: uart + BLE_TRANSPORT_HS: uart diff --git a/babblesim/targets/edtthci/syscfg.yml b/babblesim/targets/edtthci/syscfg.yml index 6b32ddc65..54b435289 100644 --- a/babblesim/targets/edtthci/syscfg.yml +++ b/babblesim/targets/edtthci/syscfg.yml @@ -29,7 +29,7 @@ syscfg.vals: BLE_LL_HCI_VS_EVENT_ON_ASSERT: 0 BLE_LL_CFG_FEAT_LE_ENCRYPTION: 1 BLE_LL_CFG_FEAT_CONN_PARAM_REQ: 1 - BLE_LL_CFG_FEAT_SLAVE_INIT_FEAT_XCHG: 1 + BLE_LL_CFG_FEAT_PERIPH_INIT_FEAT_XCHG: 1 BLE_LL_CFG_FEAT_LE_PING: 1 BLE_LL_CFG_FEAT_DATA_LEN_EXT: 1 BLE_LL_CFG_FEAT_LL_PRIVACY: 1 diff --git a/nimble/controller/src/ble_ll.c b/nimble/controller/src/ble_ll.c index a0d6dbbc0..bff525da7 100644 --- a/nimble/controller/src/ble_ll.c +++ b/nimble/controller/src/ble_ll.c @@ -1810,8 +1810,6 @@ ble_ll_init(void) g_dev_addr[i] = pub_dev_addr & 0xff; pub_dev_addr >>= 8; } -#else - memcpy(g_dev_addr, MYNEWT_VAL(BLE_PUBLIC_DEV_ADDR), BLE_DEV_ADDR_LEN); #endif if (ble_ll_is_addr_empty(g_dev_addr)) { rc = ble_hw_get_public_addr(&addr); diff --git a/nimble/controller/syscfg.defunct.yml b/nimble/controller/syscfg.defunct.yml deleted file mode 100644 index 239861287..000000000 --- a/nimble/controller/syscfg.defunct.yml +++ /dev/null @@ -1,106 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -syscfg.defs: -# deprecated settings (to be defunct/removed eventually) - BLE_LL_DIRECT_TEST_MODE: - description: use BLE_LL_DTM instead - value: 0 - deprecated: 1 - BLE_XTAL_SETTLE_TIME: - description: use BLE_LL_RFMGMT_ENABLE_TIME instead - value: 0 - deprecated: 1 - BLE_LL_OUR_SCA: - description: use BLE_LL_SCA instead - value: 60 - deprecated: 1 - BLE_LL_VND_EVENT_ON_ASSERT: - description: use BLE_LL_HCI_VS_EVENT_ON_ASSERT - value: 0 - deprecated: 1 - BLE_PUBLIC_DEV_ADDR: - description: use BLE_LL_PUBLIC_DEV_ADDR - value: "(uint8_t[6]){0x00, 0x00, 0x00, 0x00, 0x00, 0x00}" - deprecated: 1 - BLE_LL_EXT_ADV_AUX_PTR_CNT: - description: use BLE_LL_SCAN_AUX_SEGMENT_CNT - value: 0 - deprecated: 1 - BLE_LL_MFRG_ID: - description: use BLE_LL_MANUFACTURER_ID - value: 0x0B65 - deprecated: 1 - BLE_LL_PA: - description: use BLE_FEM_PA - value: 0 - deprecated: 1 - BLE_LL_PA_GPIO: - description: use BLE_FEM_PA_GPIO - value: -1 - deprecated: 1 - BLE_LL_PA_TURN_ON_US: - description: use BLE_FEM_PA_TURN_ON_US - value: 1 - deprecated: 1 - BLE_LL_LNA: - description: use BLE_FEM_LNA - value: 0 - deprecated: 1 - BLE_LL_LNA_GPIO: - description: use BLE_FEM_LNA_GPIO - value: -1 - deprecated: 1 - BLE_LL_LNA_TURN_ON_US: - description: use BLE_FEM_LNA_TURN_ON_US - value: 1 - deprecated: 1 - -# defunct settings (to be removed eventually) - BLE_DEVICE: - description: Superseded by BLE_CONTROLLER - value: 1 - defunct: 1 - BLE_LP_CLOCK: - description: Superseded by BLE_CONTROLLER - value: 1 - defunct: 1 - BLE_NUM_COMP_PKT_RATE: - description: Superseded by BLE_LL_NUM_COMP_PKT_ITVL_MS - value: '(2 * OS_TICKS_PER_SEC)' - defunct: 1 - BLE_LL_MASTER_SCA: - description: use BLE_LL_SCA instead - value: 4 - defunct: 1 - BLE_LL_CFG_FEAT_SLAVE_INIT_FEAT_XCHG: - description: Superseded by BLE_LL_CFG_FEAT_PERIPH_INIT_FEAT_XCHG - value: 0 - defaunt: 1 - BLE_LL_STRICT_CONN_SCHEDULING: - description: Superseded by BLE_LL_CONN_STRICT_SCHED - value: 0 - defunct: 1 - BLE_LL_ADD_STRICT_SCHED_PERIODS: - description: Superseded by BLE_LL_CONN_STRICT_SCHED - value: 0 - defunct: 1 - BLE_LL_USECS_PER_PERIOD: - description: Superseded by BLE_LL_CONN_STRICT_SCHED - value: 0 - defunct: 1 diff --git a/nimble/controller/syscfg.yml b/nimble/controller/syscfg.yml index 517cfe0fd..0f636f50f 100644 --- a/nimble/controller/syscfg.yml +++ b/nimble/controller/syscfg.yml @@ -60,7 +60,7 @@ syscfg.defs: BLE_LL_SCA: description: Sleep clock accuracy of our device (in ppm) - value: MYNEWT_VAL(BLE_LL_OUR_SCA) + value: 60 range: 0..500 BLE_LL_TX_PWR_DBM: @@ -86,7 +86,7 @@ syscfg.defs: BLE_LL_MANUFACTURER_ID: description: > Manufacturer ID, as assigned by Bluetooth SIG - value: MYNEWT_VAL(BLE_LL_MFRG_ID) + value: 0x0B65 # Configuration items for the number of duplicate advertisers and the # number of advertisers from which we have heard a scan response. @@ -219,7 +219,7 @@ syscfg.defs: - nrf52 - time required for XTAL to settle Value is specified in microseconds. If set to 0, rfmgmt keeps PHY enabled all the time. - value: MYNEWT_VAL(BLE_XTAL_SETTLE_TIME) + value: 0 BLE_LL_HCI_LLCP_TRACE: description: > @@ -375,7 +375,7 @@ syscfg.defs: description: > Number of auxiliary advertising segments that can be scanned concurrently (Core 5.2, Vol 6, Part B, 4.4.2.2.2). - value: MYNEWT_VAL(BLE_LL_EXT_ADV_AUX_PTR_CNT) + value: 0 BLE_LL_SCAN_ACTIVE_SCAN_NRPA: description: > @@ -398,7 +398,7 @@ syscfg.defs: BLE_LL_DTM: description: > Enables HCI Test commands needed for Bluetooth SIG certification - value: MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE) + value: 0 BLE_LL_DTM_EXTENSIONS: description: > Enables non-standard extensions to HCI test commands. Once enabled, @@ -457,11 +457,11 @@ 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: MYNEWT_VAL(BLE_LL_VND_EVENT_ON_ASSERT) + value: 0 BLE_FEM_PA: description: Enable FEM PA support - value: MYNEWT_VAL(BLE_LL_PA) + value: 0 BLE_FEM_PA_GAIN: description: PA fixed TX gain (in dBm). value: 0 @@ -475,14 +475,14 @@ syscfg.defs: description: > GPIO pin number to control PA. Pin is set to high state when PA should be enabled. - value: MYNEWT_VAL(BLE_LL_PA_GPIO) + value: -1 BLE_FEM_PA_TURN_ON_US: description: > Time required for PA to turn on, in microseconds. - value: MYNEWT_VAL(BLE_LL_PA_TURN_ON_US) + value: 1 BLE_FEM_LNA: description: Enable LNA support - value: MYNEWT_VAL(BLE_LL_LNA) + value: 0 BLE_FEM_LNA_GAIN: description: LNA fixed RX gain (in dBm). value: 0 @@ -496,11 +496,11 @@ syscfg.defs: description: > GPIO pin number to control LNA. Pin is set to high state when LNA should be enabled. - value: MYNEWT_VAL(BLE_LL_LNA_GPIO) + value: -1 BLE_FEM_LNA_TURN_ON_US: description: > Time required for LNA to turn on, in microseconds. - value: MYNEWT_VAL(BLE_LL_LNA_TURN_ON_US) + value: 1 BLE_FEM_ANTENNA: description: > Enable support for runtime antenna selection in FEM. @@ -692,7 +692,5 @@ syscfg.restrictions: - BLE_FEM_LNA == 0 || BLE_FEM_LNA_GPIO >= 0 $import: - # defunct and deprecated settings - - "@apache-mynewt-nimble/nimble/controller/syscfg.defunct.yml" # "Here be dragons" settings - "@apache-mynewt-nimble/nimble/controller/syscfg.hbd.yml" diff --git a/nimble/transport/syscfg.defunct.yml b/nimble/transport/syscfg.defunct.yml deleted file mode 100644 index dc18ef415..000000000 --- a/nimble/transport/syscfg.defunct.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -syscfg.defs: - BLE_HCI_TRANSPORT: - description: see doc/transport.md - defunct: 1 - BLE_HCI_BRIDGE: - description: see doc/transport.md - defunct: 1 - BLE_HCI_EVT_HI_BUF_COUNT: - description: use BLE_TRANSPORT_EVT_COUNT - defunct: 1 - BLE_HCI_EVT_LO_BUF_COUNT: - description: use BLE_TRANSPORT_EVT_DISCARDABLE_COUNT - defunct: 1 - BLE_HCI_EVT_BUF_SIZE: - description: use BLE_TRANSPORT_EVT_SIZE - defunct: 1 - BLE_ACL_BUF_COUNT: - description: use BLE_TRANSPORT_ACL_COUNT - defunct: 1 - BLE_ACL_BUF_SIZE: - description: use BLE_TRANSPORT_ACL_SIZE - defunct: 1 diff --git a/nimble/transport/syscfg.yml b/nimble/transport/syscfg.yml index c2b9ec1e9..b8a6ca0e6 100644 --- a/nimble/transport/syscfg.yml +++ b/nimble/transport/syscfg.yml @@ -124,10 +124,9 @@ syscfg.defs.BLE_TRANSPORT_RX_TASK_STACK_SIZE: restrictions: $notnull value: -# import monitor and defunct settings from separate file to reduce clutter in main file +# import monitor settings from separate file to reduce clutter in main file $import: - "@apache-mynewt-nimble/nimble/transport/syscfg.monitor.yml" - - "@apache-mynewt-nimble/nimble/transport/syscfg.defunct.yml" syscfg.vals.'BLE_EXT_ADV || BLE_LL_CFG_FEAT_LL_EXT_ADV': BLE_TRANSPORT_EVT_SIZE: 257
