You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ja...@apache.org on 2026/03/17 13:31:23 UTC

(mynewt-nimble) branch master updated (6254b65e3 -> 1eb27aa99)

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

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


    from 6254b65e3 nimble/ll: Aply min window offset when CSS is enabled
     new 421e1c051 nimble: Remove deprecated and defunced configuration options
     new ba05f6406 nimble/host: Remove deprecated API
     new ecb8c0da5 nimble/store: Remove deprecated ram storage
     new 1eb27aa99 doc: Update documentation with non-deprecated options

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 babblesim/hw/mcu/nordic/nrf52_bsim/syscfg.yml      |  49 --
 babblesim/targets/blehci/syscfg.yml                |   2 +-
 babblesim/targets/edtthci/syscfg.yml               |   2 +-
 docs/ble_setup/ble_addr.rst                        |   6 +-
 docs/ble_setup/ble_lp_clock.rst                    |  16 +-
 nimble/controller/src/ble_ll.c                     |   2 -
 nimble/controller/syscfg.defunct.yml               | 106 ----
 nimble/controller/syscfg.yml                       |  26 +-
 nimble/drivers/dialog_cmac/README.md               |   2 +-
 nimble/host/include/host/ble_gap.h                 |   4 -
 nimble/host/include/host/ble_gatt.h                |  48 --
 nimble/host/src/ble_gattc.c                        |  38 --
 .../store/ram/include/store/ram/ble_store_ram.h    |  44 --
 nimble/host/store/ram/pkg.yml                      |  37 --
 nimble/host/store/ram/src/ble_store_ram.c          | 542 ---------------------
 nimble/host/store/ram/syscfg.yml                   |  32 --
 nimble/transport/syscfg.defunct.yml                |  40 --
 nimble/transport/syscfg.yml                        |   3 +-
 porting/examples/linux/main.c                      |   4 +-
 porting/examples/linux_blemesh/main.c              |   4 +-
 porting/examples/linux_blemesh_shell/src/main.c    |   4 +-
 porting/examples/nuttx/main.c                      |   4 +-
 porting/nimble/Makefile.defs                       |   4 +-
 23 files changed, 37 insertions(+), 982 deletions(-)
 delete mode 100644 nimble/controller/syscfg.defunct.yml
 delete mode 100644 nimble/host/store/ram/include/store/ram/ble_store_ram.h
 delete mode 100644 nimble/host/store/ram/pkg.yml
 delete mode 100644 nimble/host/store/ram/src/ble_store_ram.c
 delete mode 100644 nimble/host/store/ram/syscfg.yml
 delete mode 100644 nimble/transport/syscfg.defunct.yml


(mynewt-nimble) 03/04: nimble/store: Remove deprecated ram storage

Posted by ja...@apache.org.
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 ecb8c0da52bc19644de2bcb1057a83f094578436
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Fri Feb 20 10:20:54 2026 +0100

    nimble/store: Remove deprecated ram storage
    
    This is deprecated for quite some time and store/config shall be used
    instead (BLE_STORE_CONFIG_PERSIST set to 0).
---
 .../store/ram/include/store/ram/ble_store_ram.h    |  44 --
 nimble/host/store/ram/pkg.yml                      |  37 --
 nimble/host/store/ram/src/ble_store_ram.c          | 542 ---------------------
 nimble/host/store/ram/syscfg.yml                   |  32 --
 porting/examples/linux/main.c                      |   4 +-
 porting/examples/linux_blemesh/main.c              |   4 +-
 porting/examples/linux_blemesh_shell/src/main.c    |   4 +-
 porting/examples/nuttx/main.c                      |   4 +-
 porting/nimble/Makefile.defs                       |   4 +-
 9 files changed, 10 insertions(+), 665 deletions(-)

