Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ext: lib: encoding: tinycbor: fixup newlib_libc reqirement #6968

Merged
merged 2 commits into from
Apr 6, 2018
Merged

ext: lib: encoding: tinycbor: fixup newlib_libc reqirement #6968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8816c9
ext: lib: tinycbor: fix Zephyr specific settings
nvlsianpu Apr 6, 2018
acf4523
ext: lib: tinycbor: fix half-FP feature compilation
nvlsianpu Apr 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ext/lib/encoding/tinycbor/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion ext/lib/encoding/tinycbor/src/compilersupport_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ extern "C" {
# include <assert.h>
#endif
#include <float.h>
#ifndef CBOR_NO_FLOATING_TYPE
#ifndef CBOR_NO_HALF_FLOAT_TYPE
#include <math.h>
#endif
#include <stddef.h>
Expand Down
8 changes: 4 additions & 4 deletions ext/lib/encoding/tinycbor/src/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 **/
Expand Down