diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-03-07 08:44:14 +0100 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-03-07 08:44:14 +0100 |
| commit | 9f67e6f6525bd4071609ff9edd6ce132d7ca1464 (patch) | |
| tree | 65b2dc22bb257c6dd4fc8be77762173b564c340c /src/libs/mynewt-nimble/nimble/host/store | |
| parent | 740b3d7b58dd92a6a6f99620a090ae4f05c03299 (diff) | |
| parent | ada942535718d48eec37cca4f50d678e7201dc67 (diff) | |
Merge branch 'develop' into recovery-firmware
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/DisplayApp.h
# src/systemtask/SystemTask.cpp
# src/systemtask/SystemTask.h
Diffstat (limited to 'src/libs/mynewt-nimble/nimble/host/store')
4 files changed, 19 insertions, 1 deletions
diff --git a/src/libs/mynewt-nimble/nimble/host/store/config/src/ble_store_config.c b/src/libs/mynewt-nimble/nimble/host/store/config/src/ble_store_config.c index ce60d1fb..cc1d59af 100644 --- a/src/libs/mynewt-nimble/nimble/host/store/config/src/ble_store_config.c +++ b/src/libs/mynewt-nimble/nimble/host/store/config/src/ble_store_config.c @@ -23,7 +23,6 @@ #include "sysinit/sysinit.h" #include "syscfg/syscfg.h" #include "host/ble_hs.h" -#include "config/config.h" #include "base64/base64.h" #include "store/config/ble_store_config.h" #include "ble_store_config_priv.h" diff --git a/src/libs/mynewt-nimble/nimble/host/store/ram/include/store/ram/ble_store_ram.h b/src/libs/mynewt-nimble/nimble/host/store/ram/include/store/ram/ble_store_ram.h index 842fb5f3..19372f17 100644 --- a/src/libs/mynewt-nimble/nimble/host/store/ram/include/store/ram/ble_store_ram.h +++ b/src/libs/mynewt-nimble/nimble/host/store/ram/include/store/ram/ble_store_ram.h @@ -17,6 +17,11 @@ * 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_ diff --git a/src/libs/mynewt-nimble/nimble/host/store/ram/src/ble_store_ram.c b/src/libs/mynewt-nimble/nimble/host/store/ram/src/ble_store_ram.c index ab5cdb9f..b912ea47 100644 --- a/src/libs/mynewt-nimble/nimble/host/store/ram/src/ble_store_ram.c +++ b/src/libs/mynewt-nimble/nimble/host/store/ram/src/ble_store_ram.c @@ -23,6 +23,11 @@ * 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> diff --git a/src/libs/mynewt-nimble/nimble/host/store/ram/syscfg.yml b/src/libs/mynewt-nimble/nimble/host/store/ram/syscfg.yml index 442211dd..91c55fd8 100644 --- a/src/libs/mynewt-nimble/nimble/host/store/ram/syscfg.yml +++ b/src/libs/mynewt-nimble/nimble/host/store/ram/syscfg.yml @@ -20,4 +20,13 @@ syscfg.defs: 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 |