This is an automated email from the ASF dual-hosted git repository. sjanc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit de04b30e9d9c4434777d6773a532c2b78f289580 Author: Szymon Janc <[email protected]> AuthorDate: Fri Oct 9 10:49:34 2026 +0200 encoding/tinycbor: Rename tinycbor7 package to tinycbor Old tinycbor package was removed, so tinycbor7 package can now use tinycbor name. Headers are moved from tinycbor7/ to tinycbor/ include directory and all users are updated. Assisted-by: Claude:claude-opus-5-5 --- apps/metrics/src/main.c | 4 ++-- encoding/cborattr/include/cborattr/cborattr.h | 2 +- encoding/cborattr/pkg.yml | 2 +- encoding/cborattr/src/cborattr.c | 6 +++--- encoding/cborattr/test/pkg.yml | 2 +- encoding/cborattr/test/src/test_cborattr.h | 2 +- encoding/{tinycbor7 => tinycbor}/include/cbor_cfg.h | 2 +- encoding/{tinycbor7 => tinycbor}/include/tinycbor-export.h | 0 encoding/{tinycbor7 => tinycbor}/include/tinycbor-version.h | 0 .../include/tinycbor7 => tinycbor/include/tinycbor}/cbor.h | 2 +- .../tinycbor7 => tinycbor/include/tinycbor}/cbor_cnt_writer.h | 2 +- .../tinycbor7 => tinycbor/include/tinycbor}/cbor_mbuf_reader.h | 4 ++-- .../tinycbor7 => tinycbor/include/tinycbor}/cbor_mbuf_writer.h | 2 +- .../include/tinycbor7 => tinycbor/include/tinycbor}/cbor_mynewt.h | 0 .../include/tinycbor7 => tinycbor/include/tinycbor}/cbor_reader.h | 0 encoding/{tinycbor7 => tinycbor}/pkg.yml | 2 +- encoding/{tinycbor7 => tinycbor}/src/cbor_cnt_writer.c | 2 +- encoding/{tinycbor7 => tinycbor}/src/cbor_mbuf_reader.c | 2 +- encoding/{tinycbor7 => tinycbor}/src/cbor_mbuf_writer.c | 2 +- encoding/{tinycbor7 => tinycbor}/src/cbor_mynewt.c | 2 +- encoding/{tinycbor7 => tinycbor}/src/cbor_reader.c | 4 ++-- encoding/{tinycbor7 => tinycbor}/src/cbor_reader_priv.h | 2 +- encoding/{tinycbor7 => tinycbor}/syscfg.yml | 0 encoding/{tinycbor7 => tinycbor}/test/pkg.yml | 4 ++-- encoding/{tinycbor7 => tinycbor}/test/src/test_tinycbor.c | 8 ++++---- mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_state.c | 2 +- mgmt/mcumgr/cmd/log_mgmt/src/log_mgmt.c | 2 +- mgmt/mcumgr/cmd/os_mgmt/src/os_mgmt.c | 2 +- mgmt/mcumgr/mgmt/include/mgmt/mgmt.h | 4 ++-- mgmt/mcumgr/mgmt/pkg.yml | 2 +- mgmt/mcumgr/mgmt/src/mgmt.c | 2 +- mgmt/mcumgr/omp/include/omp/omp.h | 2 +- mgmt/mcumgr/omp/src/omp.c | 2 +- mgmt/mcumgr/smp/include/smp/smp.h | 4 ++-- mgmt/mcumgr/smp/src/smp.c | 2 +- mgmt/mgmt/pkg.yml | 2 +- mgmt/oicmgr/src/oicmgr.c | 6 +++--- mgmt/smp/include/mynewt_smp/smp.h | 2 +- mgmt/smp/smp_os/pkg.yml | 2 +- mgmt/smp/smp_os/src/smp_os.c | 2 +- mgmt/smp/src/smp.c | 6 +++--- mgmt/smp/transport/smp_shell/pkg.yml | 2 +- mgmt/smp/transport/smp_shell/src/smp_shell.c | 4 ++-- net/oic/include/oic/oc_rep.h | 2 +- net/oic/pkg.yml | 2 +- net/oic/selftest/pkg.yml | 2 +- net/oic/src/api/oc_rep.c | 4 ++-- sys/log/full/pkg.yml | 6 +++--- sys/log/full/src/log_console.c | 2 +- sys/log/full/src/log_shell.c | 2 +- .../log_cbor_reader/include/log_cbor_reader/log_cbor_reader.h | 4 ++-- sys/log/util/log_cbor_reader/pkg.yml | 2 +- sys/metrics/pkg.yml | 2 +- sys/metrics/src/cli.c | 4 ++-- sys/metrics/src/metrics.c | 4 ++-- sys/reboot/pkg.yml | 2 +- sys/reboot/src/log_reboot.c | 2 +- sys/shell/pkg.yml | 2 +- sys/shell/src/shell_bridge.c | 2 +- sys/shell/src/shell_bridge_streamer.c | 2 +- 60 files changed, 77 insertions(+), 77 deletions(-) diff --git a/apps/metrics/src/main.c b/apps/metrics/src/main.c index a4d160a87..efaf144ea 100755 --- a/apps/metrics/src/main.c +++ b/apps/metrics/src/main.c @@ -24,8 +24,8 @@ #include "os/os.h" #include "sysinit/sysinit.h" #include "metrics/metrics.h" -#include "tinycbor7/cbor_mbuf_reader.h" -#include "tinycbor7/cbor.h" +#include "tinycbor/cbor_mbuf_reader.h" +#include "tinycbor/cbor.h" #include "log/log.h" #include "sysflash/sysflash.h" #include "fcb/fcb.h" diff --git a/encoding/cborattr/include/cborattr/cborattr.h b/encoding/cborattr/include/cborattr/cborattr.h index 01bcc36d4..083fea8f9 100644 --- a/encoding/cborattr/include/cborattr/cborattr.h +++ b/encoding/cborattr/include/cborattr/cborattr.h @@ -25,7 +25,7 @@ #include <ctype.h> #include <stdio.h> #include <sys/types.h> -#include "tinycbor7/cbor.h" +#include "tinycbor/cbor.h" #include <os/os_mbuf.h> diff --git a/encoding/cborattr/pkg.yml b/encoding/cborattr/pkg.yml index 0547f106f..6f19678b5 100644 --- a/encoding/cborattr/pkg.yml +++ b/encoding/cborattr/pkg.yml @@ -24,6 +24,6 @@ pkg.homepage: "http://mynewt.apache.org/"; pkg.keywords: pkg.deps: - - "@apache-mynewt-core/encoding/tinycbor7" + - "@apache-mynewt-core/encoding/tinycbor" pkg.cflags.FLOAT_USER: -DFLOAT_SUPPORT diff --git a/encoding/cborattr/src/cborattr.c b/encoding/cborattr/src/cborattr.c index df2bb0ac0..01fd08418 100644 --- a/encoding/cborattr/src/cborattr.c +++ b/encoding/cborattr/src/cborattr.c @@ -18,10 +18,10 @@ */ #include "cborattr/cborattr.h" -#include "tinycbor7/cbor.h" -#include "tinycbor7/cbor_mbuf_reader.h" +#include "tinycbor/cbor.h" +#include "tinycbor/cbor_mbuf_reader.h" #include "syscfg/syscfg.h" -#include "tinycbor7/cbor_mbuf_writer.h" +#include "tinycbor/cbor_mbuf_writer.h" #include "os/os_mbuf.h" #define CBORATTR_MAX_SIZE MYNEWT_VAL(CBORATTR_MAX_SIZE) #define CBORATTR_MAX_NESTING MYNEWT_VAL(CBORATTR_MAX_NESTING) diff --git a/encoding/cborattr/test/pkg.yml b/encoding/cborattr/test/pkg.yml index 2129c8493..df0c50a8b 100644 --- a/encoding/cborattr/test/pkg.yml +++ b/encoding/cborattr/test/pkg.yml @@ -23,7 +23,7 @@ pkg.homepage: "http://mynewt.apache.org/"; pkg.keywords: pkg.deps: - - '@apache-mynewt-core/encoding/tinycbor7' + - '@apache-mynewt-core/encoding/tinycbor' - '@apache-mynewt-core/encoding/cborattr' pkg.deps.SELFTEST: diff --git a/encoding/cborattr/test/src/test_cborattr.h b/encoding/cborattr/test/src/test_cborattr.h index bb2c2f0d6..a71b513df 100644 --- a/encoding/cborattr/test/src/test_cborattr.h +++ b/encoding/cborattr/test/src/test_cborattr.h @@ -23,7 +23,7 @@ #include <string.h> #include "testutil/testutil.h" #include "test_cborattr.h" -#include "tinycbor7/cbor.h" +#include "tinycbor/cbor.h" #include "cborattr/cborattr.h" #ifdef __cplusplus diff --git a/encoding/tinycbor7/include/cbor_cfg.h b/encoding/tinycbor/include/cbor_cfg.h similarity index 97% rename from encoding/tinycbor7/include/cbor_cfg.h rename to encoding/tinycbor/include/cbor_cfg.h index 85c3fafca..9359c73de 100644 --- a/encoding/tinycbor7/include/cbor_cfg.h +++ b/encoding/tinycbor/include/cbor_cfg.h @@ -50,7 +50,7 @@ /* * Parser with external source (cbor_parser_init_reader()) is used with Mynewt - * readers only (see tinycbor7/cbor_reader.h). TinyCBOR reader API keeps reading + * readers only (see tinycbor/cbor_reader.h). TinyCBOR reader API keeps reading * position in reader, shared by all iterators, while Mynewt users expect * iterators to be independent (e.g. copy of iterator can be advanced without * affecting original). To achieve that TinyCBOR reader functions are replaced diff --git a/encoding/tinycbor7/include/tinycbor-export.h b/encoding/tinycbor/include/tinycbor-export.h similarity index 100% rename from encoding/tinycbor7/include/tinycbor-export.h rename to encoding/tinycbor/include/tinycbor-export.h diff --git a/encoding/tinycbor7/include/tinycbor-version.h b/encoding/tinycbor/include/tinycbor-version.h similarity index 100% rename from encoding/tinycbor7/include/tinycbor-version.h rename to encoding/tinycbor/include/tinycbor-version.h diff --git a/encoding/tinycbor7/include/tinycbor7/cbor.h b/encoding/tinycbor/include/tinycbor/cbor.h similarity index 96% rename from encoding/tinycbor7/include/tinycbor7/cbor.h rename to encoding/tinycbor/include/tinycbor/cbor.h index bfd020c81..685034b33 100644 --- a/encoding/tinycbor7/include/tinycbor7/cbor.h +++ b/encoding/tinycbor/include/tinycbor/cbor.h @@ -22,6 +22,6 @@ /* TinyCBOR main header, provided by @tinycbor repository */ #include <cbor.h> -#include "tinycbor7/cbor_mynewt.h" +#include "tinycbor/cbor_mynewt.h" #endif diff --git a/encoding/tinycbor7/include/tinycbor7/cbor_cnt_writer.h b/encoding/tinycbor/include/tinycbor/cbor_cnt_writer.h similarity index 98% rename from encoding/tinycbor7/include/tinycbor7/cbor_cnt_writer.h rename to encoding/tinycbor/include/tinycbor/cbor_cnt_writer.h index 49c791212..fd341ba4d 100644 --- a/encoding/tinycbor7/include/tinycbor7/cbor_cnt_writer.h +++ b/encoding/tinycbor/include/tinycbor/cbor_cnt_writer.h @@ -20,7 +20,7 @@ #ifndef H_TINYCBOR_CBOR_CNT_WRITER_ #define H_TINYCBOR_CBOR_CNT_WRITER_ -#include <tinycbor7/cbor.h> +#include <tinycbor/cbor.h> #ifdef __cplusplus extern "C" { diff --git a/encoding/tinycbor7/include/tinycbor7/cbor_mbuf_reader.h b/encoding/tinycbor/include/tinycbor/cbor_mbuf_reader.h similarity index 98% rename from encoding/tinycbor7/include/tinycbor7/cbor_mbuf_reader.h rename to encoding/tinycbor/include/tinycbor/cbor_mbuf_reader.h index 3e15b19ae..7c7fb5627 100644 --- a/encoding/tinycbor7/include/tinycbor7/cbor_mbuf_reader.h +++ b/encoding/tinycbor/include/tinycbor/cbor_mbuf_reader.h @@ -21,8 +21,8 @@ #define H_TINYCBOR_CBOR_MBUF_READER_ #include "os/mynewt.h" -#include <tinycbor7/cbor.h> -#include <tinycbor7/cbor_reader.h> +#include <tinycbor/cbor.h> +#include <tinycbor/cbor_reader.h> #ifdef __cplusplus extern "C" { diff --git a/encoding/tinycbor7/include/tinycbor7/cbor_mbuf_writer.h b/encoding/tinycbor/include/tinycbor/cbor_mbuf_writer.h similarity index 98% rename from encoding/tinycbor7/include/tinycbor7/cbor_mbuf_writer.h rename to encoding/tinycbor/include/tinycbor/cbor_mbuf_writer.h index 4015d6dd1..eb6b58193 100644 --- a/encoding/tinycbor7/include/tinycbor7/cbor_mbuf_writer.h +++ b/encoding/tinycbor/include/tinycbor/cbor_mbuf_writer.h @@ -21,7 +21,7 @@ #define H_TINYCBOR_CBOR_MBUF_WRITER_ #include "os/mynewt.h" -#include <tinycbor7/cbor.h> +#include <tinycbor/cbor.h> #ifdef __cplusplus extern "C" { diff --git a/encoding/tinycbor7/include/tinycbor7/cbor_mynewt.h b/encoding/tinycbor/include/tinycbor/cbor_mynewt.h similarity index 100% rename from encoding/tinycbor7/include/tinycbor7/cbor_mynewt.h rename to encoding/tinycbor/include/tinycbor/cbor_mynewt.h diff --git a/encoding/tinycbor7/include/tinycbor7/cbor_reader.h b/encoding/tinycbor/include/tinycbor/cbor_reader.h similarity index 100% rename from encoding/tinycbor7/include/tinycbor7/cbor_reader.h rename to encoding/tinycbor/include/tinycbor/cbor_reader.h diff --git a/encoding/tinycbor7/pkg.yml b/encoding/tinycbor/pkg.yml similarity index 98% rename from encoding/tinycbor7/pkg.yml rename to encoding/tinycbor/pkg.yml index ff77a4255..e2d4380c4 100644 --- a/encoding/tinycbor7/pkg.yml +++ b/encoding/tinycbor/pkg.yml @@ -18,7 +18,7 @@ # -pkg.name: encoding/tinycbor7 +pkg.name: encoding/tinycbor pkg.description: CBOR encoding/decoding library (Intel TinyCBOR) with Mynewt extensions pkg.author: "Apache Mynewt <[email protected]>" pkg.homepage: "https://github.com/intel/tinycbor"; diff --git a/encoding/tinycbor7/src/cbor_cnt_writer.c b/encoding/tinycbor/src/cbor_cnt_writer.c similarity index 96% rename from encoding/tinycbor7/src/cbor_cnt_writer.c rename to encoding/tinycbor/src/cbor_cnt_writer.c index 4ca0eb11f..327cd46bb 100644 --- a/encoding/tinycbor7/src/cbor_cnt_writer.c +++ b/encoding/tinycbor/src/cbor_cnt_writer.c @@ -17,7 +17,7 @@ * under the License. */ -#include <tinycbor7/cbor_cnt_writer.h> +#include <tinycbor/cbor_cnt_writer.h> void cbor_cnt_writer_init(struct cbor_cnt_writer *cb) diff --git a/encoding/tinycbor7/src/cbor_mbuf_reader.c b/encoding/tinycbor/src/cbor_mbuf_reader.c similarity index 99% rename from encoding/tinycbor7/src/cbor_mbuf_reader.c rename to encoding/tinycbor/src/cbor_mbuf_reader.c index 44672d8d7..d68f09023 100644 --- a/encoding/tinycbor7/src/cbor_mbuf_reader.c +++ b/encoding/tinycbor/src/cbor_mbuf_reader.c @@ -18,7 +18,7 @@ */ #include <assert.h> -#include <tinycbor7/cbor_mbuf_reader.h> +#include <tinycbor/cbor_mbuf_reader.h> #include "cbor_reader_priv.h" static size_t diff --git a/encoding/tinycbor7/src/cbor_mbuf_writer.c b/encoding/tinycbor/src/cbor_mbuf_writer.c similarity index 96% rename from encoding/tinycbor7/src/cbor_mbuf_writer.c rename to encoding/tinycbor/src/cbor_mbuf_writer.c index 4882c880b..9af30a5e3 100644 --- a/encoding/tinycbor7/src/cbor_mbuf_writer.c +++ b/encoding/tinycbor/src/cbor_mbuf_writer.c @@ -17,7 +17,7 @@ * under the License. */ -#include <tinycbor7/cbor_mbuf_writer.h> +#include <tinycbor/cbor_mbuf_writer.h> void cbor_mbuf_writer_init(struct cbor_mbuf_writer *cb, struct os_mbuf *m) diff --git a/encoding/tinycbor7/src/cbor_mynewt.c b/encoding/tinycbor/src/cbor_mynewt.c similarity index 99% rename from encoding/tinycbor7/src/cbor_mynewt.c rename to encoding/tinycbor/src/cbor_mynewt.c index 9c4e3e1dd..92629f9e8 100644 --- a/encoding/tinycbor7/src/cbor_mynewt.c +++ b/encoding/tinycbor/src/cbor_mynewt.c @@ -18,7 +18,7 @@ */ #include <assert.h> -#include <tinycbor7/cbor.h> +#include <tinycbor/cbor.h> #define CBOR_MAJOR_TYPE_BYTE_STRING (2 << 5) #define CBOR_MAJOR_TYPE_TEXT_STRING (3 << 5) diff --git a/encoding/tinycbor7/src/cbor_reader.c b/encoding/tinycbor/src/cbor_reader.c similarity index 98% rename from encoding/tinycbor7/src/cbor_reader.c rename to encoding/tinycbor/src/cbor_reader.c index 7083d10fd..b2085114a 100644 --- a/encoding/tinycbor7/src/cbor_reader.c +++ b/encoding/tinycbor/src/cbor_reader.c @@ -18,8 +18,8 @@ */ #include <assert.h> -#include <tinycbor7/cbor.h> -#include <tinycbor7/cbor_reader.h> +#include <tinycbor/cbor.h> +#include <tinycbor/cbor_reader.h> #include "cbor_reader_priv.h" static struct cbor_reader * diff --git a/encoding/tinycbor7/src/cbor_reader_priv.h b/encoding/tinycbor/src/cbor_reader_priv.h similarity index 97% rename from encoding/tinycbor7/src/cbor_reader_priv.h rename to encoding/tinycbor/src/cbor_reader_priv.h index 7cb17f5ab..a432eef9b 100644 --- a/encoding/tinycbor7/src/cbor_reader_priv.h +++ b/encoding/tinycbor/src/cbor_reader_priv.h @@ -20,7 +20,7 @@ #ifndef H_TINYCBOR_CBOR_READER_PRIV_ #define H_TINYCBOR_CBOR_READER_PRIV_ -#include <tinycbor7/cbor.h> +#include <tinycbor/cbor.h> /* * Copies (or calculates length of if buffer is NULL) string from value parsed diff --git a/encoding/tinycbor7/syscfg.yml b/encoding/tinycbor/syscfg.yml similarity index 100% rename from encoding/tinycbor7/syscfg.yml rename to encoding/tinycbor/syscfg.yml diff --git a/encoding/tinycbor7/test/pkg.yml b/encoding/tinycbor/test/pkg.yml similarity index 93% rename from encoding/tinycbor7/test/pkg.yml rename to encoding/tinycbor/test/pkg.yml index 3ad714f5d..8190d7707 100644 --- a/encoding/tinycbor7/test/pkg.yml +++ b/encoding/tinycbor/test/pkg.yml @@ -18,7 +18,7 @@ # -pkg.name: encoding/tinycbor7/test +pkg.name: encoding/tinycbor/test pkg.type: unittest pkg.description: "TinyCBOR unit tests." pkg.author: "Apache Mynewt <[email protected]>" @@ -26,7 +26,7 @@ pkg.homepage: "http://mynewt.apache.org/"; pkg.keywords: pkg.deps: - - '@apache-mynewt-core/encoding/tinycbor7' + - '@apache-mynewt-core/encoding/tinycbor' - '@apache-mynewt-core/test/testutil' pkg.deps.SELFTEST: diff --git a/encoding/tinycbor7/test/src/test_tinycbor.c b/encoding/tinycbor/test/src/test_tinycbor.c similarity index 99% rename from encoding/tinycbor7/test/src/test_tinycbor.c rename to encoding/tinycbor/test/src/test_tinycbor.c index 325e8d07d..1d57e288a 100644 --- a/encoding/tinycbor7/test/src/test_tinycbor.c +++ b/encoding/tinycbor/test/src/test_tinycbor.c @@ -21,10 +21,10 @@ #include "os/mynewt.h" #include "sysinit/sysinit.h" #include "testutil/testutil.h" -#include "tinycbor7/cbor.h" -#include "tinycbor7/cbor_cnt_writer.h" -#include "tinycbor7/cbor_mbuf_reader.h" -#include "tinycbor7/cbor_mbuf_writer.h" +#include "tinycbor/cbor.h" +#include "tinycbor/cbor_cnt_writer.h" +#include "tinycbor/cbor_mbuf_reader.h" +#include "tinycbor/cbor_mbuf_writer.h" /* Small mbuf blocks so that encoded data spans many mbufs */ #define TEST_MBUF_BUF_SIZE 24 diff --git a/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_state.c b/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_state.c index 3f687d8da..7d8d5e9f0 100644 --- a/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_state.c +++ b/mgmt/mcumgr/cmd/img_mgmt/src/img_mgmt_state.c @@ -19,7 +19,7 @@ #include <assert.h> -#include "tinycbor7/cbor.h" +#include "tinycbor/cbor.h" #include "cborattr/cborattr.h" #include "mgmt/mgmt.h" #include "img_mgmt/img_mgmt.h" diff --git a/mgmt/mcumgr/cmd/log_mgmt/src/log_mgmt.c b/mgmt/mcumgr/cmd/log_mgmt/src/log_mgmt.c index d74e42ca7..832b18391 100644 --- a/mgmt/mcumgr/cmd/log_mgmt/src/log_mgmt.c +++ b/mgmt/mcumgr/cmd/log_mgmt/src/log_mgmt.c @@ -23,7 +23,7 @@ #include "os/mynewt.h" #include "mgmt/mgmt.h" #include "cborattr/cborattr.h" -#include "tinycbor7/cbor_cnt_writer.h" +#include "tinycbor/cbor_cnt_writer.h" #include "log_mgmt/log_mgmt.h" #include "log/log.h" diff --git a/mgmt/mcumgr/cmd/os_mgmt/src/os_mgmt.c b/mgmt/mcumgr/cmd/os_mgmt/src/os_mgmt.c index d1df8f699..22ea4b42d 100644 --- a/mgmt/mcumgr/cmd/os_mgmt/src/os_mgmt.c +++ b/mgmt/mcumgr/cmd/os_mgmt/src/os_mgmt.c @@ -22,7 +22,7 @@ #include "os/mynewt.h" #include "hal/hal_system.h" #include "hal/hal_watchdog.h" -#include "tinycbor7/cbor.h" +#include "tinycbor/cbor.h" #include "cborattr/cborattr.h" #include "mgmt/mgmt.h" #include "os_mgmt/os_mgmt.h" diff --git a/mgmt/mcumgr/mgmt/include/mgmt/mgmt.h b/mgmt/mcumgr/mgmt/include/mgmt/mgmt.h index 727f0d8b2..8c3e388d6 100644 --- a/mgmt/mcumgr/mgmt/include/mgmt/mgmt.h +++ b/mgmt/mcumgr/mgmt/include/mgmt/mgmt.h @@ -21,8 +21,8 @@ #define H_MGMT_MGMT_ #include <inttypes.h> -#include "tinycbor7/cbor.h" -#include "tinycbor7/cbor_reader.h" +#include "tinycbor/cbor.h" +#include "tinycbor/cbor_reader.h" #ifdef __cplusplus extern "C" { diff --git a/mgmt/mcumgr/mgmt/pkg.yml b/mgmt/mcumgr/mgmt/pkg.yml index 61cdbeb3e..565510f5f 100644 --- a/mgmt/mcumgr/mgmt/pkg.yml +++ b/mgmt/mcumgr/mgmt/pkg.yml @@ -24,5 +24,5 @@ pkg.homepage: "http://mynewt.apache.org/"; pkg.keywords: pkg.deps: - - '@apache-mynewt-core/encoding/tinycbor7' + - '@apache-mynewt-core/encoding/tinycbor' - '@apache-mynewt-core/kernel/os' diff --git a/mgmt/mcumgr/mgmt/src/mgmt.c b/mgmt/mcumgr/mgmt/src/mgmt.c index 072024aae..1f6f32a23 100644 --- a/mgmt/mcumgr/mgmt/src/mgmt.c +++ b/mgmt/mcumgr/mgmt/src/mgmt.c @@ -19,7 +19,7 @@ #include <string.h> -#include "tinycbor7/cbor.h" +#include "tinycbor/cbor.h" #include "mgmt/endian.h" #include "mgmt/mgmt.h" diff --git a/mgmt/mcumgr/omp/include/omp/omp.h b/mgmt/mcumgr/omp/include/omp/omp.h index c5fb17c62..c290a4c21 100644 --- a/mgmt/mcumgr/omp/include/omp/omp.h +++ b/mgmt/mcumgr/omp/include/omp/omp.h @@ -38,7 +38,7 @@ #ifndef H_OMP_ #define H_OMP_ -#include "tinycbor7/cbor_mbuf_reader.h" +#include "tinycbor/cbor_mbuf_reader.h" #include "mgmt/mgmt.h" #ifdef __cplusplus diff --git a/mgmt/mcumgr/omp/src/omp.c b/mgmt/mcumgr/omp/src/omp.c index ddef42396..5bf1695e9 100644 --- a/mgmt/mcumgr/omp/src/omp.c +++ b/mgmt/mcumgr/omp/src/omp.c @@ -24,7 +24,7 @@ #include <mgmt/mgmt.h> #include <cborattr/cborattr.h> -#include <tinycbor7/cbor.h> +#include <tinycbor/cbor.h> #include "omp/omp.h" #include "omp/omp_priv.h" diff --git a/mgmt/mcumgr/smp/include/smp/smp.h b/mgmt/mcumgr/smp/include/smp/smp.h index 860c741ba..5a285aacf 100644 --- a/mgmt/mcumgr/smp/include/smp/smp.h +++ b/mgmt/mcumgr/smp/include/smp/smp.h @@ -39,8 +39,8 @@ #define H_SMP_ #include "os/os_mbuf.h" -#include "tinycbor7/cbor_mbuf_reader.h" -#include "tinycbor7/cbor_mbuf_writer.h" +#include "tinycbor/cbor_mbuf_reader.h" +#include "tinycbor/cbor_mbuf_writer.h" #include "mgmt/mgmt.h" #ifdef __cplusplus diff --git a/mgmt/mcumgr/smp/src/smp.c b/mgmt/mcumgr/smp/src/smp.c index 090a1587f..907f3ae48 100644 --- a/mgmt/mcumgr/smp/src/smp.c +++ b/mgmt/mcumgr/smp/src/smp.c @@ -22,7 +22,7 @@ #include <assert.h> #include <string.h> -#include "tinycbor7/cbor.h" +#include "tinycbor/cbor.h" #include "mgmt/endian.h" #include "mgmt/mgmt.h" #include "smp/smp.h" diff --git a/mgmt/mgmt/pkg.yml b/mgmt/mgmt/pkg.yml index 731751327..4cde92d39 100644 --- a/mgmt/mgmt/pkg.yml +++ b/mgmt/mgmt/pkg.yml @@ -25,5 +25,5 @@ pkg.keywords: pkg.deps: - "@apache-mynewt-core/kernel/os" - - "@apache-mynewt-core/encoding/tinycbor7" + - "@apache-mynewt-core/encoding/tinycbor" - "@apache-mynewt-core/mgmt/mcumgr/mgmt" diff --git a/mgmt/oicmgr/src/oicmgr.c b/mgmt/oicmgr/src/oicmgr.c index 2710e3246..c8fa4a9c5 100644 --- a/mgmt/oicmgr/src/oicmgr.c +++ b/mgmt/oicmgr/src/oicmgr.c @@ -24,9 +24,9 @@ #include "mgmt/mgmt.h" #include "omp/omp.h" -#include "tinycbor7/cbor.h" -#include "tinycbor7/cbor_mbuf_writer.h" -#include "tinycbor7/cbor_mbuf_reader.h" +#include "tinycbor/cbor.h" +#include "tinycbor/cbor_mbuf_writer.h" +#include "tinycbor/cbor_mbuf_reader.h" #include "cborattr/cborattr.h" #include "omp/omp.h" diff --git a/mgmt/smp/include/mynewt_smp/smp.h b/mgmt/smp/include/mynewt_smp/smp.h index b1109aa73..e07a9bbc1 100644 --- a/mgmt/smp/include/mynewt_smp/smp.h +++ b/mgmt/smp/include/mynewt_smp/smp.h @@ -25,7 +25,7 @@ * @{ */ -#include <tinycbor7/cbor.h> +#include <tinycbor/cbor.h> #include <inttypes.h> #include "os/mynewt.h" #include "smp/smp.h" diff --git a/mgmt/smp/smp_os/pkg.yml b/mgmt/smp/smp_os/pkg.yml index 76f93da23..310eadd34 100644 --- a/mgmt/smp/smp_os/pkg.yml +++ b/mgmt/smp/smp_os/pkg.yml @@ -29,7 +29,7 @@ pkg.deps: - "@apache-mynewt-core/kernel/os" - "@apache-mynewt-core/mgmt/mcumgr/cmd/os_mgmt" - "@apache-mynewt-core/mgmt/mcumgr/mgmt" - - "@apache-mynewt-core/encoding/tinycbor7" + - "@apache-mynewt-core/encoding/tinycbor" - "@apache-mynewt-core/encoding/cborattr" pkg.deps.TIMEPERSIST: diff --git a/mgmt/smp/smp_os/src/smp_os.c b/mgmt/smp/smp_os/src/smp_os.c index cac474643..b73ec82b4 100644 --- a/mgmt/smp/smp_os/src/smp_os.c +++ b/mgmt/smp/smp_os/src/smp_os.c @@ -36,7 +36,7 @@ #include "smp_os/smp_os.h" -#include <tinycbor7/cbor.h> +#include <tinycbor/cbor.h> #include <cborattr/cborattr.h> static int smp_def_console_echo(struct mgmt_ctxt *cb); diff --git a/mgmt/smp/src/smp.c b/mgmt/smp/src/smp.c index b04c0af22..76e474ffd 100644 --- a/mgmt/smp/src/smp.c +++ b/mgmt/smp/src/smp.c @@ -24,9 +24,9 @@ #include "mgmt/mgmt.h" #include "os_mgmt/os_mgmt.h" #include "mynewt_smp/smp.h" -#include "tinycbor7/cbor.h" -#include "tinycbor7/cbor_mbuf_writer.h" -#include "tinycbor7/cbor_mbuf_reader.h" +#include "tinycbor/cbor.h" +#include "tinycbor/cbor_mbuf_writer.h" +#include "tinycbor/cbor_mbuf_reader.h" /* Shared queue that SMP uses for work items. */ struct os_eventq *g_smp_evq; diff --git a/mgmt/smp/transport/smp_shell/pkg.yml b/mgmt/smp/transport/smp_shell/pkg.yml index e59b356d9..9c1bf16c1 100644 --- a/mgmt/smp/transport/smp_shell/pkg.yml +++ b/mgmt/smp/transport/smp_shell/pkg.yml @@ -30,7 +30,7 @@ pkg.deps: - "@apache-mynewt-core/sys/shell" - "@apache-mynewt-core/mgmt/smp" - "@apache-mynewt-core/mgmt/mcumgr/mgmt" - - "@apache-mynewt-core/encoding/tinycbor7" + - "@apache-mynewt-core/encoding/tinycbor" pkg.init: smp_shell_pkg_init: 'MYNEWT_VAL(SMP_SHELL_SYSINIT_STAGE)' diff --git a/mgmt/smp/transport/smp_shell/src/smp_shell.c b/mgmt/smp/transport/smp_shell/src/smp_shell.c index 80a8e41cd..2258d8c7e 100644 --- a/mgmt/smp/transport/smp_shell/src/smp_shell.c +++ b/mgmt/smp/transport/smp_shell/src/smp_shell.c @@ -24,8 +24,8 @@ #include <shell/shell.h> #include <mgmt/mgmt.h> #include <mynewt_smp/smp.h> -#include "tinycbor7/cbor_mbuf_reader.h" -#include "tinycbor7/cbor_mbuf_writer.h" +#include "tinycbor/cbor_mbuf_reader.h" +#include "tinycbor/cbor_mbuf_writer.h" static struct smp_transport g_smp_shell_transport; diff --git a/net/oic/include/oic/oc_rep.h b/net/oic/include/oic/oc_rep.h index 353abe849..87efd91dd 100644 --- a/net/oic/include/oic/oc_rep.h +++ b/net/oic/include/oic/oc_rep.h @@ -20,7 +20,7 @@ #include <stdbool.h> #include <stdint.h> -#include <tinycbor7/cbor.h> +#include <tinycbor/cbor.h> #include "oic/oc_constants.h" #include "oic/oc_helpers.h" #include "oic/port/mynewt/config.h" diff --git a/net/oic/pkg.yml b/net/oic/pkg.yml index 6862a9323..b938f1680 100644 --- a/net/oic/pkg.yml +++ b/net/oic/pkg.yml @@ -25,7 +25,7 @@ pkg.keywords: pkg.deps: - "@apache-mynewt-core/encoding/cborattr" - - "@apache-mynewt-core/encoding/tinycbor7" + - "@apache-mynewt-core/encoding/tinycbor" - "@apache-mynewt-core/kernel/os" - "@apache-mynewt-core/sys/log/modlog" diff --git a/net/oic/selftest/pkg.yml b/net/oic/selftest/pkg.yml index 437547991..7d20aac26 100644 --- a/net/oic/selftest/pkg.yml +++ b/net/oic/selftest/pkg.yml @@ -24,7 +24,7 @@ pkg.keywords: pkg.deps: - "@apache-mynewt-core/encoding/cborattr" - - "@apache-mynewt-core/encoding/tinycbor7" + - "@apache-mynewt-core/encoding/tinycbor" - "@apache-mynewt-core/net/oic" - "@apache-mynewt-core/sys/console/stub" - "@apache-mynewt-core/sys/log/full" diff --git a/net/oic/src/api/oc_rep.c b/net/oic/src/api/oc_rep.c index 52e1a4259..1e149bae7 100644 --- a/net/oic/src/api/oc_rep.c +++ b/net/oic/src/api/oc_rep.c @@ -18,8 +18,8 @@ #include "os/mynewt.h" -#include <tinycbor7/cbor_mbuf_writer.h> -#include <tinycbor7/cbor_mbuf_reader.h> +#include <tinycbor/cbor_mbuf_writer.h> +#include <tinycbor/cbor_mbuf_reader.h> #include "oic/port/mynewt/config.h" #include "oic/oc_rep.h" diff --git a/sys/log/full/pkg.yml b/sys/log/full/pkg.yml index 5dd68aa60..06bb9dbea 100644 --- a/sys/log/full/pkg.yml +++ b/sys/log/full/pkg.yml @@ -40,15 +40,15 @@ pkg.deps.LOG_CLI: - "@apache-mynewt-core/sys/log/util/log_cbor_reader" - "@apache-mynewt-core/sys/shell" - "@apache-mynewt-core/encoding/base64" - - "@apache-mynewt-core/encoding/tinycbor7" + - "@apache-mynewt-core/encoding/tinycbor" - "@apache-mynewt-core/util/parse" pkg.deps.LOG_CONSOLE: - - "@apache-mynewt-core/encoding/tinycbor7" + - "@apache-mynewt-core/encoding/tinycbor" pkg.deps.LOG_MGMT: - "@apache-mynewt-core/mgmt/mcumgr/cmd/log_mgmt" - - "@apache-mynewt-core/encoding/tinycbor7" + - "@apache-mynewt-core/encoding/tinycbor" pkg.deps.LOG_FLAGS_IMAGE_HASH: - "@apache-mynewt-core/mgmt/imgmgr" diff --git a/sys/log/full/src/log_console.c b/sys/log/full/src/log_console.c index d8cda2265..da52ca65b 100644 --- a/sys/log/full/src/log_console.c +++ b/sys/log/full/src/log_console.c @@ -24,7 +24,7 @@ #include <cbmem/cbmem.h> #include <console/console.h> #include "log/log.h" -#include "tinycbor7/cbor.h" +#include "tinycbor/cbor.h" #include "datetime/datetime.h" static int diff --git a/sys/log/full/src/log_shell.c b/sys/log/full/src/log_shell.c index 8c71ba16d..32508e893 100644 --- a/sys/log/full/src/log_shell.c +++ b/sys/log/full/src/log_shell.c @@ -35,7 +35,7 @@ #include "shell/shell.h" #include "console/console.h" #include "base64/hex.h" -#include "tinycbor7/cbor.h" +#include "tinycbor/cbor.h" #include "log_cbor_reader/log_cbor_reader.h" void log_console_print_hdr(const struct log_entry_hdr *hdr); diff --git a/sys/log/util/log_cbor_reader/include/log_cbor_reader/log_cbor_reader.h b/sys/log/util/log_cbor_reader/include/log_cbor_reader/log_cbor_reader.h index fd45edced..e987f2c68 100644 --- a/sys/log/util/log_cbor_reader/include/log_cbor_reader/log_cbor_reader.h +++ b/sys/log/util/log_cbor_reader/include/log_cbor_reader/log_cbor_reader.h @@ -22,8 +22,8 @@ #include "os/mynewt.h" #include "log/log.h" -#include "tinycbor7/cbor.h" -#include "tinycbor7/cbor_reader.h" +#include "tinycbor/cbor.h" +#include "tinycbor/cbor_reader.h" #ifdef __cplusplus extern "C" { diff --git a/sys/log/util/log_cbor_reader/pkg.yml b/sys/log/util/log_cbor_reader/pkg.yml index b4e7b47ca..903b1d3ea 100644 --- a/sys/log/util/log_cbor_reader/pkg.yml +++ b/sys/log/util/log_cbor_reader/pkg.yml @@ -27,7 +27,7 @@ pkg.keywords: - reader pkg.deps: - - "@apache-mynewt-core/encoding/tinycbor7" + - "@apache-mynewt-core/encoding/tinycbor" - "@apache-mynewt-core/sys/log/common" pkg.req_apis: diff --git a/sys/metrics/pkg.yml b/sys/metrics/pkg.yml index ae7263e92..2ef83451b 100644 --- a/sys/metrics/pkg.yml +++ b/sys/metrics/pkg.yml @@ -27,7 +27,7 @@ pkg.keywords: pkg.deps: - kernel/os - sys/log/full - - "@apache-mynewt-core/encoding/tinycbor7" + - "@apache-mynewt-core/encoding/tinycbor" pkg.apis: - metrics pkg.deps.METRICS_CLI: diff --git a/sys/metrics/src/cli.c b/sys/metrics/src/cli.c index 30cf6f2fc..1097fac97 100644 --- a/sys/metrics/src/cli.c +++ b/sys/metrics/src/cli.c @@ -27,8 +27,8 @@ #include "shell/shell.h" #include "console/console.h" #include "metrics/metrics.h" -#include "tinycbor7/cbor.h" -#include "tinycbor7/cbor_mbuf_reader.h" +#include "tinycbor/cbor.h" +#include "tinycbor/cbor_mbuf_reader.h" static STAILQ_HEAD(, metrics_event_hdr) g_event_list = STAILQ_HEAD_INITIALIZER(g_event_list); diff --git a/sys/metrics/src/metrics.c b/sys/metrics/src/metrics.c index 720ef6796..ce75428fa 100644 --- a/sys/metrics/src/metrics.c +++ b/sys/metrics/src/metrics.c @@ -25,8 +25,8 @@ #include "syscfg/syscfg.h" #include "os/os.h" #include "metrics/metrics.h" -#include "tinycbor7/cbor.h" -#include "tinycbor7/cbor_mbuf_writer.h" +#include "tinycbor/cbor.h" +#include "tinycbor/cbor_mbuf_writer.h" #include "log/log.h" #include "metrics_priv.h" diff --git a/sys/reboot/pkg.yml b/sys/reboot/pkg.yml index 0c3ebf99c..6df8c4baa 100644 --- a/sys/reboot/pkg.yml +++ b/sys/reboot/pkg.yml @@ -30,7 +30,7 @@ pkg.deps: - "@apache-mynewt-core/sys/config" - "@apache-mynewt-core/sys/flash_map" - "@apache-mynewt-core/sys/log/modlog" - - "@apache-mynewt-core/encoding/tinycbor7" + - "@apache-mynewt-core/encoding/tinycbor" - "@apache-mynewt-core/mgmt/mcumgr/cmd/img_mgmt" - "@mcuboot/boot/bootutil" diff --git a/sys/reboot/src/log_reboot.c b/sys/reboot/src/log_reboot.c index 6ea439d13..dfc2af902 100644 --- a/sys/reboot/src/log_reboot.c +++ b/sys/reboot/src/log_reboot.c @@ -29,7 +29,7 @@ #include "reboot/log_reboot.h" #include "bsp/bsp.h" #include "flash_map/flash_map.h" -#include "tinycbor7/cbor.h" +#include "tinycbor/cbor.h" uint16_t reboot_cnt; static int8_t log_reboot_written; diff --git a/sys/shell/pkg.yml b/sys/shell/pkg.yml index 05a9b5e70..e4856a52e 100644 --- a/sys/shell/pkg.yml +++ b/sys/shell/pkg.yml @@ -34,7 +34,7 @@ pkg.deps.SHELL_MGMT: - "@apache-mynewt-core/util/crc" pkg.deps.SHELL_BRIDGE: - - "@apache-mynewt-core/encoding/tinycbor7" + - "@apache-mynewt-core/encoding/tinycbor" pkg.req_apis: - console diff --git a/sys/shell/src/shell_bridge.c b/sys/shell/src/shell_bridge.c index 00c1dacdb..ff5304c91 100644 --- a/sys/shell/src/shell_bridge.c +++ b/sys/shell/src/shell_bridge.c @@ -24,7 +24,7 @@ #include "mgmt/mgmt.h" #include "cborattr/cborattr.h" #include "streamer/streamer.h" -#include "tinycbor7/cbor_mbuf_writer.h" +#include "tinycbor/cbor_mbuf_writer.h" #include "shell_priv.h" static int shell_bridge_exec(struct mgmt_ctxt *cb); diff --git a/sys/shell/src/shell_bridge_streamer.c b/sys/shell/src/shell_bridge_streamer.c index 63e62ba94..d9df4ddd6 100644 --- a/sys/shell/src/shell_bridge_streamer.c +++ b/sys/shell/src/shell_bridge_streamer.c @@ -21,7 +21,7 @@ #if MYNEWT_VAL(SHELL_BRIDGE) -#include "tinycbor7/cbor.h" +#include "tinycbor/cbor.h" #include "shell_priv.h" static int
