From d8816c9d9ec06b6209d146e6d07c1643039c18ed Mon Sep 17 00:00:00 2001 From: Andrzej Puzdrowski Date: Fri, 6 Apr 2018 15:22:13 +0200 Subject: [PATCH 1/2] ext: lib: tinycbor: fix Zephyr specific settings This path make logic for enabling float and half-float support positive driven and fix NEWLIB_LIBC selections for these features. Signed-off-by: Andrzej Puzdrowski --- ext/lib/encoding/tinycbor/Kconfig | 12 ++++++------ ext/lib/encoding/tinycbor/src/config.h | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ext/lib/encoding/tinycbor/Kconfig b/ext/lib/encoding/tinycbor/Kconfig index fa438532e979..8799da96be72 100644 --- a/ext/lib/encoding/tinycbor/Kconfig +++ b/ext/lib/encoding/tinycbor/Kconfig @@ -61,19 +61,19 @@ config CBOR_PARSER_NO_STRICT_CHECKS help This option enables the strict parser checks. -config CBOR_NO_FLOATING_POINT +config CBOR_FLOATING_POINT bool select NEWLIB_LIBC - prompt "No Floating point support" - default y + prompt "Floating point support" + default n help This option enables floating point support. -config CBOR_NO_HALF_FLOAT_TYPE +config CBOR_HALF_FLOAT_TYPE bool select NEWLIB_LIBC - prompt "No Half float type support" - default y + prompt "Half float type support" + default n help This option enables half float type support. diff --git a/ext/lib/encoding/tinycbor/src/config.h b/ext/lib/encoding/tinycbor/src/config.h index 50726af37a8b..ea243ddcbc1e 100644 --- a/ext/lib/encoding/tinycbor/src/config.h +++ b/ext/lib/encoding/tinycbor/src/config.h @@ -46,13 +46,13 @@ #endif /** This option enables floating point support **/ -#ifdef CONFIG_CBOR_NO_FLOATING_POINT -#define CBOR_NO_FLOATING_POINT CONFIG_CBOR_NO_FLOATING_POINT +#ifndef CONFIG_CBOR_FLOATING_POINT +#define CBOR_NO_FLOATING_POINT 1 #endif /** This option enables half float type support **/ -#ifdef CONFIG_CBOR_NO_HALF_FLOAT_TYPE -#define CBOR_NO_HALF_FLOAT_TYPE CONFIG_CBOR_NO_HALF_FLOAT_TYPE +#ifndef CONFIG_CBOR_HALF_FLOAT_TYPE +#define CBOR_NO_HALF_FLOAT_TYPE 1 #endif /** This option enables open memstream support **/ From acf452374ed70aec443bf1d63379d10a9a9e4a22 Mon Sep 17 00:00:00 2001 From: Andrzej Puzdrowski Date: Fri, 6 Apr 2018 15:27:08 +0200 Subject: [PATCH 2/2] ext: lib: tinycbor: fix half-FP feature compilation half-FP feature requires form newlib_libc. It was include wrongly by default. This path fix conduction for related include directive. Signed-off-by: Andrzej Puzdrowski --- ext/lib/encoding/tinycbor/src/compilersupport_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/lib/encoding/tinycbor/src/compilersupport_p.h b/ext/lib/encoding/tinycbor/src/compilersupport_p.h index d21a86bcee2e..51a4584901c7 100644 --- a/ext/lib/encoding/tinycbor/src/compilersupport_p.h +++ b/ext/lib/encoding/tinycbor/src/compilersupport_p.h @@ -41,7 +41,7 @@ extern "C" { # include #endif #include -#ifndef CBOR_NO_FLOATING_TYPE +#ifndef CBOR_NO_HALF_FLOAT_TYPE #include #endif #include