diff --git a/nimble/host/store/ram/include/store/ram/ble_store_ram.h b/nimble/host/store/ram/include/store/ram/ble_store_ram.h
deleted file mode 100644
index 19372f171..000000000
--- a/nimble/host/store/ram/include/store/ram/ble_store_ram.h
+++ /dev/null
@@ -1,44 +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.
- */
-
-/* This package has been deprecated and you should
- * use the store/config package. For a RAM-only BLE store,
- * use store/config and set BLE_STORE_CONFIG_PERSIST to 0.
- */
-
-#ifndef H_BLE_STORE_RAM_
-#define H_BLE_STORE_RAM_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-union ble_store_key;
-union ble_store_value;
-
-int ble_store_ram_read(int obj_type, const union ble_store_key *key,
-                       union ble_store_value *value);
-int ble_store_ram_write(int obj_type, const union ble_store_value *val);
-int ble_store_ram_delete(int obj_type, const union ble_store_key *key);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/nimble/host/store/ram/pkg.yml b/nimble/host/store/ram/pkg.yml
deleted file mode 100644
index 68765fddf..000000000
--- a/nimble/host/store/ram/pkg.yml
+++ /dev/null
@@ -1,37 +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.
-#
-
-pkg.name: nimble/host/store/ram
-pkg.description: >
-    DEPRECATED; for a RAM-only BLE store, use store/config and set
-    BLE_STORE_CONFIG_PERSIST to 0.  RAM-based persistence layer for the NimBLE
-    host.
-pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
-pkg.homepage: "http://mynewt.apache.org/"
-pkg.keywords:
-    - ble
-    - bluetooth
-    - nimble
-    - persistence
-
-pkg.deps:
-    - nimble/host
-
-pkg.init:
-    ble_store_ram_init: 'MYNEWT_VAL(BLE_STORE_RAM_SYSINIT_STAGE)'
diff --git a/nimble/host/store/ram/src/ble_store_ram.c b/nimble/host/store/ram/src/ble_store_ram.c
deleted file mode 100644
index 9359f6d39..000000000
--- a/nimble/host/store/ram/src/ble_store_ram.c
+++ /dev/null
@@ -1,542 +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.
- */
-
-/**
- * This file implements a simple in-RAM key database for BLE host security
- * material and CCCDs.  As this database is only ble_store_ramd in RAM, its
- * contents are lost when the application terminates.
- */
-
-/* This package has been deprecated and you should
- * use the store/config package. For a RAM-only BLE store,
- * use store/config and set BLE_STORE_CONFIG_PERSIST to 0.
- */
-
-#include <inttypes.h>
-#include <string.h>
-
-#include "sysinit/sysinit.h"
-#include "syscfg/syscfg.h"
-#include "host/ble_hs.h"
-#include "store/ram/ble_store_ram.h"
-
-#if MYNEWT_VAL(BLE_STORE_MAX_BONDS)
-static struct ble_store_value_sec
-    ble_store_ram_our_secs[MYNEWT_VAL(BLE_STORE_MAX_BONDS)];
-#endif
-
-static int ble_store_ram_num_our_secs;
-
-#if MYNEWT_VAL(BLE_STORE_MAX_BONDS)
-static struct ble_store_value_sec
-    ble_store_ram_peer_secs[MYNEWT_VAL(BLE_STORE_MAX_BONDS)];
-#endif
-
-static int ble_store_ram_num_peer_secs;
-
-#if MYNEWT_VAL(BLE_STORE_MAX_CCCDS)
-static struct ble_store_value_cccd
-    ble_store_ram_cccds[MYNEWT_VAL(BLE_STORE_MAX_CCCDS)];
-#endif
-
-static int ble_store_ram_num_cccds;
-
-/*****************************************************************************
- * $sec                                                                      *
- *****************************************************************************/
-
-#if MYNEWT_VAL(BLE_STORE_MAX_BONDS)
-static void
-ble_store_ram_print_value_sec(const struct ble_store_value_sec *sec)
-{
-    if (sec->ltk_present) {
-        BLE_HS_LOG(DEBUG, "ediv=%u rand=%llu authenticated=%d ltk=",
-                       sec->ediv, sec->rand_num, sec->authenticated);
-        ble_hs_log_flat_buf(sec->ltk, 16);
-        BLE_HS_LOG(DEBUG, " ");
-    }
-    if (sec->irk_present) {
-        BLE_HS_LOG(DEBUG, "irk=");
-        ble_hs_log_flat_buf(sec->irk, 16);
-        BLE_HS_LOG(DEBUG, " ");
-    }
-    if (sec->csrk_present) {
-        BLE_HS_LOG(DEBUG, "csrk=");
-        ble_hs_log_flat_buf(sec->csrk, 16);
-        BLE_HS_LOG(DEBUG, " ");
-    }
-
-    BLE_HS_LOG(DEBUG, "\n");
-}
-#endif
-
-static void
-ble_store_ram_print_key_sec(const struct ble_store_key_sec *key_sec)
-{
-    if (ble_addr_cmp(&key_sec->peer_addr, BLE_ADDR_ANY)) {
-        BLE_HS_LOG(DEBUG, "peer_addr_type=%d peer_addr=",
-                       key_sec->peer_addr.type);
-        ble_hs_log_flat_buf(key_sec->peer_addr.val, 6);
-        BLE_HS_LOG(DEBUG, " ");
-    }
-}
-
-#if MYNEWT_VAL(BLE_STORE_MAX_BONDS)
-static int
-ble_store_ram_find_sec(const struct ble_store_key_sec *key_sec,
-                       const struct ble_store_value_sec *value_secs,
-                       int num_value_secs)
-{
-    const struct ble_store_value_sec *cur;
-    int i;
-
-    if (!ble_addr_cmp(&key_sec->peer_addr, BLE_ADDR_ANY)) {
-        if (key_sec->idx < num_value_secs) {
-            return key_sec->idx;
-        }
-    } else if (key_sec->idx == 0) {
-        for (i = 0; i < num_value_secs; i++) {
-            cur = &value_secs[i];
-
-            if (!ble_addr_cmp(&cur->peer_addr, &key_sec->peer_addr)) {
-                return i;
-            }
-        }
-    }
-
-    return -1;
-}
-#endif
-
-static int
-ble_store_ram_read_our_sec(const struct ble_store_key_sec *key_sec,
-                           struct ble_store_value_sec *value_sec)
-{
-#if MYNEWT_VAL(BLE_STORE_MAX_BONDS)
-    int idx;
-
-    idx = ble_store_ram_find_sec(key_sec, ble_store_ram_our_secs,
-                                 ble_store_ram_num_our_secs);
-    if (idx == -1) {
-        return BLE_HS_ENOENT;
-    }
-
-    *value_sec = ble_store_ram_our_secs[idx];
-    return 0;
-#else
-    return BLE_HS_ENOENT;
-#endif
-
-}
-
-static int
-ble_store_ram_write_our_sec(const struct ble_store_value_sec *value_sec)
-{
-#if MYNEWT_VAL(BLE_STORE_MAX_BONDS)
-    struct ble_store_key_sec key_sec;
-    int idx;
-
-    BLE_HS_LOG(DEBUG, "persisting our sec; ");
-    ble_store_ram_print_value_sec(value_sec);
-
-    ble_store_key_from_value_sec(&key_sec, value_sec);
-    idx = ble_store_ram_find_sec(&key_sec, ble_store_ram_our_secs,
-                                 ble_store_ram_num_our_secs);
-    if (idx == -1) {
-        if (ble_store_ram_num_our_secs >= MYNEWT_VAL(BLE_STORE_MAX_BONDS)) {
-            BLE_HS_LOG(DEBUG, "error persisting our sec; too many entries "
-                              "(%d)\n", ble_store_ram_num_our_secs);
-            return BLE_HS_ESTORE_CAP;
-        }
-
-        idx = ble_store_ram_num_our_secs;
-        ble_store_ram_num_our_secs++;
-    }
-
-    ble_store_ram_our_secs[idx] = *value_sec;
-
-    return 0;
-#else
-    return BLE_HS_ENOENT;
-#endif
-
-}
-
-#if MYNEWT_VAL(BLE_STORE_MAX_BONDS)
-static int
-ble_store_ram_delete_obj(void *values, int value_size, int idx,
-                         int *num_values)
-{
-    uint8_t *dst;
-    uint8_t *src;
-    int move_count;
-
-    (*num_values)--;
-    if (idx < *num_values) {
-        dst = values;
-        dst += idx * value_size;
-        src = dst + value_size;
-
-        move_count = *num_values - idx;
-        memmove(dst, src, move_count);
-    }
-
-    return 0;
-}
-
-static int
-ble_store_ram_delete_sec(const struct ble_store_key_sec *key_sec,
-                         struct ble_store_value_sec *value_secs,
-                         int *num_value_secs)
-{
-    int idx;
-    int rc;
-
-    idx = ble_store_ram_find_sec(key_sec, value_secs, *num_value_secs);
-    if (idx == -1) {
-        return BLE_HS_ENOENT;
-    }
-
-    rc = ble_store_ram_delete_obj(value_secs, sizeof *value_secs, idx,
-                                  num_value_secs);
-    if (rc != 0) {
-        return rc;
-    }
-
-    return 0;
-}
-#endif
-
-static int
-ble_store_ram_delete_our_sec(const struct ble_store_key_sec *key_sec)
-{
-#if MYNEWT_VAL(BLE_STORE_MAX_BONDS)
-    int rc;
-
-    rc = ble_store_ram_delete_sec(key_sec, ble_store_ram_our_secs,
-                                  &ble_store_ram_num_our_secs);
-    if (rc != 0) {
-        return rc;
-    }
-    return 0;
-#else
-    return BLE_HS_ENOENT;
-#endif
-
-}
-
-static int
-ble_store_ram_delete_peer_sec(const struct ble_store_key_sec *key_sec)
-{
-#if MYNEWT_VAL(BLE_STORE_MAX_BONDS)
-    int rc;
-
-    rc = ble_store_ram_delete_sec(key_sec, ble_store_ram_peer_secs,
-                                  &ble_store_ram_num_peer_secs);
-    if (rc != 0) {
-        return rc;
-    }
-    return 0;
-#else
-    return BLE_HS_ENOENT;
-#endif
-
-}
-
-static int
-ble_store_ram_read_peer_sec(const struct ble_store_key_sec *key_sec,
-                            struct ble_store_value_sec *value_sec)
-{
-#if MYNEWT_VAL(BLE_STORE_MAX_BONDS)
-    int idx;
-
-    idx = ble_store_ram_find_sec(key_sec, ble_store_ram_peer_secs,
-                             ble_store_ram_num_peer_secs);
-    if (idx == -1) {
-        return BLE_HS_ENOENT;
-    }
-
-    *value_sec = ble_store_ram_peer_secs[idx];
-    return 0;
-#else
-    return BLE_HS_ENOENT;
-#endif
-
-}
-
-static int
-ble_store_ram_write_peer_sec(const struct ble_store_value_sec *value_sec)
-{
-#if MYNEWT_VAL(BLE_STORE_MAX_BONDS)
-    struct ble_store_key_sec key_sec;
-    int idx;
-
-    BLE_HS_LOG(DEBUG, "persisting peer sec; ");
-    ble_store_ram_print_value_sec(value_sec);
-
-    ble_store_key_from_value_sec(&key_sec, value_sec);
-    idx = ble_store_ram_find_sec(&key_sec, ble_store_ram_peer_secs,
-                                 ble_store_ram_num_peer_secs);
-    if (idx == -1) {
-        if (ble_store_ram_num_peer_secs >= MYNEWT_VAL(BLE_STORE_MAX_BONDS)) {
-            BLE_HS_LOG(DEBUG, "error persisting peer sec; too many entries "
-                             "(%d)\n", ble_store_ram_num_peer_secs);
-            return BLE_HS_ESTORE_CAP;
-        }
-
-        idx = ble_store_ram_num_peer_secs;
-        ble_store_ram_num_peer_secs++;
-    }
-
-    ble_store_ram_peer_secs[idx] = *value_sec;
-    return 0;
-#else
-    return BLE_HS_ENOENT;
-#endif
-
-}
-
-/*****************************************************************************
- * $cccd                                                                     *
- *****************************************************************************/
-
-#if MYNEWT_VAL(BLE_STORE_MAX_CCCDS)
-static int
-ble_store_ram_find_cccd(const struct ble_store_key_cccd *key)
-{
-    struct ble_store_value_cccd *cccd;
-    int skipped;
-    int i;
-
-    skipped = 0;
-    for (i = 0; i < ble_store_ram_num_cccds; i++) {
-        cccd = ble_store_ram_cccds + i;
-
-        if (ble_addr_cmp(&key->peer_addr, BLE_ADDR_ANY)) {
-            if (ble_addr_cmp(&cccd->peer_addr, &key->peer_addr)) {
-                continue;
-            }
-        }
-
-        if (key->chr_val_handle != 0) {
-            if (cccd->chr_val_handle != key->chr_val_handle) {
-                continue;
-            }
-        }
-
-        if (key->idx > skipped) {
-            skipped++;
-            continue;
-        }
-
-        return i;
-    }
-
-    return -1;
-}
-#endif
-
-static int
-ble_store_ram_delete_cccd(const struct ble_store_key_cccd *key_cccd)
-{
-#if MYNEWT_VAL(BLE_STORE_MAX_CCCDS)
-    int idx;
-    int rc;
-
-    idx = ble_store_ram_find_cccd(key_cccd);
-    if (idx == -1) {
-        return BLE_HS_ENOENT;
-    }
-
-    rc = ble_store_ram_delete_obj(ble_store_ram_cccds,
-                                  sizeof *ble_store_ram_cccds,
-                                  idx,
-                                  &ble_store_ram_num_cccds);
-    if (rc != 0) {
-        return rc;
-    }
-    return 0;
-#else
-    return BLE_HS_ENOENT;
-#endif
-
-}
-
-static int
-ble_store_ram_read_cccd(const struct ble_store_key_cccd *key_cccd,
-                        struct ble_store_value_cccd *value_cccd)
-{
-#if MYNEWT_VAL(BLE_STORE_MAX_CCCDS)
-    int idx;
-
-    idx = ble_store_ram_find_cccd(key_cccd);
-    if (idx == -1) {
-        return BLE_HS_ENOENT;
-    }
-
-    *value_cccd = ble_store_ram_cccds[idx];
-
-    return 0;
-#else
-    return BLE_HS_ENOENT;
-#endif
-}
-
-static int
-ble_store_ram_write_cccd(const struct ble_store_value_cccd *value_cccd)
-{
-#if MYNEWT_VAL(BLE_STORE_MAX_CCCDS)
-    struct ble_store_key_cccd key_cccd;
-    int idx;
-
-    ble_store_key_from_value_cccd(&key_cccd, value_cccd);
-    idx = ble_store_ram_find_cccd(&key_cccd);
-    if (idx == -1) {
-        if (ble_store_ram_num_cccds >= MYNEWT_VAL(BLE_STORE_MAX_CCCDS)) {
-            BLE_HS_LOG(DEBUG, "error persisting cccd; too many entries (%d)\n",
-                       ble_store_ram_num_cccds);
-            return BLE_HS_ESTORE_CAP;
-        }
-
-        idx = ble_store_ram_num_cccds;
-        ble_store_ram_num_cccds++;
-    }
-
-    ble_store_ram_cccds[idx] = *value_cccd;
-    return 0;
-#else
-    return BLE_HS_ENOENT;
-#endif
-
-}
-
-/*****************************************************************************
- * $api                                                                      *
- *****************************************************************************/
-
-/**
- * Searches the database for an object matching the specified criteria.
- *
- * @return                      0 if a key was found; else BLE_HS_ENOENT.
- */
-int
-ble_store_ram_read(int obj_type, const union ble_store_key *key,
-                   union ble_store_value *value)
-{
-    int rc;
-
-    switch (obj_type) {
-    case BLE_STORE_OBJ_TYPE_PEER_SEC:
-        /* An encryption procedure (bonding) is being attempted.  The nimble
-         * stack is asking us to look in our key database for a long-term key
-         * corresponding to the specified ediv and random number.
-         *
-         * Perform a key lookup and populate the context object with the
-         * result.  The nimble stack will use this key if this function returns
-         * success.
-         */
-        BLE_HS_LOG(DEBUG, "looking up peer sec; ");
-        ble_store_ram_print_key_sec(&key->sec);
-        BLE_HS_LOG(DEBUG, "\n");
-        rc = ble_store_ram_read_peer_sec(&key->sec, &value->sec);
-        return rc;
-
-    case BLE_STORE_OBJ_TYPE_OUR_SEC:
-        BLE_HS_LOG(DEBUG, "looking up our sec; ");
-        ble_store_ram_print_key_sec(&key->sec);
-        BLE_HS_LOG(DEBUG, "\n");
-        rc = ble_store_ram_read_our_sec(&key->sec, &value->sec);
-        return rc;
-
-    case BLE_STORE_OBJ_TYPE_CCCD:
-        rc = ble_store_ram_read_cccd(&key->cccd, &value->cccd);
-        return rc;
-
-    default:
-        return BLE_HS_ENOTSUP;
-    }
-}
-
-/**
- * Adds the specified object to the database.
- *
- * @return                      0 on success; BLE_HS_ESTORE_CAP if the database
- *                                  is full.
- */
-int
-ble_store_ram_write(int obj_type, const union ble_store_value *val)
-{
-    int rc;
-
-    switch (obj_type) {
-    case BLE_STORE_OBJ_TYPE_PEER_SEC:
-        rc = ble_store_ram_write_peer_sec(&val->sec);
-        return rc;
-
-    case BLE_STORE_OBJ_TYPE_OUR_SEC:
-        rc = ble_store_ram_write_our_sec(&val->sec);
-        return rc;
-
-    case BLE_STORE_OBJ_TYPE_CCCD:
-        rc = ble_store_ram_write_cccd(&val->cccd);
-        return rc;
-
-    default:
-        return BLE_HS_ENOTSUP;
-    }
-}
-
-int
-ble_store_ram_delete(int obj_type, const union ble_store_key *key)
-{
-    int rc;
-
-    switch (obj_type) {
-    case BLE_STORE_OBJ_TYPE_PEER_SEC:
-        rc = ble_store_ram_delete_peer_sec(&key->sec);
-        return rc;
-
-    case BLE_STORE_OBJ_TYPE_OUR_SEC:
-        rc = ble_store_ram_delete_our_sec(&key->sec);
-        return rc;
-
-    case BLE_STORE_OBJ_TYPE_CCCD:
-        rc = ble_store_ram_delete_cccd(&key->cccd);
-        return rc;
-
-    default:
-        return BLE_HS_ENOTSUP;
-    }
-}
-
-void
-ble_store_ram_init(void)
-{
-    /* Ensure this function only gets called by sysinit. */
-    SYSINIT_ASSERT_ACTIVE();
-
-    ble_hs_cfg.store_read_cb = ble_store_ram_read;
-    ble_hs_cfg.store_write_cb = ble_store_ram_write;
-    ble_hs_cfg.store_delete_cb = ble_store_ram_delete;
-
-    /* Re-initialize BSS values in case of unit tests. */
-    ble_store_ram_num_our_secs = 0;
-    ble_store_ram_num_peer_secs = 0;
-    ble_store_ram_num_cccds = 0;
-}
diff --git a/nimble/host/store/ram/syscfg.yml b/nimble/host/store/ram/syscfg.yml
deleted file mode 100644
index 91c55fd82..000000000
--- a/nimble/host/store/ram/syscfg.yml
+++ /dev/null
@@ -1,32 +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_STORE_RAM_SYSINIT_STAGE:
-        description: >
-            Sysinit stage for the RAM BLE store.
-        value: 500
-    BLE_STORE_RAM_DEPRECATED_FLAG:
-        description: >
-            Package store/ram is deprecated and store/config shall be used with BLE_STORE_CONFIG_PERSIST set to 0
-        value: 0
-        deprecated: 1
-
-
-syscfg.vals:
-    BLE_STORE_RAM_DEPRECATED_FLAG: 1
-
diff --git a/porting/examples/linux/main.c b/porting/examples/linux/main.c
index e81e60872..a3352ce10 100644
--- a/porting/examples/linux/main.c
+++ b/porting/examples/linux/main.c
@@ -38,7 +38,7 @@ static struct ble_npl_task s_task_hci;
 void nimble_host_task(void *param);
 void ble_hci_sock_ack_handler(void *param);
 void ble_hci_sock_set_device(int dev);
