Skip to content

Commit

Permalink
[nrf fromtree] lwm2m_senml_cbor: Regenerate zcbor code using zcbor 0.9.0
Browse files Browse the repository at this point in the history 
And update the patch file and shell script

Signed-off-by: Øyvind Rønningstad <[email protected]>
(cherry picked from commit 7b0e202)
  • Loading branch information
@oyvindronningstad
oyvindronningstad committed Sep 27, 2024
1 parent 553c4e3 commit 0ba2432
Show file tree
Hide file tree
Showing 7 changed files with 238 additions and 332 deletions.
76 changes: 38 additions & 38 deletions subsys/net/lib/lwm2m/lwm2m_senml_cbor.patch
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading

0 comments on commit 0ba2432

Please sign in to comment.