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 <[email protected]> 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 <[email protected]>" -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)
