commit 98e8f320b487a775f49bf554ea29fe8958ab506f
author Dominik Ermel <dominik.ermel@nordicsemi.no> Fri Jan 10 10:32:57 2020 +0000
committer Fabio Utzig <utzig@utzig.org> Thu Mar 12 11:02:09 2020 -0300
tree 05eac7e467a91459e52f850417633eecb434b5e5
parent c4716dbc0bac6da9c1bc4b7fb375e445d4ebc7ee

ext: lib: mgmt: Enabling Zephyr/mynewt-core version of tinycbor

Changes needed due to overwrite of Zephyr fork of Tinycbor with
mynewt-core version.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>

cborattr/src/cborattr.c

diff --git a/cborattr/src/cborattr.c b/cborattr/src/cborattr.c
index 395c2ec..31131b7 100644
--- a/cborattr/src/cborattr.c
+++ b/cborattr/src/cborattr.c
@@ -400,11 +400,7 @@
     CborError err;
 
     cbor_buf_reader_init(&reader, data, len);
-#ifdef __ZEPHYR__
-    err = cbor_parser_cust_reader_init(&reader.r, 0, &parser, &value);
-#else
     err = cbor_parser_init(&reader.r, 0, &parser, &value);
-#endif
     if (err != CborNoError) {
         return -1;
     }

mgmt/src/mgmt.c

diff --git a/mgmt/src/mgmt.c b/mgmt/src/mgmt.c
index ba366a7..08343bb 100644
--- a/mgmt/src/mgmt.c
+++ b/mgmt/src/mgmt.c
@@ -157,21 +157,12 @@
 {
     int rc;
 
-#ifdef __ZEPHYR__
-    rc = cbor_parser_cust_reader_init(streamer->reader, 0, &ctxt->parser,
-                                      &ctxt->it);
-#else
     rc = cbor_parser_init(streamer->reader, 0, &ctxt->parser, &ctxt->it);
-#endif
     if (rc != CborNoError) {
         return mgmt_err_from_cbor(rc);
     }
 
-#ifdef __ZEPHYR__
-    cbor_encoder_cust_writer_init(&ctxt->encoder, streamer->writer, 0);
-#else
     cbor_encoder_init(&ctxt->encoder, streamer->writer, 0);
-#endif
 
     return 0;
 }