-void ble_store_ram_init(void);
+void ble_store_config_init(void);
 
 #define TASK_DEFAULT_PRIORITY       1
 #define TASK_DEFAULT_STACK          NULL
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
     ble_svc_tps_init();
 
     /* XXX Need to have template for store */
-    ble_store_ram_init();
+    ble_store_config_init();
 
     ble_npl_task_init(&s_task_hci, "hci_sock", ble_hci_sock_task,
                       NULL, TASK_DEFAULT_PRIORITY, BLE_NPL_TIME_FOREVER,
diff --git a/porting/examples/linux_blemesh/main.c b/porting/examples/linux_blemesh/main.c
index 678062f20..c3c9bb37f 100644
--- a/porting/examples/linux_blemesh/main.c
+++ b/porting/examples/linux_blemesh/main.c
@@ -39,7 +39,7 @@ void nimble_host_task(void *param);
 void ble_hci_sock_ack_handler(void *param);
 void ble_hci_sock_init(void);
 void ble_hci_sock_set_device(int dev);
-void ble_store_ram_init(void);
+void ble_store_config_init(void);
 
 #define TASK_DEFAULT_PRIORITY       1
 #define TASK_DEFAULT_STACK          NULL
@@ -86,7 +86,7 @@ int main(int argc, char *argv[])
     bt_mesh_register_gatt();
 
     /* XXX Need to have template for store */
-    ble_store_ram_init();
+    ble_store_config_init();
 
     ble_npl_task_init(&s_task_hci, "hci_sock", ble_hci_sock_task,
                       NULL, TASK_DEFAULT_PRIORITY, BLE_NPL_TIME_FOREVER,
diff --git a/porting/examples/linux_blemesh_shell/src/main.c b/porting/examples/linux_blemesh_shell/src/main.c
index 734f716ba..16905d242 100644
--- a/porting/examples/linux_blemesh_shell/src/main.c
+++ b/porting/examples/linux_blemesh_shell/src/main.c
@@ -39,7 +39,7 @@ void nimble_host_task(void *param);
 void ble_hci_sock_ack_handler(void *param);
 void ble_hci_sock_init(void);
 void ble_hci_sock_set_device(int dev);
-void ble_store_ram_init(void);
+void ble_store_config_init(void);
 
 #define TASK_DEFAULT_PRIORITY       1
 #define TASK_DEFAULT_STACK          NULL
@@ -91,7 +91,7 @@ main(int argc, char *argv[])
     bt_mesh_register_gatt();
 
     /* XXX Need to have template for store */
-    ble_store_ram_init();
+    ble_store_config_init();
 
     ble_npl_task_init(&s_task_hci, "hci_sock", ble_hci_sock_task,
                       NULL, TASK_DEFAULT_PRIORITY, BLE_NPL_TIME_FOREVER,
diff --git a/porting/examples/nuttx/main.c b/porting/examples/nuttx/main.c
index bd731105d..2c7412260 100644
--- a/porting/examples/nuttx/main.c
+++ b/porting/examples/nuttx/main.c
@@ -44,7 +44,7 @@ static struct ble_npl_task s_task_hci;
 void nimble_host_task(void *param);
 void ble_hci_sock_ack_handler(void *param);
 void ble_hci_sock_set_device(int dev);
-void ble_store_ram_init(void);
+void ble_store_config_init(void);
 
 #define TASK_DEFAULT_PRIORITY       1
 #define TASK_DEFAULT_STACK          NULL
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
     ble_svc_tps_init();
 
     /* XXX Need to have template for store */
-    ble_store_ram_init();
+    ble_store_config_init();
 
     printf("hci_sock task init\n");
     ret = ble_npl_task_init(&s_task_hci, "hci_sock", ble_hci_sock_task,
diff --git a/porting/nimble/Makefile.defs b/porting/nimble/Makefile.defs
index ad458970f..dfb685104 100644
--- a/porting/nimble/Makefile.defs
+++ b/porting/nimble/Makefile.defs
@@ -36,7 +36,7 @@ NIMBLE_INCLUDE := \
 	$(NIMBLE_ROOT)/nimble/host/services/dis/include \
 	$(NIMBLE_ROOT)/nimble/host/services/lls/include \
 	$(NIMBLE_ROOT)/nimble/host/services/tps/include \
-	$(NIMBLE_ROOT)/nimble/host/store/ram/include \
+	$(NIMBLE_ROOT)/nimble/host/store/config/include \
 	$(NIMBLE_ROOT)/nimble/host/util/include \
 	$(NIMBLE_ROOT)/nimble/transport/include \
 	$(NIMBLE_ROOT)/porting/nimble/include \
@@ -55,7 +55,7 @@ NIMBLE_SRC := \
 	$(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/nimble/host/services/ias/src/*.c)) \
 	$(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/nimble/host/services/lls/src/*.c)) \
 	$(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/nimble/host/services/tps/src/*.c)) \
-	$(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/nimble/host/store/ram/src/*.c)) \
+	$(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/nimble/host/store/config/src/*.c)) \
 	$(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/nimble/transport/src/*.c)) \
 	$(NULL)
 


(mynewt-nimble) 02/04: nimble/host: Remove deprecated API

Posted by ja...@apache.org.
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 ba05f640674cd5c375520d03a3a1f103c05316dd
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Fri Feb 20 10:13:31 2026 +0100

    nimble/host: Remove deprecated API
    
    Those were derpecated for quite a long and should be safe to cleanup.
---
 nimble/host/include/host/ble_gap.h  |  4 ----
 nimble/host/include/host/ble_gatt.h | 48 -------------------------------------
 nimble/host/src/ble_gattc.c         | 38 -----------------------------
 3 files changed, 90 deletions(-)

diff --git a/nimble/host/include/host/ble_gap.h b/nimble/host/include/host/ble_gap.h
index 9a1ead004..d9da3c6ca 100644
--- a/nimble/host/include/host/ble_gap.h
+++ b/nimble/host/include/host/ble_gap.h
@@ -249,9 +249,6 @@ struct hci_conn_update;
 /** GAP event: Pairing complete */
 #define BLE_GAP_EVENT_PAIRING_COMPLETE      27
 
-/** GAP event: Pairing complete (deprecated) */
-#define BLE_GAP_EVENT_PARING_COMPLETE BLE_GAP_EVENT_PAIRING_COMPLETE
-
 /** GAP event: Subrate change */
 #define BLE_GAP_EVENT_SUBRATE_CHANGE        28
 
@@ -1249,7 +1246,6 @@ struct ble_gap_event {
          *
          * Valid for the following event types:
          *     o BLE_GAP_EVENT_PAIRING_COMPLETE
-         *     o BLE_GAP_EVENT_PARING_COMPLETE (deprecated)
          */
         struct {
             /**
diff --git a/nimble/host/include/host/ble_gatt.h b/nimble/host/include/host/ble_gatt.h
index a8dafeba6..e74ba9e1a 100644
--- a/nimble/host/include/host/ble_gatt.h
+++ b/nimble/host/include/host/ble_gatt.h
@@ -710,20 +710,6 @@ int ble_gatts_notify_multiple_custom(uint16_t conn_handle,
                                      size_t chr_count,
                                      struct ble_gatt_notif *tuples);
 
-/**
- * @deprecated Should not be used. Use ble_gatts_notify_custom instead.
- *
- * @param conn_handle           The connection over which to execute the
- *                                  procedure.
- * @param att_handle            The attribute handle to indicate in the
- *                                  outgoing notification.
- * @param om                    The value to write to the characteristic.
- *
- * @return                      0 on success; nonzero on failure.
- */
-int ble_gattc_notify_custom(uint16_t conn_handle, uint16_t att_handle,
-                            struct os_mbuf *om);
-
 /**
  * Sends a characteristic notification.  The content of the message is read
  * from the specified characteristic.
@@ -738,19 +724,6 @@ int ble_gattc_notify_custom(uint16_t conn_handle, uint16_t att_handle,
  */
 int ble_gatts_notify(uint16_t conn_handle, uint16_t chr_val_handle);
 
-/**
- * @deprecated Should not be used. Use ble_gatts_notify instead.
- *
- * @param conn_handle           The connection over which to execute the
- *                                  procedure.
- * @param chr_val_handle        The value attribute handle of the
- *                                  characteristic to include in the outgoing
- *                                  notification.
- *
- * @return                      0 on success; nonzero on failure.
- */
-int ble_gattc_notify(uint16_t conn_handle, uint16_t chr_val_handle);
-
 /**
  * Sends a multiple handle variable length characteristic notification.  The
  * content of the message is read from the specified characteristics.
@@ -794,21 +767,6 @@ int ble_gatts_notify_multiple(uint16_t conn_handle,
 int ble_gatts_indicate_custom(uint16_t conn_handle, uint16_t chr_val_handle,
                               struct os_mbuf *txom);
 
-/**
- * @deprecated Should not be used. Use ble_gatts_indicate_custom instead.
- *
- * @param conn_handle           The connection over which to execute the
- *                                  procedure.
- * @param chr_val_handle        The value attribute handle of the
- *                                  characteristic to include in the outgoing
- *                                  indication.
- * @param txom                  The data to include in the indication.
- *
- * @return                      0 on success; nonzero on failure.
- */
-int ble_gattc_indicate_custom(uint16_t conn_handle, uint16_t chr_val_handle,
-                              struct os_mbuf *txom);
-
 /**
  * Sends a characteristic indication.  The content of the message is read from
  * the specified characteristic.
@@ -823,12 +781,6 @@ int ble_gattc_indicate_custom(uint16_t conn_handle, uint16_t chr_val_handle,
  */
 int ble_gatts_indicate(uint16_t conn_handle, uint16_t chr_val_handle);
 
-/**
- * @deprecated Should not be used. Use ble_gatts_indicate instead.
- * @copydoc ble_gatts_indicate
- */
-int ble_gattc_indicate(uint16_t conn_handle, uint16_t chr_val_handle);
-
 /**
  * Initialize the BLE GATT client
  *
diff --git a/nimble/host/src/ble_gattc.c b/nimble/host/src/ble_gattc.c
index a19ed8325..87df86f8d 100644
--- a/nimble/host/src/ble_gattc.c
+++ b/nimble/host/src/ble_gattc.c
@@ -4400,16 +4400,6 @@ done:
     return rc;
 }
 
-/**
- * Deprecated. Should not be used. Use ble_gatts_notify_custom instead.
- */
-int
-ble_gattc_notify_custom(uint16_t conn_handle, uint16_t chr_val_handle,
-                        struct os_mbuf *txom)
-{
-    return ble_gatts_notify_custom(conn_handle, chr_val_handle, txom);
-}
-
 int
 ble_gatts_notify(uint16_t conn_handle, uint16_t chr_val_handle)
 {
@@ -4557,15 +4547,6 @@ ble_gatts_notify_multiple(uint16_t conn_handle,
     return rc;
 }
 
-/**
- * Deprecated. Should not be used. Use ble_gatts_notify instead.
- */
-int
-ble_gattc_notify(uint16_t conn_handle, uint16_t chr_val_handle)
-{
-    return ble_gatts_notify(conn_handle, chr_val_handle);
-}
-
 /*****************************************************************************
  * $indicate                                                                 *
  *****************************************************************************/
@@ -4718,31 +4699,12 @@ done:
     return rc;
 }
 
-/**
- * Deprecated. Should not be used. Use ble_gatts_indicate_custom instead.
- */
-int
-ble_gattc_indicate_custom(uint16_t conn_handle, uint16_t chr_val_handle,
-                          struct os_mbuf *txom)
-{
-    return ble_gatts_indicate_custom(conn_handle, chr_val_handle, txom);
-}
-
 int
 ble_gatts_indicate(uint16_t conn_handle, uint16_t chr_val_handle)
 {
     return ble_gatts_indicate_custom(conn_handle, chr_val_handle, NULL);
 }
 
-/**
- * Deprecated. Should not be used. Use ble_gatts_indicate instead.
- */
-int
-ble_gattc_indicate(uint16_t conn_handle, uint16_t chr_val_handle)
-{
-    return ble_gatts_indicate(conn_handle, chr_val_handle);
-}
-
 /*****************************************************************************
  * $rx                                                                       *
  *****************************************************************************/


(mynewt-nimble) 01/04: nimble: Remove deprecated and defunced configuration options

Posted by ja...@apache.org.
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 <sz...@codecoup.pl>
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


(mynewt-nimble) 04/04: doc: Update documentation with non-deprecated options

Posted by ja...@apache.org.
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 1eb27aa990ab4250583328b96786d003538093ab
Author: Szymon Janc <sz...@codecoup.pl>
AuthorDate: Tue Mar 17 12:05:48 2026 +0100

    doc: Update documentation with non-deprecated options
    
    Some files were refering to deprecated configuration options.
---
 docs/ble_setup/ble_addr.rst          |  6 +++---
 docs/ble_setup/ble_lp_clock.rst      | 16 ++++++++--------
 nimble/drivers/dialog_cmac/README.md |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/ble_setup/ble_addr.rst b/docs/ble_setup/ble_addr.rst
index bfd49923b..f2cadca79 100644
--- a/docs/ble_setup/ble_addr.rst
+++ b/docs/ble_setup/ble_addr.rst
@@ -28,7 +28,7 @@ Method 2: Hardcode a public address in the Mynewt target
 
 The NimBLE controller package exports a
 :doc:`syscfg <../../../os/modules/sysinitconfig/sysinitconfig>` setting
-called ``BLE_PUBLIC_DEV_ADDR``. This setting can be overridden at the
+called ``BLE_LL_PUBLIC_DEV_ADDRR``. This setting can be overridden at the
 application or target level to configure a public Bluetooth address. For
 example, a target can assign the public address *11:22:33:44:55:66* as
 follows:
@@ -36,7 +36,7 @@ follows:
 ::
 
     syscfg.vals:
-        BLE_PUBLIC_DEV_ADDR: '(uint8_t[6]){0x66, 0x55, 0x44, 0x33, 0x22, 0x11}'
+        BLE_LL_PUBLIC_DEV_ADDRR: 0x112233445566
 
 This setting takes the form of a C expression. Specifically, the value
 is a designated initializer expressing a six-byte array. Also note that
@@ -44,7 +44,7 @@ the bytes are reversed, as an array is inherently little-endian, while
 addresses are generally expressed in big-endian.
 
 Note: this method takes precedence over method 1. Whatever is written to
-the ``BLE_PUBLIC_DEV_ADDR`` setting is the address that gets used.
+the ``BLE_LL_PUBLIC_DEV_ADDRR`` setting is the address that gets used.
 
 Method 3: Configure a random address at runtime
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/ble_setup/ble_lp_clock.rst b/docs/ble_setup/ble_lp_clock.rst
index 34a967fec..b39bb919e 100644
--- a/docs/ble_setup/ble_lp_clock.rst
+++ b/docs/ble_setup/ble_lp_clock.rst
@@ -6,7 +6,7 @@ controller. Since the code of controller is optimized to work with 32768
 Hz clock, the OS cputime has to be configured accordingly.
 
 To make things easier, controller package (``net/nimble/controller``)
-defines new system configuration setting ``BLE_LP_CLOCK`` as sets it to
+defines new system configuration setting ``BLE_CONTROLLER`` as sets it to
 ``1`` so other packages can be configured if necessary. The next section
 describes configuration required for controller to work properly.
 
@@ -14,7 +14,7 @@ System configuration
 ~~~~~~~~~~~~~~~~~~~~
 
 **Note:** All BSPs based on nRF5x have below settings automatically
-applied when ``BLE_LP_CLOCK`` is set, there is no need to configure this
+applied when ``BLE_CONTROLLER`` is set, there is no need to configure this
 in application.
 
 The following things need to be configured for NimBLE controller to work
@@ -38,26 +38,26 @@ as below:
         OS_CPUTIME_TIMER_NUM: 5
         TIMER_0: 0
         TIMER_5: 1
-        BLE_XTAL_SETTLE_TIME: 1500
+        BLE_LL_RFMGMT_ENABLE_TIME: 1500
 
 On nRF51 platform the only difference is to use timer 3 instead of timer
 5.
 
 On platforms without 32768 Hz crystal available it usually can be
-synthesized by setting ``XTAL_32768_SYNTH`` to ``1`` - this is also
+synthesized by setting ``MCU_LFCLK_SOURCE`` to ``LFSYNTH`` - this is also
 already configured in existing BSPs.
 
 Crystal settle time configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-The configuration variable ``BLE_XTAL_SETTLE_TIME`` is used by the
+The configuration variable ``BLE_LL_RFMGMT_ENABLE_TIME`` is used by the
 controller to turn on the necessary clock source(s) for the radio and
 associated peripherals prior to Bluetooth events (advertising, scanning,
 connections, etc). For the nRF5x platforms, the HFXO needs to be turned
-on prior to using the radio and the ``BLE_XTAL_SETTLE_TIME`` must be set
-to accommodate this time. The amount of time required is board
+on prior to using the radio and the ``BLE_LL_RFMGMT_ENABLE_TIME`` must be
+set to accommodate this time. The amount of time required is board
 dependent, so users must characterize their hardware and set
-``BLE_XTAL_SETTLE_TIME`` accordingly. The current value of 1500
+``BLE_LL_RFMGMT_ENABLE_TIME`` accordingly. The current value of 1500
 microseconds is a fairly long time and was intended to work for most, if
 not all, platforms.
 
diff --git a/nimble/drivers/dialog_cmac/README.md b/nimble/drivers/dialog_cmac/README.md
index 2e76e2c16..31b64ed30 100644
--- a/nimble/drivers/dialog_cmac/README.md
+++ b/nimble/drivers/dialog_cmac/README.md
@@ -39,7 +39,7 @@ target used.
 Target for M33 should be set and configured as any other BLE application. In
 order to use NimBLE controller on CMAC, set proper HCI transport via syscfg:
 
-    BLE_HCI_TRANSPORT: dialog_cmac
+    BLE_TRANSPORT_HS: dialog_cmac
 
 This will include proper transport, driver and add M0+ target to build process.