commit 470e2f3d5bdcb1892d76a534a745186fd8ff5aab
author Dominik Ermel <dominik.ermel@nordicsemi.no> Fri Jan 10 13:28:48 2020 +0000
committer Carles Cufí <carles.cufi@nordicsemi.no> Thu Mar 12 15:00:30 2020 +0100
tree f0df80e9ae7ec2baa03e4824b58735d330f8c41f
parent 0ce958e7095bb7d4a95efe5f65992b5804307a5f

zephyr: 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>

boot/boot_serial/src/boot_serial.c

diff --git a/boot/boot_serial/src/boot_serial.c b/boot/boot_serial/src/boot_serial.c
index 409ae96..47baa58 100644
--- a/boot/boot_serial/src/boot_serial.c
+++ b/boot/boot_serial/src/boot_serial.c
@@ -33,7 +33,8 @@
 #include <drivers/flash.h>
 #include <sys/crc.h>
 #include <sys/base64.h>
-#include <cbor.h>
+#include <tinycbor/cbor.h>
+#include <tinycbor/cbor_buf_reader.h>
 #else
 #include <bsp/bsp.h>
 #include <hal/hal_system.h>
@@ -261,11 +262,8 @@
      * Object comes within { ... }
      */
     cbor_buf_reader_init(&reader, (uint8_t *)buf, len);
-#ifdef __ZEPHYR__
-    cbor_parser_cust_reader_init(&reader.r, 0, &parser, &root_value);
-#else
     cbor_parser_init(&reader.r, 0, &parser, &root_value);
-#endif
+
     if (!cbor_value_is_container(&root_value)) {
         goto out_invalid_data;
     }
@@ -504,11 +502,7 @@
     len -= sizeof(*hdr);
 
     bs_writer.bytes_written = 0;
-#ifdef __ZEPHYR__
-    cbor_encoder_cust_writer_init(&bs_root, &bs_writer, 0);
-#else
     cbor_encoder_init(&bs_root, &bs_writer, 0);
-#endif
 
     /*
      * Limited support for commands.