diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor.patch b/subsys/net/lib/lwm2m/lwm2m_senml_cbor.patch index 20b64f91f4a..4ccb047a223 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor.patch +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor.patch @@ -1,11 +1,11 @@ diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c -index 8b136cccf0b..ca935f9f60a 100644 +index f8006525d79..0bd686d8174 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 - * https://github.com/NordicSemiconductor/zcbor + * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 @@ -19,35 +19,35 @@ index 8b136cccf0b..ca935f9f60a 100644 -#error "The type file was generated with a different default_max_qty than this file" -#endif - - static bool decode_repeated_record_bn(zcbor_state_t *state, struct record_bn *result); - static bool decode_repeated_record_bt(zcbor_state_t *state, struct record_bt *result); - static bool decode_repeated_record_n(zcbor_state_t *state, struct record_n *result); -@@ -209,7 +205,7 @@ static bool decode_record( + #define log_result(state, result, func) do { \ + if (!result) { \ + zcbor_trace_file(state); \ +@@ -162,7 +158,7 @@ static bool decode_record( && zcbor_present_decode(&((*result).record_n_present), (zcbor_decoder_t *)decode_repeated_record_n, state, (&(*result).record_n)) && zcbor_present_decode(&((*result).record_t_present), (zcbor_decoder_t *)decode_repeated_record_t, state, (&(*result).record_t)) && zcbor_present_decode(&((*result).record_union_present), (zcbor_decoder_t *)decode_repeated_record_union, state, (&(*result).record_union)) -- && zcbor_multi_decode(0, 5, &(*result).record_key_value_pair_m_count, (zcbor_decoder_t *)decode_repeated_record_key_value_pair_m, state, (&(*result).record_key_value_pair_m), sizeof(struct record_key_value_pair_m))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_map_end_decode(state)))); -+ && zcbor_multi_decode(0, ZCBOR_ARRAY_SIZE(result->record_key_value_pair_m), &(*result).record_key_value_pair_m_count, (zcbor_decoder_t *)decode_repeated_record_key_value_pair_m, state, (&(*result).record_key_value_pair_m), sizeof(struct record_key_value_pair_m))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_map_end_decode(state)))); +- && zcbor_multi_decode(0, 5, &(*result).record_key_value_pair_m_count, (zcbor_decoder_t *)decode_repeated_record_key_value_pair_m, state, (*&(*result).record_key_value_pair_m), sizeof(struct record_key_value_pair_m))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_map_end_decode(state)))); ++ && zcbor_multi_decode(0, ZCBOR_ARRAY_SIZE(result->record_key_value_pair_m), &(*result).record_key_value_pair_m_count, (zcbor_decoder_t *)decode_repeated_record_key_value_pair_m, state, (*&(*result).record_key_value_pair_m), sizeof(struct record_key_value_pair_m))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_map_end_decode(state)))); - if (!tmp_result) { - zcbor_trace_file(state); -@@ -226,7 +222,7 @@ static bool decode_lwm2m_senml( + if (false) { + /* For testing that the types of the arguments are correct. +@@ -184,7 +180,7 @@ static bool decode_lwm2m_senml( { zcbor_log("%s\r\n", __func__); -- bool tmp_result = (((zcbor_list_start_decode(state) && ((zcbor_multi_decode(1, 99, &(*result).lwm2m_senml_record_m_count, (zcbor_decoder_t *)decode_record, state, (&(*result).lwm2m_senml_record_m), sizeof(struct record))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_list_end_decode(state)))); -+ bool tmp_result = (((zcbor_list_start_decode(state) && ((zcbor_multi_decode(1, ZCBOR_ARRAY_SIZE(result->lwm2m_senml_record_m), &(*result).lwm2m_senml_record_m_count, (zcbor_decoder_t *)decode_record, state, (&(*result).lwm2m_senml_record_m), sizeof(struct record))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_list_end_decode(state)))); +- bool res = (((zcbor_list_start_decode(state) && ((zcbor_multi_decode(1, 99, &(*result).lwm2m_senml_record_m_count, (zcbor_decoder_t *)decode_record, state, (*&(*result).lwm2m_senml_record_m), sizeof(struct record))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_list_end_decode(state)))); ++ bool res = (((zcbor_list_start_decode(state) && ((zcbor_multi_decode(1, ZCBOR_ARRAY_SIZE(result->lwm2m_senml_record_m), &(*result).lwm2m_senml_record_m_count, (zcbor_decoder_t *)decode_record, state, (*&(*result).lwm2m_senml_record_m), sizeof(struct record))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_list_end_decode(state)))); - if (!tmp_result) { - zcbor_trace_file(state); + if (false) { + /* For testing that the types of the arguments are correct. diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h -index 8060c2cd932..7316e8fb2c6 100644 +index f9d34fad2e3..636fbd0b500 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 - * https://github.com/NordicSemiconductor/zcbor + * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 @@ -66,13 +66,13 @@ index 8060c2cd932..7316e8fb2c6 100644 const uint8_t *payload, size_t payload_len, struct lwm2m_senml *result, diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c -index d63baab5bcb..cbeef1b4e18 100644 +index 851cf994c6d..4ec898e656d 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 - * https://github.com/NordicSemiconductor/zcbor + * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 @@ -86,41 +86,41 @@ index d63baab5bcb..cbeef1b4e18 100644 -#error "The type file was generated with a different default_max_qty than this file" -#endif - - static bool encode_repeated_record_bn(zcbor_state_t *state, const struct record_bn *input); - static bool encode_repeated_record_bt(zcbor_state_t *state, const struct record_bt *input); - static bool encode_repeated_record_n(zcbor_state_t *state, const struct record_n *input); -@@ -204,12 +200,12 @@ static bool encode_record( + #define log_result(state, result, func) do { \ + if (!result) { \ + zcbor_trace_file(state); \ +@@ -157,12 +153,12 @@ static bool encode_record( { zcbor_log("%s\r\n", __func__); -- bool tmp_result = (((zcbor_map_start_encode(state, 10) && (((!(*input).record_bn_present || encode_repeated_record_bn(state, (&(*input).record_bn))) -+ bool tmp_result = (((zcbor_map_start_encode(state, ZCBOR_ARRAY_SIZE(input->record_key_value_pair_m)) && (((!(*input).record_bn_present || encode_repeated_record_bn(state, (&(*input).record_bn))) +- bool res = (((zcbor_map_start_encode(state, 10) && (((!(*input).record_bn_present || encode_repeated_record_bn(state, (&(*input).record_bn))) ++ bool res = (((zcbor_map_start_encode(state, ZCBOR_ARRAY_SIZE(input->record_key_value_pair_m)) && (((!(*input).record_bn_present || encode_repeated_record_bn(state, (&(*input).record_bn))) && (!(*input).record_bt_present || encode_repeated_record_bt(state, (&(*input).record_bt))) && (!(*input).record_n_present || encode_repeated_record_n(state, (&(*input).record_n))) && (!(*input).record_t_present || encode_repeated_record_t(state, (&(*input).record_t))) && (!(*input).record_union_present || encode_repeated_record_union(state, (&(*input).record_union))) -- && zcbor_multi_encode_minmax(0, 5, &(*input).record_key_value_pair_m_count, (zcbor_encoder_t *)encode_repeated_record_key_value_pair_m, state, (&(*input).record_key_value_pair_m), sizeof(struct record_key_value_pair_m))) || (zcbor_list_map_end_force_encode(state), false)) && zcbor_map_end_encode(state, 10)))); -+ && zcbor_multi_encode_minmax(0, ZCBOR_ARRAY_SIZE(input->record_key_value_pair_m), &(*input).record_key_value_pair_m_count, (zcbor_encoder_t *)encode_repeated_record_key_value_pair_m, state, (&(*input).record_key_value_pair_m), sizeof(struct record_key_value_pair_m))) || (zcbor_list_map_end_force_encode(state), false)) && zcbor_map_end_encode(state, ZCBOR_ARRAY_SIZE(input->record_key_value_pair_m))))); +- && zcbor_multi_encode_minmax(0, 5, &(*input).record_key_value_pair_m_count, (zcbor_encoder_t *)encode_repeated_record_key_value_pair_m, state, (*&(*input).record_key_value_pair_m), sizeof(struct record_key_value_pair_m))) || (zcbor_list_map_end_force_encode(state), false)) && zcbor_map_end_encode(state, 10)))); ++ && zcbor_multi_encode_minmax(0, ZCBOR_ARRAY_SIZE(input->record_key_value_pair_m), &(*input).record_key_value_pair_m_count, (zcbor_encoder_t *)encode_repeated_record_key_value_pair_m, state, (*&(*input).record_key_value_pair_m), sizeof(struct record_key_value_pair_m))) || (zcbor_list_map_end_force_encode(state), false)) && zcbor_map_end_encode(state, ZCBOR_ARRAY_SIZE(input->record_key_value_pair_m))))); - if (!tmp_result) { - zcbor_trace_file(state); -@@ -226,7 +222,7 @@ static bool encode_lwm2m_senml( + log_result(state, res, __func__); + return res; +@@ -173,7 +169,7 @@ static bool encode_lwm2m_senml( { zcbor_log("%s\r\n", __func__); -- bool tmp_result = (((zcbor_list_start_encode(state, 99) && ((zcbor_multi_encode_minmax(1, 99, &(*input).lwm2m_senml_record_m_count, (zcbor_encoder_t *)encode_record, state, (&(*input).lwm2m_senml_record_m), sizeof(struct record))) || (zcbor_list_map_end_force_encode(state), false)) && zcbor_list_end_encode(state, 99)))); -+ bool tmp_result = (((zcbor_list_start_encode(state, ZCBOR_ARRAY_SIZE(input->lwm2m_senml_record_m)) && ((zcbor_multi_encode_minmax(1, ZCBOR_ARRAY_SIZE(input->lwm2m_senml_record_m), &(*input).lwm2m_senml_record_m_count, (zcbor_encoder_t *)encode_record, state, (&(*input).lwm2m_senml_record_m), sizeof(struct record))) || (zcbor_list_map_end_force_encode(state), false)) && zcbor_list_end_encode(state, ZCBOR_ARRAY_SIZE(input->lwm2m_senml_record_m))))); +- bool res = (((zcbor_list_start_encode(state, 99) && ((zcbor_multi_encode_minmax(1, 99, &(*input).lwm2m_senml_record_m_count, (zcbor_encoder_t *)encode_record, state, (*&(*input).lwm2m_senml_record_m), sizeof(struct record))) || (zcbor_list_map_end_force_encode(state), false)) && zcbor_list_end_encode(state, 99)))); ++ bool res = (((zcbor_list_start_encode(state, ZCBOR_ARRAY_SIZE(input->lwm2m_senml_record_m)) && ((zcbor_multi_encode_minmax(1, ZCBOR_ARRAY_SIZE(input->lwm2m_senml_record_m), &(*input).lwm2m_senml_record_m_count, (zcbor_encoder_t *)encode_record, state, (*&(*input).lwm2m_senml_record_m), sizeof(struct record))) || (zcbor_list_map_end_force_encode(state), false)) && zcbor_list_end_encode(state, ZCBOR_ARRAY_SIZE(input->lwm2m_senml_record_m))))); - if (!tmp_result) { - zcbor_trace_file(state); + log_result(state, res, __func__); + return res; diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h -index 8bfba2d834e..fe644015f63 100644 +index de7399bedc7..1a643a6d2ca 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 - * https://github.com/NordicSemiconductor/zcbor + * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 @@ -139,13 +139,13 @@ index 8bfba2d834e..fe644015f63 100644 uint8_t *payload, size_t payload_len, const struct lwm2m_senml *input, diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h -index ad1d0bef58d..662329d1680 100644 +index d8bb8ad74cc..98570bdd52e 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 * - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 - * https://github.com/NordicSemiconductor/zcbor + * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c index 28b0265b9cc..335c8dfbb1f 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.c @@ -1,9 +1,9 @@ /* - * Copyright (c) 2023 Nordic Semiconductor ASA + * Copyright (c) 2024 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 * - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 */ @@ -16,6 +16,17 @@ #include "lwm2m_senml_cbor_decode.h" #include "zcbor_print.h" +#define log_result(state, result, func) \ + do { \ + if (!result) { \ + zcbor_trace_file(state); \ + zcbor_log("%s error: %s\r\n", func, \ + zcbor_error_str(zcbor_peek_error(state))); \ + } else { \ + zcbor_log("%s success\r\n", func); \ + } \ + } while (0) + static bool decode_repeated_record_bn(zcbor_state_t *state, struct record_bn *result); static bool decode_repeated_record_bt(zcbor_state_t *state, struct record_bt *result); static bool decode_repeated_record_n(zcbor_state_t *state, struct record_n *result); @@ -32,74 +43,44 @@ static bool decode_repeated_record_bn(zcbor_state_t *state, struct record_bn *re { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((((zcbor_int32_expect(state, (-2)))) && - (zcbor_tstr_decode(state, (&(*result).record_bn))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = ((((zcbor_int32_expect(state, (-2)))) && + (zcbor_tstr_decode(state, (&(*result).record_bn))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_repeated_record_bt(zcbor_state_t *state, struct record_bt *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((((zcbor_int32_expect(state, (-3)))) && - (zcbor_int64_decode(state, (&(*result).record_bt))) && - ((((*result).record_bt >= INT64_MIN) && ((*result).record_bt <= INT64_MAX)) || - (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = ((((zcbor_int32_expect(state, (-3)))) && + (zcbor_int64_decode(state, (&(*result).record_bt))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_repeated_record_n(zcbor_state_t *state, struct record_n *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((((zcbor_uint32_expect(state, (0)))) && - (zcbor_tstr_decode(state, (&(*result).record_n))))); + bool res = ((((zcbor_uint32_expect(state, (0)))) && + (zcbor_tstr_decode(state, (&(*result).record_n))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_repeated_record_t(zcbor_state_t *state, struct record_t *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((((zcbor_uint32_expect(state, (6)))) && - (zcbor_int64_decode(state, (&(*result).record_t))) && - ((((*result).record_t >= INT64_MIN) && ((*result).record_t <= INT64_MAX)) || - (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = ((((zcbor_uint32_expect(state, (6)))) && + (zcbor_int64_decode(state, (&(*result).record_t))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_repeated_record_union(zcbor_state_t *state, struct record_union_r *result) @@ -108,42 +89,32 @@ static bool decode_repeated_record_union(zcbor_state_t *state, struct record_uni struct zcbor_string tmp_str; bool int_res; - bool tmp_result = - (((zcbor_union_start_code(state) && - (int_res = (((((zcbor_uint32_expect_union(state, (2)))) && - (zcbor_int64_decode(state, (&(*result).union_vi))) && - ((((*result).union_vi >= INT64_MIN) && - ((*result).union_vi <= INT64_MAX)) || - (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && - (((*result).record_union_choice = union_vi_c), true)) || - ((((zcbor_uint32_expect_union(state, (2)))) && - (zcbor_float_decode(state, (&(*result).union_vf)))) && - (((*result).record_union_choice = union_vf_c), true)) || - ((((zcbor_uint32_expect_union(state, (3)))) && - (zcbor_tstr_decode(state, (&(*result).union_vs)))) && - (((*result).record_union_choice = union_vs_c), true)) || - ((((zcbor_uint32_expect_union(state, (4)))) && - (zcbor_bool_decode(state, (&(*result).union_vb)))) && - (((*result).record_union_choice = union_vb_c), true)) || - ((((zcbor_uint32_expect_union(state, (8)))) && - (zcbor_bstr_decode(state, (&(*result).union_vd)))) && - (((*result).record_union_choice = union_vd_c), true)) || - (zcbor_union_elem_code(state) && - ((((zcbor_tstr_expect( - state, ((tmp_str.value = (uint8_t *)"vlo", - tmp_str.len = sizeof("vlo") - 1, &tmp_str))))) && - (zcbor_tstr_decode(state, (&(*result).union_vlo)))) && - (((*result).record_union_choice = union_vlo_c), true)))), - zcbor_union_end_code(state), int_res)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + bool res = (((zcbor_union_start_code(state) && + (int_res = (((((zcbor_uint32_expect_union(state, (2)))) && + (zcbor_int64_decode(state, (&(*result).union_vi)))) && + (((*result).record_union_choice = union_vi_c), true)) || + ((((zcbor_uint32_expect_union(state, (2)))) && + (zcbor_float_decode(state, (&(*result).union_vf)))) && + (((*result).record_union_choice = union_vf_c), true)) || + ((((zcbor_uint32_expect_union(state, (3)))) && + (zcbor_tstr_decode(state, (&(*result).union_vs)))) && + (((*result).record_union_choice = union_vs_c), true)) || + ((((zcbor_uint32_expect_union(state, (4)))) && + (zcbor_bool_decode(state, (&(*result).union_vb)))) && + (((*result).record_union_choice = union_vb_c), true)) || + ((((zcbor_uint32_expect_union(state, (8)))) && + (zcbor_bstr_decode(state, (&(*result).union_vd)))) && + (((*result).record_union_choice = union_vd_c), true)) || + (zcbor_union_elem_code(state) && + ((((zcbor_tstr_expect(state, ((tmp_str.value = (uint8_t *)"vlo", + tmp_str.len = sizeof("vlo") - 1, + &tmp_str))))) && + (zcbor_tstr_decode(state, (&(*result).union_vlo)))) && + (((*result).record_union_choice = union_vlo_c), true)))), + zcbor_union_end_code(state), int_res)))); + + log_result(state, res, __func__); + return res; } static bool decode_value(zcbor_state_t *state, struct value_r *result) @@ -151,47 +122,33 @@ static bool decode_value(zcbor_state_t *state, struct value_r *result) zcbor_log("%s\r\n", __func__); bool int_res; - bool tmp_result = (((zcbor_union_start_code(state) && - (int_res = ((((zcbor_tstr_decode(state, (&(*result).value_tstr)))) && - (((*result).value_choice = value_tstr_c), true)) || - (((zcbor_bstr_decode(state, (&(*result).value_bstr)))) && - (((*result).value_choice = value_bstr_c), true)) || - (((zcbor_int64_decode(state, (&(*result).value_int))) && - ((((*result).value_int >= INT64_MIN) && - ((*result).value_int <= INT64_MAX)) || - (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && - (((*result).value_choice = value_int_c), true)) || - (((zcbor_float_decode(state, (&(*result).value_float)))) && - (((*result).value_choice = value_float_c), true)) || - (((zcbor_bool_decode(state, (&(*result).value_bool)))) && - (((*result).value_choice = value_bool_c), true))), - zcbor_union_end_code(state), int_res)))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + bool res = (((zcbor_union_start_code(state) && + (int_res = ((((zcbor_tstr_decode(state, (&(*result).value_tstr)))) && + (((*result).value_choice = value_tstr_c), true)) || + (((zcbor_bstr_decode(state, (&(*result).value_bstr)))) && + (((*result).value_choice = value_bstr_c), true)) || + (((zcbor_int64_decode(state, (&(*result).value_int)))) && + (((*result).value_choice = value_int_c), true)) || + (zcbor_union_elem_code(state) && + (((zcbor_float_decode(state, (&(*result).value_float)))) && + (((*result).value_choice = value_float_c), true))) || + (((zcbor_bool_decode(state, (&(*result).value_bool)))) && + (((*result).value_choice = value_bool_c), true))), + zcbor_union_end_code(state), int_res)))); + + log_result(state, res, __func__); + return res; } static bool decode_key_value_pair(zcbor_state_t *state, struct key_value_pair *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((((zcbor_int32_decode(state, (&(*result).key_value_pair_key)))) && - (decode_value(state, (&(*result).key_value_pair))))); + bool res = ((((zcbor_int32_decode(state, (&(*result).key_value_pair_key)))) && + (decode_value(state, (&(*result).key_value_pair))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_repeated_record_key_value_pair_m(zcbor_state_t *state, @@ -199,23 +156,17 @@ static bool decode_repeated_record_key_value_pair_m(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((decode_key_value_pair(state, (&(*result).record_key_value_pair_m))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((decode_key_value_pair(state, (&(*result).record_key_value_pair_m))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_record(zcbor_state_t *state, struct record *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((zcbor_map_start_decode(state) && ((zcbor_present_decode(&((*result).record_bn_present), (zcbor_decoder_t *)decode_repeated_record_bn, state, @@ -235,42 +186,50 @@ static bool decode_record(zcbor_state_t *state, struct record *result) zcbor_multi_decode(0, ZCBOR_ARRAY_SIZE(result->record_key_value_pair_m), &(*result).record_key_value_pair_m_count, (zcbor_decoder_t *)decode_repeated_record_key_value_pair_m, - state, (&(*result).record_key_value_pair_m), + state, (*&(*result).record_key_value_pair_m), sizeof(struct record_key_value_pair_m))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_map_end_decode(state)))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); + if (false) { + /* For testing that the types of the arguments are correct. + * A compiler error here means a bug in zcbor. + */ + decode_repeated_record_key_value_pair_m(state, + (*&(*result).record_key_value_pair_m)); + decode_repeated_record_bn(state, (&(*result).record_bn)); + decode_repeated_record_bt(state, (&(*result).record_bt)); + decode_repeated_record_n(state, (&(*result).record_n)); + decode_repeated_record_t(state, (&(*result).record_t)); + decode_repeated_record_union(state, (&(*result).record_union)); } - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_lwm2m_senml(zcbor_state_t *state, struct lwm2m_senml *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((zcbor_list_start_decode(state) && ((zcbor_multi_decode( 1, ZCBOR_ARRAY_SIZE(result->lwm2m_senml_record_m), &(*result).lwm2m_senml_record_m_count, (zcbor_decoder_t *)decode_record, - state, (&(*result).lwm2m_senml_record_m), sizeof(struct record))) || + state, (*&(*result).lwm2m_senml_record_m), sizeof(struct record))) || (zcbor_list_map_end_force_decode(state), false)) && zcbor_list_end_decode(state)))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); + if (false) { + /* For testing that the types of the arguments are correct. + * A compiler error here means a bug in zcbor. + */ + decode_record(state, (*&(*result).lwm2m_senml_record_m)); } - return tmp_result; + log_result(state, res, __func__); + return res; } int cbor_decode_lwm2m_senml(const uint8_t *payload, size_t payload_len, struct lwm2m_senml *result, diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h index 4e1fdeb66a2..36ea5ed143f 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_decode.h @@ -1,9 +1,9 @@ /* - * Copyright (c) 2023 Nordic Semiconductor ASA + * Copyright (c) 2024 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 * - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 */ diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c index 14ec7431e5b..42b821d69c9 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.c @@ -1,9 +1,9 @@ /* - * Copyright (c) 2023 Nordic Semiconductor ASA + * Copyright (c) 2024 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 * - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 */ @@ -16,6 +16,17 @@ #include "lwm2m_senml_cbor_encode.h" #include "zcbor_print.h" +#define log_result(state, result, func) \ + do { \ + if (!result) { \ + zcbor_trace_file(state); \ + zcbor_log("%s error: %s\r\n", func, \ + zcbor_error_str(zcbor_peek_error(state))); \ + } else { \ + zcbor_log("%s success\r\n", func); \ + } \ + } while (0) + static bool encode_repeated_record_bn(zcbor_state_t *state, const struct record_bn *input); static bool encode_repeated_record_bt(zcbor_state_t *state, const struct record_bt *input); static bool encode_repeated_record_n(zcbor_state_t *state, const struct record_n *input); @@ -32,74 +43,44 @@ static bool encode_repeated_record_bn(zcbor_state_t *state, const struct record_ { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((((zcbor_int32_put(state, (-2)))) && - (zcbor_tstr_encode(state, (&(*input).record_bn))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = ((((zcbor_int32_put(state, (-2)))) && + (zcbor_tstr_encode(state, (&(*input).record_bn))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_repeated_record_bt(zcbor_state_t *state, const struct record_bt *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((((zcbor_int32_put(state, (-3)))) && - ((((*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))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = ((((zcbor_int32_put(state, (-3)))) && + (zcbor_int64_encode(state, (&(*input).record_bt))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_repeated_record_n(zcbor_state_t *state, const struct record_n *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((((zcbor_uint32_put(state, (0)))) && - (zcbor_tstr_encode(state, (&(*input).record_n))))); + bool res = ((((zcbor_uint32_put(state, (0)))) && + (zcbor_tstr_encode(state, (&(*input).record_n))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_repeated_record_t(zcbor_state_t *state, const struct record_t *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - ((((zcbor_uint32_put(state, (6)))) && - ((((*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))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = ((((zcbor_uint32_put(state, (6)))) && + (zcbor_int64_encode(state, (&(*input).record_t))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_repeated_record_union(zcbor_state_t *state, const struct record_union_r *input) @@ -107,95 +88,79 @@ static bool encode_repeated_record_union(zcbor_state_t *state, const struct reco zcbor_log("%s\r\n", __func__); struct zcbor_string tmp_str; - bool tmp_result = ((( + bool res = ((( ((*input).record_union_choice == union_vi_c) ? (((zcbor_uint32_put(state, (2)))) && - ((((*input).union_vi >= INT64_MIN) && - ((*input).union_vi <= INT64_MAX)) || - (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) && (zcbor_int64_encode(state, (&(*input).union_vi)))) : (((*input).record_union_choice == union_vf_c) - ? (((zcbor_uint32_put(state, (2)))) && - (zcbor_float64_encode(state, (&(*input).union_vf)))) - : (((*input).record_union_choice == union_vs_c) - ? (((zcbor_uint32_put(state, (3)))) && - (zcbor_tstr_encode(state, (&(*input).union_vs)))) - : (((*input).record_union_choice == union_vb_c) - ? (((zcbor_uint32_put(state, (4)))) && - (zcbor_bool_encode(state, (&(*input).union_vb)))) - : (((*input).record_union_choice == union_vd_c) - ? (((zcbor_uint32_put(state, (8)))) && - (zcbor_bstr_encode(state, (&(*input).union_vd)))) - : (((*input).record_union_choice == union_vlo_c) - ? (((zcbor_tstr_encode( - state, - ((tmp_str.value = (uint8_t *)"vlo", - tmp_str.len = sizeof("vlo") - 1, - &tmp_str))))) && - (zcbor_tstr_encode( - state, - (&(*input).union_vlo)))) - : false)))))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + ? (((zcbor_uint32_put(state, (2)))) && + (zcbor_float64_encode(state, (&(*input).union_vf)))) + : (((*input).record_union_choice == union_vs_c) + ? (((zcbor_uint32_put(state, (3)))) && + (zcbor_tstr_encode(state, (&(*input).union_vs)))) + : (((*input).record_union_choice == union_vb_c) + ? (((zcbor_uint32_put(state, (4)))) && + (zcbor_bool_encode( + state, (&(*input).union_vb)))) + : (((*input).record_union_choice == + union_vd_c) + ? (((zcbor_uint32_put(state, + (8)))) && + (zcbor_bstr_encode( + state, + (&(*input).union_vd)))) + : (((*input).record_union_choice == + union_vlo_c) + ? (((zcbor_tstr_encode( + state, + ((tmp_str.value = + (uint8_t *)"vlo", + tmp_str.len = + sizeof("vlo") - + 1, + &tmp_str))))) && + (zcbor_tstr_encode( + state, + (&(*input).union_vlo)))) + : false)))))))); + + log_result(state, res, __func__); + return res; } static bool encode_value(zcbor_state_t *state, const struct value_r *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((( + bool res = ((( ((*input).value_choice == value_tstr_c) ? ((zcbor_tstr_encode(state, (&(*input).value_tstr)))) : (((*input).value_choice == value_bstr_c) ? ((zcbor_bstr_encode(state, (&(*input).value_bstr)))) : (((*input).value_choice == value_int_c) - ? (((((*input).value_int >= INT64_MIN) && - ((*input).value_int <= INT64_MAX)) || - (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), - false)) && - (zcbor_int64_encode(state, (&(*input).value_int)))) + ? ((zcbor_int64_encode(state, (&(*input).value_int)))) : (((*input).value_choice == value_float_c) ? ((zcbor_float64_encode( - state, (&(*input).value_float)))) + state, (&(*input).value_float)))) : (((*input).value_choice == value_bool_c) ? ((zcbor_bool_encode( - state, - (&(*input).value_bool)))) + state, + (&(*input).value_bool)))) : false))))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_key_value_pair(zcbor_state_t *state, const struct key_value_pair *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((((zcbor_int32_encode(state, (&(*input).key_value_pair_key)))) && - (encode_value(state, (&(*input).key_value_pair))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = ((((zcbor_int32_encode(state, (&(*input).key_value_pair_key)))) && + (encode_value(state, (&(*input).key_value_pair))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_repeated_record_key_value_pair_m(zcbor_state_t *state, @@ -203,23 +168,17 @@ static bool encode_repeated_record_key_value_pair_m(zcbor_state_t *state, { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((encode_key_value_pair(state, (&(*input).record_key_value_pair_m))))); - - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } + bool res = (((encode_key_value_pair(state, (&(*input).record_key_value_pair_m))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_record(zcbor_state_t *state, const struct record *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (( + bool res = (( (zcbor_map_start_encode(state, ZCBOR_ARRAY_SIZE(input->record_key_value_pair_m)) && (((!(*input).record_bn_present || encode_repeated_record_bn(state, (&(*input).record_bn))) && @@ -235,42 +194,30 @@ static bool encode_record(zcbor_state_t *state, const struct record *input) 0, ZCBOR_ARRAY_SIZE(input->record_key_value_pair_m), &(*input).record_key_value_pair_m_count, (zcbor_encoder_t *)encode_repeated_record_key_value_pair_m, state, - (&(*input).record_key_value_pair_m), + (*&(*input).record_key_value_pair_m), sizeof(struct record_key_value_pair_m))) || (zcbor_list_map_end_force_encode(state), false)) && zcbor_map_end_encode(state, ZCBOR_ARRAY_SIZE(input->record_key_value_pair_m))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool encode_lwm2m_senml(zcbor_state_t *state, const struct lwm2m_senml *input) { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((zcbor_list_start_encode(state, ZCBOR_ARRAY_SIZE(input->lwm2m_senml_record_m)) && ((zcbor_multi_encode_minmax( 1, ZCBOR_ARRAY_SIZE(input->lwm2m_senml_record_m), &(*input).lwm2m_senml_record_m_count, (zcbor_encoder_t *)encode_record, - state, (&(*input).lwm2m_senml_record_m), sizeof(struct record))) || + state, (*&(*input).lwm2m_senml_record_m), sizeof(struct record))) || (zcbor_list_map_end_force_encode(state), false)) && zcbor_list_end_encode(state, ZCBOR_ARRAY_SIZE(input->lwm2m_senml_record_m))))); - if (!tmp_result) { - zcbor_trace_file(state); - zcbor_log("%s error: %s\r\n", __func__, zcbor_error_str(zcbor_peek_error(state))); - } else { - zcbor_log("%s success\r\n", __func__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } int cbor_encode_lwm2m_senml(uint8_t *payload, size_t payload_len, const struct lwm2m_senml *input, diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h index fc08ead18d4..257cc5d8120 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_encode.h @@ -1,9 +1,9 @@ /* - * Copyright (c) 2023 Nordic Semiconductor ASA + * Copyright (c) 2024 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 * - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 */ diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_regenerate.sh b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_regenerate.sh index cf293d7b579..87b18c7a71e 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_regenerate.sh +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_regenerate.sh @@ -4,7 +4,7 @@ zcbor code --default-max-qty 99 -c lwm2m_senml_cbor.cddl -e -d -t lwm2m_senml \ --oc lwm2m_senml_cbor.c --oh lwm2m_senml_cbor.h --file-header " -Copyright (c) 2023 Nordic Semiconductor ASA +Copyright (c) 2024 Nordic Semiconductor ASA SPDX-License-Identifier: Apache-2.0 " diff --git a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h index 662329d1680..98570bdd52e 100644 --- a/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h +++ b/subsys/net/lib/lwm2m/lwm2m_senml_cbor_types.h @@ -1,9 +1,9 @@ /* - * Copyright (c) 2023 Nordic Semiconductor ASA + * Copyright (c) 2024 Nordic Semiconductor ASA * * SPDX-License-Identifier: Apache-2.0 * - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/zephyrproject-rtos/zcbor * Generated with a --default-max-qty of 99 */ diff --git a/west.yml b/west.yml index 746c8b9655c..7a25a9530cf 100644 --- a/west.yml +++ b/west.yml @@ -335,7 +335,7 @@ manifest: revision: 150f4eb2955eaf36ac0f9519d4f4f58d5ade5740 path: modules/lib/uoscore-uedhoc - name: zcbor - revision: 75d088037eb237b18e7ec1f47c9ce494b9b95aab + revision: 47f34dd7f5284e8750b5a715dee7f77c6c5bdc3f path: modules/lib/zcbor self: