From 1e88e7cc9ba3205591f678b7c7ee63dc024d4b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20R=C3=B8nningstad?= Date: Thu, 13 Oct 2022 13:02:04 +0200 Subject: [PATCH] lwm2m_senml_cbor.patch: Update patch file to match current changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit File created by commiting changes and running git diff HEAD~1.. > lwm2m_senml_cbor.patch Signed-off-by: Øyvind Rønningstad --- subsys/net/lib/lwm2m/lwm2m_senml_cbor.patch | 150 ++++++++++++-------- 1 file changed, 90 insertions(+), 60 deletions(-) diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor.patch b/subsys/net/lib/lwm2m/lwm2m_senml_cbor.patch index 8e26f893801..a20dfe3e787 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor.patch +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor.patch @@ -1,19 +1,5 @@ -From f4609477c99e5921c1f744d318a3534d3d70530e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=98yvind=20R=C3=B8nningstad?= - -Date: Fri, 1 Jul 2022 09:54:09 +0200 -Subject: [PATCH] patch - ---- - .../net/lib/lwm2m/lwm2m_senml_cbor_decode.c | 29 ++++++----- - .../net/lib/lwm2m/lwm2m_senml_cbor_decode.h | 16 +++---- - .../net/lib/lwm2m/lwm2m_senml_cbor_encode.c | 48 ++++++++++--------- - .../net/lib/lwm2m/lwm2m_senml_cbor_encode.h | 16 +++---- - subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h | 25 ++++++++-- - 5 files changed, 78 insertions(+), 56 deletions(-) - diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c -index 1a64bd3502..8dfa3bb03a 100644 +index 45eec7f404..b1cabba34b 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c @@ -1,20 +1,21 @@ @@ -23,7 +9,7 @@ index 1a64bd3502..8dfa3bb03a 100644 + * SPDX-License-Identifier: Apache-2.0 + */ /* - * Generated using zcbor version 0.5.1 + * Generated using zcbor version 0.6.0 - * https://github.com/NordicSemiconductor/zcbor + * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 @@ -44,8 +30,30 @@ index 1a64bd3502..8dfa3bb03a 100644 +#include "lwm2m_senml_cbor_decode.h" static bool decode_repeated_record_bn(zcbor_state_t *state, struct record_bn *result); - static bool decode_repeated_record_n(zcbor_state_t *state, struct record_n *result); -@@ -60,8 +61,8 @@ static bool decode_repeated_record_union(zcbor_state_t *state, struct record_uni + static bool decode_repeated_record_bt(zcbor_state_t *state, struct record_bt *result); +@@ -47,8 +48,8 @@ static bool decode_repeated_record_bt(zcbor_state_t *state, struct record_bt *re + + bool tmp_result = ((((zcbor_int32_expect(state, (-3)))) && + (zcbor_int64_decode(state, (&(*result)._record_bt))) && +- ((((*result)._record_bt >= -9223372036854775807LL) && +- ((*result)._record_bt <= 9223372036854775807LL)) || ++ ((((*result)._record_bt >= INT64_MIN) && ++ ((*result)._record_bt <= INT64_MAX)) || + (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)))); + + if (!tmp_result) +@@ -76,8 +77,8 @@ static bool decode_repeated_record_t(zcbor_state_t *state, struct record_t *resu + + bool tmp_result = ((((zcbor_uint32_expect(state, (6)))) && + (zcbor_int64_decode(state, (&(*result)._record_t))) && +- ((((*result)._record_t >= -9223372036854775807LL) && +- ((*result)._record_t <= 9223372036854775807LL)) || ++ ((((*result)._record_t >= INT64_MIN) && ++ ((*result)._record_t <= INT64_MAX)) || + (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)))); + + if (!tmp_result) +@@ -94,8 +95,8 @@ static bool decode_repeated_record_union(zcbor_state_t *state, struct record_uni bool tmp_result = (((zcbor_union_start_code(state) && (int_res = (((((zcbor_uint32_expect_union(state, (2)))) && (zcbor_int64_decode(state, (&(*result)._union_vi))) && @@ -54,41 +62,41 @@ index 1a64bd3502..8dfa3bb03a 100644 + ((((*result)._union_vi >= INT64_MIN) && + ((*result)._union_vi <= INT64_MAX)) || (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && - (((*result)._record_union_choice = _union_vi) || 1)) || + (((*result)._record_union_choice = _union_vi), true)) || ((((zcbor_uint32_expect_union(state, (2)))) && -@@ -96,8 +97,8 @@ static bool decode_value(zcbor_state_t *state, struct value_ *result) +@@ -130,8 +131,8 @@ static bool decode_value(zcbor_state_t *state, struct value_ *result) (((zcbor_bstr_decode(state, (&(*result)._value_bstr)))) && - (((*result)._value_choice = _value_bstr) || 1)) || + (((*result)._value_choice = _value_bstr), true)) || (((zcbor_int64_decode(state, (&(*result)._value_int))) && - ((((*result)._value_int >= -9223372036854775807LL) && - ((*result)._value_int <= 9223372036854775807LL)) || + ((((*result)._value_int >= INT64_MIN) && + ((*result)._value_int <= INT64_MAX)) || (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && - (((*result)._value_choice = _value_int) || 1)) || + (((*result)._value_choice = _value_int), true)) || (((zcbor_float_decode(state, (&(*result)._value_float)))) && -@@ -153,7 +154,8 @@ static bool decode_record(zcbor_state_t *state, struct record *result) +@@ -193,7 +194,8 @@ static bool decode_record(zcbor_state_t *state, struct record *result) zcbor_present_decode(&((*result)._record_union_present), (zcbor_decoder_t *)decode_repeated_record_union, state, (&(*result)._record_union)) && -- zcbor_multi_decode(0, 3, &(*result)._record__key_value_pair_count, -+ zcbor_multi_decode(0, ARRAY_SIZE(result->_record__key_value_pair), +- zcbor_multi_decode(0, 5, &(*result)._record__key_value_pair_count, ++ zcbor_multi_decode(0, ZCBOR_ARRAY_SIZE(result->_record__key_value_pair), + &(*result)._record__key_value_pair_count, (zcbor_decoder_t *)decode_repeated_record__key_value_pair, state, (&(*result)._record__key_value_pair), sizeof(struct record__key_value_pair))) || -@@ -172,7 +174,8 @@ static bool decode_lwm2m_senml(zcbor_state_t *state, struct lwm2m_senml *result) +@@ -212,7 +214,8 @@ static bool decode_lwm2m_senml(zcbor_state_t *state, struct lwm2m_senml *result) bool tmp_result = (( (zcbor_list_start_decode(state) && - ((zcbor_multi_decode(1, 99, &(*result)._lwm2m_senml__record_count, -+ ((zcbor_multi_decode(1, ARRAY_SIZE(result->_lwm2m_senml__record), ++ ((zcbor_multi_decode(1, ZCBOR_ARRAY_SIZE(result->_lwm2m_senml__record), + &(*result)._lwm2m_senml__record_count, (zcbor_decoder_t *)decode_record, state, (&(*result)._lwm2m_senml__record), sizeof(struct record))) || (zcbor_list_map_end_force_decode(state), false)) && diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h -index 1bc78642d3..ddff913391 100644 +index ea2c98fbe5..cf425e9006 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h @@ -1,23 +1,23 @@ @@ -98,7 +106,7 @@ index 1bc78642d3..ddff913391 100644 + * SPDX-License-Identifier: Apache-2.0 + */ /* - * Generated using zcbor version 0.5.1 + * Generated using zcbor version 0.6.0 - * https://github.com/NordicSemiconductor/zcbor + * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 @@ -124,7 +132,7 @@ index 1bc78642d3..ddff913391 100644 int cbor_decode_lwm2m_senml(const uint8_t *payload, size_t payload_len, struct lwm2m_senml *result, size_t *payload_len_out); diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c -index 07dc20e3a9..11007bd92f 100644 +index cd02029d11..3c0c190981 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c @@ -1,20 +1,21 @@ @@ -134,7 +142,7 @@ index 07dc20e3a9..11007bd92f 100644 + * SPDX-License-Identifier: Apache-2.0 + */ /* - * Generated using zcbor version 0.5.1 + * Generated using zcbor version 0.6.0 - * https://github.com/NordicSemiconductor/zcbor + * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 @@ -156,8 +164,30 @@ index 07dc20e3a9..11007bd92f 100644 +#include "lwm2m_senml_cbor_types.h" static bool encode_repeated_record_bn(zcbor_state_t *state, const struct record_bn *input); - static bool encode_repeated_record_n(zcbor_state_t *state, const struct record_n *input); -@@ -59,8 +60,8 @@ static bool encode_repeated_record_union(zcbor_state_t *state, const struct reco + static bool encode_repeated_record_bt(zcbor_state_t *state, const struct record_bt *input); +@@ -46,8 +47,8 @@ static bool encode_repeated_record_bt(zcbor_state_t *state, const struct record_ + zcbor_print("%s\r\n", __func__); + + bool tmp_result = ((((zcbor_int32_put(state, (-3)))) && +- ((((*input)._record_bt >= -9223372036854775807LL) && +- ((*input)._record_bt <= 9223372036854775807LL)) || ++ ((((*input)._record_bt >= INT64_MIN) && ++ ((*input)._record_bt <= INT64_MAX)) || + (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) && + (zcbor_int64_encode(state, (&(*input)._record_bt))))); + +@@ -75,8 +76,8 @@ static bool encode_repeated_record_t(zcbor_state_t *state, const struct record_t + zcbor_print("%s\r\n", __func__); + + bool tmp_result = ((((zcbor_uint32_put(state, (6)))) && +- ((((*input)._record_t >= -9223372036854775807LL) && +- ((*input)._record_t <= 9223372036854775807LL)) || ++ ((((*input)._record_t >= INT64_MIN) && ++ ((*input)._record_t <= INT64_MAX)) || + (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) && + (zcbor_int64_encode(state, (&(*input)._record_t))))); + +@@ -93,8 +94,8 @@ static bool encode_repeated_record_union(zcbor_state_t *state, const struct reco bool tmp_result = ((( ((*input)._record_union_choice == _union_vi) ? (((zcbor_uint32_put(state, (2)))) && @@ -168,7 +198,7 @@ index 07dc20e3a9..11007bd92f 100644 (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) && (zcbor_int64_encode(state, (&(*input)._union_vi)))) : (((*input)._record_union_choice == _union_vf) -@@ -78,8 +79,8 @@ static bool encode_repeated_record_union(zcbor_state_t *state, const struct reco +@@ -112,8 +113,8 @@ static bool encode_repeated_record_union(zcbor_state_t *state, const struct reco ? (((zcbor_uint32_put(state, (8)))) && (zcbor_bstr_encode( @@ -179,19 +209,20 @@ index 07dc20e3a9..11007bd92f 100644 : false))))))); if (!tmp_result) -@@ -99,9 +100,9 @@ static bool encode_value(zcbor_state_t *state, const struct value_ *input) +@@ -132,10 +133,8 @@ static bool encode_value(zcbor_state_t *state, const struct value_ *input) + : (((*input)._value_choice == _value_bstr) ? ((zcbor_bstr_encode(state, (&(*input)._value_bstr)))) : (((*input)._value_choice == _value_int) - ? (((((*input)._value_int >= +- ? (((((*input)._value_int >= - -9223372036854775807LL) && -+ INT64_MIN) && - ((*input)._value_int <= +- ((*input)._value_int <= - 9223372036854775807LL)) || -+ INT64_MAX)) || ++ ? (((((*input)._value_int >= INT64_MIN) && ++ ((*input)._value_int <= INT64_MAX)) || (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) && (zcbor_int64_encode(state, -@@ -112,8 +113,8 @@ static bool encode_value(zcbor_state_t *state, const struct value_ *input) +@@ -146,8 +145,8 @@ static bool encode_value(zcbor_state_t *state, const struct value_ *input) (&(*input)._value_float)))) : (((*input)._value_choice == _value_bool) ? ((zcbor_bool_encode( @@ -202,37 +233,37 @@ index 07dc20e3a9..11007bd92f 100644 : false))))))); if (!tmp_result) -@@ -152,7 +153,9 @@ static bool encode_record(zcbor_state_t *state, const struct record *input) +@@ -186,7 +185,9 @@ static bool encode_record(zcbor_state_t *state, const struct record *input) { zcbor_print("%s\r\n", __func__); -- bool tmp_result = (((zcbor_map_start_encode(state, 6) && -+ int max_keys = ARRAY_SIZE(input->_record__key_value_pair); +- bool tmp_result = (((zcbor_map_start_encode(state, 10) && ++ int max_keys = ZCBOR_ARRAY_SIZE(input->_record__key_value_pair); + -+ bool tmp_result = (((zcbor_map_start_encode(state, max_keys + 3) && ++ bool tmp_result = (((zcbor_map_start_encode(state, max_keys + 5) && ((zcbor_present_encode(&((*input)._record_bn_present), (zcbor_encoder_t *)encode_repeated_record_bn, state, (&(*input)._record_bn)) && -@@ -163,12 +166,12 @@ static bool encode_record(zcbor_state_t *state, const struct record *input) +@@ -203,12 +204,12 @@ static bool encode_record(zcbor_state_t *state, const struct record *input) (zcbor_encoder_t *)encode_repeated_record_union, state, (&(*input)._record_union)) && zcbor_multi_encode_minmax( -- 0, 3, &(*input)._record__key_value_pair_count, +- 0, 5, &(*input)._record__key_value_pair_count, + 0, max_keys, &(*input)._record__key_value_pair_count, (zcbor_encoder_t *)encode_repeated_record__key_value_pair, state, (&(*input)._record__key_value_pair), sizeof(struct record__key_value_pair))) || (zcbor_list_map_end_force_encode(state), false)) && -- zcbor_map_end_encode(state, 6)))); -+ zcbor_map_end_encode(state, max_keys + 3)))); +- zcbor_map_end_encode(state, 10)))); ++ zcbor_map_end_encode(state, max_keys + 5)))); if (!tmp_result) zcbor_trace(); -@@ -179,14 +182,15 @@ static bool encode_record(zcbor_state_t *state, const struct record *input) +@@ -219,14 +220,15 @@ static bool encode_record(zcbor_state_t *state, const struct record *input) static bool encode_lwm2m_senml(zcbor_state_t *state, const struct lwm2m_senml *input) { zcbor_print("%s\r\n", __func__); -+ size_t max_records = ARRAY_SIZE(input->_lwm2m_senml__record); ++ size_t max_records = ZCBOR_ARRAY_SIZE(input->_lwm2m_senml__record); - bool tmp_result = (((zcbor_list_start_encode(state, 99) && + bool tmp_result = (((zcbor_list_start_encode(state, max_records) && @@ -248,7 +279,7 @@ index 07dc20e3a9..11007bd92f 100644 if (!tmp_result) zcbor_trace(); diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h -index 431bc18760..563b82a917 100644 +index e9f7433e06..1a3591ba62 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h @@ -1,23 +1,23 @@ @@ -258,7 +289,7 @@ index 431bc18760..563b82a917 100644 + * SPDX-License-Identifier: Apache-2.0 + */ /* - * Generated using zcbor version 0.5.1 + * Generated using zcbor version 0.6.0 - * https://github.com/NordicSemiconductor/zcbor + * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 @@ -284,17 +315,17 @@ index 431bc18760..563b82a917 100644 int cbor_encode_lwm2m_senml(uint8_t *payload, size_t payload_len, const struct lwm2m_senml *input, size_t *payload_len_out); diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h -index f02b7df151..d8e7d3405a 100644 +index 8614d551f4..f7cf2c1baa 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h -@@ -1,18 +1,33 @@ +@@ -1,18 +1,35 @@ +/* + * Copyright (c) 2022 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: Apache-2.0 + */ /* - * Generated using zcbor version 0.5.1 + * Generated using zcbor version 0.6.0 - * https://github.com/NordicSemiconductor/zcbor + * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 @@ -314,7 +345,9 @@ index f02b7df151..d8e7d3405a 100644 + +enum lwm2m_senml_cbor_key { + lwm2m_senml_cbor_key_bn = -2, ++ lwm2m_senml_cbor_key_bt = -3, + lwm2m_senml_cbor_key_n = 0, ++ lwm2m_senml_cbor_key_t = 6, + lwm2m_senml_cbor_key_vi = 2, + lwm2m_senml_cbor_key_vf = 2, + lwm2m_senml_cbor_key_vs = 3, @@ -324,7 +357,7 @@ index f02b7df151..d8e7d3405a 100644 /** Which value for --default-max-qty this file was created with. * -@@ -21,7 +36,7 @@ +@@ -21,7 +38,7 @@ * * See `zcbor --help` for more information about --default-max-qty */ @@ -333,7 +366,7 @@ index f02b7df151..d8e7d3405a 100644 struct record_bn { struct zcbor_string _record_bn; -@@ -96,7 +111,7 @@ struct record { +@@ -108,7 +125,7 @@ struct record { }; struct lwm2m_senml { @@ -342,6 +375,3 @@ index f02b7df151..d8e7d3405a 100644 uint_fast32_t _lwm2m_senml__record_count; }; --- -2.37.0 -