From d320778890ce8ae26eed7d048756027f884afebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20R=C3=B8nningstad?= Date: Thu, 22 Aug 2024 14:54:51 +0200 Subject: [PATCH 1/2] fmfu_fdev: Regenerate zcbor code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using zcbor 0.9.0 Signed-off-by: Øyvind Rønningstad --- .../releases/release-notes-changelog.rst | 4 + .../fmfu_fdev/include/modem_update_decode.h | 2 +- .../fmfu_fdev/include/modem_update_types.h | 2 +- .../dfu/fmfu_fdev/src/modem_update_decode.c | 140 +++++++----------- 4 files changed, 63 insertions(+), 85 deletions(-) diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index 1e2be3d78430..653a183c6023 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -474,6 +474,10 @@ DFU libraries |no_changes_yet_note| +* :ref:`lib_fmfu_fdev`: + + * Regenerated the zcbor-generated code files using v0.9.0. + Gazell libraries ---------------- diff --git a/subsys/dfu/fmfu_fdev/include/modem_update_decode.h b/subsys/dfu/fmfu_fdev/include/modem_update_decode.h index 933ce49dddf7..357b47bba61f 100644 --- a/subsys/dfu/fmfu_fdev/include/modem_update_decode.h +++ b/subsys/dfu/fmfu_fdev/include/modem_update_decode.h @@ -5,7 +5,7 @@ */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 128 */ diff --git a/subsys/dfu/fmfu_fdev/include/modem_update_types.h b/subsys/dfu/fmfu_fdev/include/modem_update_types.h index cc9fc701f74e..e5793da64253 100644 --- a/subsys/dfu/fmfu_fdev/include/modem_update_types.h +++ b/subsys/dfu/fmfu_fdev/include/modem_update_types.h @@ -5,7 +5,7 @@ */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 128 */ diff --git a/subsys/dfu/fmfu_fdev/src/modem_update_decode.c b/subsys/dfu/fmfu_fdev/src/modem_update_decode.c index 423c3d73dd06..815744d9e4f1 100644 --- a/subsys/dfu/fmfu_fdev/src/modem_update_decode.c +++ b/subsys/dfu/fmfu_fdev/src/modem_update_decode.c @@ -5,7 +5,7 @@ */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 128 */ @@ -22,6 +22,17 @@ #error "The type file was generated with a different default_max_qty than this file" #endif +#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_Segment(zcbor_state_t *state, struct Segment *result); static bool decode_header_map(zcbor_state_t *state, void *result); static bool decode_Manifest(zcbor_state_t *state, struct Manifest *result); @@ -34,62 +45,43 @@ static bool decode_Segment(zcbor_state_t *state, struct Segment *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((((zcbor_uint32_decode(state, (&(*result).Segment_target_addr)))) && - ((zcbor_uint32_decode(state, (&(*result).Segment_len))))))); - - 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_decode(state, (&(*result).Segment_target_addr)))) && + ((zcbor_uint32_decode(state, (&(*result).Segment_len))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_header_map(zcbor_state_t *state, void *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = + bool res = (((zcbor_map_start_decode(state) && (((((zcbor_uint32_expect(state, (1)))) && (zcbor_int32_expect(state, (-37))))) || (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__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_Manifest(zcbor_state_t *state, struct Manifest *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = (((zcbor_list_start_decode(state) && - ((((zcbor_uint32_decode(state, (&(*result).Manifest_version)))) && - ((zcbor_uint32_decode(state, (&(*result).Manifest_compat)))) && - ((zcbor_bstr_decode(state, (&(*result).Manifest_blob_hash))) && - ((((*result).Manifest_blob_hash.len >= 32) && - ((*result).Manifest_blob_hash.len <= 32)) || - (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && - ((zcbor_bstr_decode(state, (&(*result).Manifest_segments))))) || - (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__); - } - - return tmp_result; + bool res = (((zcbor_list_start_decode(state) && + ((((zcbor_uint32_decode(state, (&(*result).Manifest_version)))) && + ((zcbor_uint32_decode(state, (&(*result).Manifest_compat)))) && + ((zcbor_bstr_decode(state, (&(*result).Manifest_blob_hash))) && + ((((*result).Manifest_blob_hash.len == 32)) || + (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && + ((zcbor_bstr_decode(state, (&(*result).Manifest_segments))))) || + (zcbor_list_map_end_force_decode(state), false)) && + zcbor_list_end_decode(state)))); + + log_result(state, res, __func__); + return res; } static bool decode_COSE_Sign1_Manifest(zcbor_state_t *state, struct COSE_Sign1_Manifest *result) @@ -97,7 +89,7 @@ static bool decode_COSE_Sign1_Manifest(zcbor_state_t *state, struct COSE_Sign1_M zcbor_log("%s\r\n", __func__); bool int_res; - bool tmp_result = + bool res = (((zcbor_list_start_decode(state) && ((((zcbor_bstr_start_decode(state, &(*result).COSE_Sign1_Manifest_protected) && (int_res = (((decode_header_map(state, NULL)))), @@ -108,42 +100,36 @@ static bool decode_COSE_Sign1_Manifest(zcbor_state_t *state, struct COSE_Sign1_M state, (&(*result).COSE_Sign1_Manifest_payload_cbor))))), zcbor_bstr_end_decode(state), int_res))) && ((zcbor_bstr_decode(state, (&(*result).COSE_Sign1_Manifest_signature))) && - ((((*result).COSE_Sign1_Manifest_signature.len >= 256) && - ((*result).COSE_Sign1_Manifest_signature.len <= 256)) || + ((((*result).COSE_Sign1_Manifest_signature.len == 256)) || (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)))) || (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__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_Segments(zcbor_state_t *state, struct Segments *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((zcbor_list_start_decode(state) && - ((zcbor_multi_decode(1, 128, &(*result).Segments_Segment_m_count, - (zcbor_decoder_t *)decode_Segment, state, - (&(*result).Segments_Segment_m), sizeof(struct Segment))) || - (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__); + bool res = (( + (zcbor_list_start_decode(state) && + ((zcbor_multi_decode(1, 128, &(*result).Segments_Segment_m_count, + (zcbor_decoder_t *)decode_Segment, state, + (*&(*result).Segments_Segment_m), sizeof(struct Segment))) || + (zcbor_list_map_end_force_decode(state), false)) && + zcbor_list_end_decode(state)))); + + if (false) { + /* For testing that the types of the arguments are correct. + * A compiler error here means a bug in zcbor. + */ + decode_Segment(state, (*&(*result).Segments_Segment_m)); } - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_Sig_structure1(zcbor_state_t *state, struct Sig_structure1 *result) @@ -152,7 +138,7 @@ static bool decode_Sig_structure1(zcbor_state_t *state, struct Sig_structure1 *r struct zcbor_string tmp_str; bool int_res; - bool tmp_result = + bool res = (((zcbor_list_start_decode(state) && ((((zcbor_tstr_expect(state, ((tmp_str.value = (uint8_t *)"Signature1", @@ -166,31 +152,19 @@ static bool decode_Sig_structure1(zcbor_state_t *state, struct Sig_structure1 *r (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__); - } - - return tmp_result; + log_result(state, res, __func__); + return res; } static bool decode_Wrapper(zcbor_state_t *state, struct COSE_Sign1_Manifest *result) { zcbor_log("%s\r\n", __func__); - bool tmp_result = ((zcbor_tag_expect(state, 18) && - (decode_COSE_Sign1_Manifest(state, (&(*result)))))); - - 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_tag_expect(state, 18) && + (decode_COSE_Sign1_Manifest(state, (&(*result)))))); - return tmp_result; + log_result(state, res, __func__); + return res; } int cbor_decode_Wrapper(const uint8_t *payload, size_t payload_len, From 87fdba4ed3e70765093ea89b02bda4f0d52bec62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20R=C3=B8nningstad?= Date: Thu, 22 Aug 2024 16:34:26 +0200 Subject: [PATCH 2/2] sdfw_services: Regenerate zcbor-generated client code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using zcbor 0.9.0 Signed-off-by: Øyvind Rønningstad --- .../zcbor_generated/enc_fw_service_decode.c | 193 +++-- .../zcbor_generated/enc_fw_service_decode.h | 17 +- .../zcbor_generated/enc_fw_service_encode.c | 189 +++-- .../zcbor_generated/enc_fw_service_encode.h | 18 +- .../zcbor_generated/enc_fw_service_types.h | 38 +- .../zcbor_generated/extmem_service_decode.c | 659 +++++++++--------- .../zcbor_generated/extmem_service_decode.h | 21 +- .../zcbor_generated/extmem_service_encode.c | 633 ++++++++--------- .../zcbor_generated/extmem_service_encode.h | 24 +- .../zcbor_generated/extmem_service_types.h | 132 ++-- 10 files changed, 929 insertions(+), 995 deletions(-) diff --git a/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_decode.c b/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_decode.c index 62472160f58d..3db29566249f 100644 --- a/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_decode.c +++ b/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_decode.c @@ -5,140 +5,125 @@ */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ -#include +#include "enc_fw_service_decode.h" +#include "zcbor_decode.h" +#include "zcbor_print.h" #include #include +#include #include -#include "zcbor_decode.h" -#include "enc_fw_service_decode.h" -#include "zcbor_print.h" #if DEFAULT_MAX_QTY != 3 -#error "The type file was generated with a different default_max_qty than this file" +#error \ + "The type file was generated with a different default_max_qty than this file" #endif +#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_init(zcbor_state_t *state, struct init *result); static bool decode_chunk(zcbor_state_t *state, struct chunk *result); static bool decode_enc_fw_rsp(zcbor_state_t *state, int32_t *result); static bool decode_enc_fw_req(zcbor_state_t *state, struct enc_fw_req *result); -static bool decode_init(zcbor_state_t *state, struct init *result) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = - (((((zcbor_uint32_expect(state, (0)))) && - ((zcbor_bstr_decode(state, (&(*result).init_aad))) && - ((((*result).init_aad.len >= 8) && ((*result).init_aad.len <= 8)) || - (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && - ((zcbor_bstr_decode(state, (&(*result).init_nonce))) && - ((((*result).init_nonce.len >= 12) && ((*result).init_nonce.len <= 12)) || - (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && - ((zcbor_bstr_decode(state, (&(*result).init_tag))) && - ((((*result).init_tag.len >= 16) && ((*result).init_tag.len <= 16)) || - (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && - ((zcbor_uint32_decode(state, (&(*result).init_buffer_addr)))) && - ((zcbor_uint32_decode(state, (&(*result).init_buffer_len)))) && - ((zcbor_uint32_decode(state, (&(*result).init_image_addr)))) && - ((zcbor_uint32_decode(state, (&(*result).init_image_len))))))); - - 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; +static bool decode_init(zcbor_state_t *state, struct init *result) { + zcbor_log("%s\r\n", __func__); + + bool res = (((((zcbor_uint32_expect(state, (0)))) && + ((zcbor_bstr_decode(state, (&(*result).init_aad))) && + ((((*result).init_aad.len == 8)) || + (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && + ((zcbor_bstr_decode(state, (&(*result).init_nonce))) && + ((((*result).init_nonce.len == 12)) || + (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && + ((zcbor_bstr_decode(state, (&(*result).init_tag))) && + ((((*result).init_tag.len == 16)) || + (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false))) && + ((zcbor_uint32_decode(state, (&(*result).init_buffer_addr)))) && + ((zcbor_uint32_decode(state, (&(*result).init_buffer_len)))) && + ((zcbor_uint32_decode(state, (&(*result).init_image_addr)))) && + ((zcbor_uint32_decode(state, (&(*result).init_image_len))))))); + + log_result(state, res, __func__); + return res; } -static bool decode_chunk(zcbor_state_t *state, struct chunk *result) -{ - zcbor_log("%s\r\n", __func__); +static bool decode_chunk(zcbor_state_t *state, struct chunk *result) { + zcbor_log("%s\r\n", __func__); - bool tmp_result = (((((zcbor_uint32_expect(state, (1)))) && - ((zcbor_uint32_decode(state, (&(*result).chunk_length)))) && - ((zcbor_bool_decode(state, (&(*result).chunk_last))))))); + bool res = (((((zcbor_uint32_expect(state, (1)))) && + ((zcbor_uint32_decode(state, (&(*result).chunk_length)))) && + ((zcbor_bool_decode(state, (&(*result).chunk_last))))))); - 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_enc_fw_rsp(zcbor_state_t *state, int32_t *result) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = (((zcbor_list_start_decode(state) && - ((((zcbor_int32_decode(state, (&(*result)))))) || - (zcbor_list_map_end_force_decode(state), false)) && - zcbor_list_end_decode(state)))); +static bool decode_enc_fw_rsp(zcbor_state_t *state, int32_t *result) { + zcbor_log("%s\r\n", __func__); - 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_list_start_decode(state) && + ((((zcbor_int32_decode(state, (&(*result)))))) || + (zcbor_list_map_end_force_decode(state), false)) && + zcbor_list_end_decode(state)))); - return tmp_result; + log_result(state, res, __func__); + return res; } -static bool decode_enc_fw_req(zcbor_state_t *state, struct enc_fw_req *result) -{ - zcbor_log("%s\r\n", __func__); - bool int_res; - - bool tmp_result = - (((zcbor_list_start_decode(state) && - ((((zcbor_union_start_code(state) && - (int_res = ((((decode_init(state, (&(*result).enc_fw_req_msg_init_m)))) && - (((*result).enc_fw_req_msg_choice = enc_fw_req_msg_init_m_c), - true)) || - (zcbor_union_elem_code(state) && - (((decode_chunk(state, (&(*result).enc_fw_req_msg_chunk_m)))) && - (((*result).enc_fw_req_msg_choice = enc_fw_req_msg_chunk_m_c), - true)))), - zcbor_union_end_code(state), int_res)))) || - (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__); - } - - return tmp_result; +static bool decode_enc_fw_req(zcbor_state_t *state, struct enc_fw_req *result) { + zcbor_log("%s\r\n", __func__); + bool int_res; + + bool res = ((( + zcbor_list_start_decode(state) && + ((((zcbor_union_start_code(state) && + (int_res = + ((((decode_init(state, (&(*result).enc_fw_req_msg_init_m)))) && + (((*result).enc_fw_req_msg_choice = enc_fw_req_msg_init_m_c), + true)) || + (zcbor_union_elem_code(state) && + (((decode_chunk(state, + (&(*result).enc_fw_req_msg_chunk_m)))) && + (((*result).enc_fw_req_msg_choice = enc_fw_req_msg_chunk_m_c), + true)))), + zcbor_union_end_code(state), int_res)))) || + (zcbor_list_map_end_force_decode(state), false)) && + zcbor_list_end_decode(state)))); + + log_result(state, res, __func__); + return res; } -int cbor_decode_enc_fw_req(const uint8_t *payload, size_t payload_len, struct enc_fw_req *result, - size_t *payload_len_out) -{ - zcbor_state_t states[4]; +int cbor_decode_enc_fw_req(const uint8_t *payload, size_t payload_len, + struct enc_fw_req *result, size_t *payload_len_out) { + zcbor_state_t states[4]; - return zcbor_entry_function(payload, payload_len, (void *)result, payload_len_out, states, - (zcbor_decoder_t *)decode_enc_fw_req, - sizeof(states) / sizeof(zcbor_state_t), 1); + return zcbor_entry_function(payload, payload_len, (void *)result, + payload_len_out, states, + (zcbor_decoder_t *)decode_enc_fw_req, + sizeof(states) / sizeof(zcbor_state_t), 1); } -int cbor_decode_enc_fw_rsp(const uint8_t *payload, size_t payload_len, int32_t *result, - size_t *payload_len_out) -{ - zcbor_state_t states[3]; +int cbor_decode_enc_fw_rsp(const uint8_t *payload, size_t payload_len, + int32_t *result, size_t *payload_len_out) { + zcbor_state_t states[3]; - return zcbor_entry_function(payload, payload_len, (void *)result, payload_len_out, states, - (zcbor_decoder_t *)decode_enc_fw_rsp, - sizeof(states) / sizeof(zcbor_state_t), 1); + return zcbor_entry_function(payload, payload_len, (void *)result, + payload_len_out, states, + (zcbor_decoder_t *)decode_enc_fw_rsp, + sizeof(states) / sizeof(zcbor_state_t), 1); } diff --git a/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_decode.h b/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_decode.h index b1dbbd53ab87..25bfc8521a15 100644 --- a/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_decode.h +++ b/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_decode.h @@ -5,7 +5,7 @@ */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ @@ -13,25 +13,26 @@ #ifndef ENC_FW_SERVICE_DECODE_H__ #define ENC_FW_SERVICE_DECODE_H__ -#include +#include "enc_fw_service_types.h" #include #include +#include #include -#include "enc_fw_service_types.h" #ifdef __cplusplus extern "C" { #endif #if DEFAULT_MAX_QTY != 3 -#error "The type file was generated with a different default_max_qty than this file" +#error \ + "The type file was generated with a different default_max_qty than this file" #endif -int cbor_decode_enc_fw_req(const uint8_t *payload, size_t payload_len, struct enc_fw_req *result, - size_t *payload_len_out); +int cbor_decode_enc_fw_req(const uint8_t *payload, size_t payload_len, + struct enc_fw_req *result, size_t *payload_len_out); -int cbor_decode_enc_fw_rsp(const uint8_t *payload, size_t payload_len, int32_t *result, - size_t *payload_len_out); +int cbor_decode_enc_fw_rsp(const uint8_t *payload, size_t payload_len, + int32_t *result, size_t *payload_len_out); #ifdef __cplusplus } diff --git a/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_encode.c b/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_encode.c index c094cae07aeb..10ced0f4dcce 100644 --- a/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_encode.c +++ b/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_encode.c @@ -5,135 +5,122 @@ */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ -#include +#include "enc_fw_service_encode.h" +#include "zcbor_encode.h" +#include "zcbor_print.h" #include #include +#include #include -#include "zcbor_encode.h" -#include "enc_fw_service_encode.h" -#include "zcbor_print.h" #if DEFAULT_MAX_QTY != 3 -#error "The type file was generated with a different default_max_qty than this file" +#error \ + "The type file was generated with a different default_max_qty than this file" #endif +#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_init(zcbor_state_t *state, const struct init *input); static bool encode_chunk(zcbor_state_t *state, const struct chunk *input); static bool encode_enc_fw_rsp(zcbor_state_t *state, const int32_t *input); -static bool encode_enc_fw_req(zcbor_state_t *state, const struct enc_fw_req *input); - -static bool encode_init(zcbor_state_t *state, const struct init *input) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = - (((((zcbor_uint32_put(state, (0)))) && - (((((*input).init_aad.len >= 8) && ((*input).init_aad.len <= 8)) || - (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) && - (zcbor_bstr_encode(state, (&(*input).init_aad)))) && - (((((*input).init_nonce.len >= 12) && ((*input).init_nonce.len <= 12)) || - (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) && - (zcbor_bstr_encode(state, (&(*input).init_nonce)))) && - (((((*input).init_tag.len >= 16) && ((*input).init_tag.len <= 16)) || - (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) && - (zcbor_bstr_encode(state, (&(*input).init_tag)))) && - ((zcbor_uint32_encode(state, (&(*input).init_buffer_addr)))) && - ((zcbor_uint32_encode(state, (&(*input).init_buffer_len)))) && - ((zcbor_uint32_encode(state, (&(*input).init_image_addr)))) && - ((zcbor_uint32_encode(state, (&(*input).init_image_len))))))); - - 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; +static bool encode_enc_fw_req(zcbor_state_t *state, + const struct enc_fw_req *input); + +static bool encode_init(zcbor_state_t *state, const struct init *input) { + zcbor_log("%s\r\n", __func__); + + bool res = (((((zcbor_uint32_put(state, (0)))) && + (((((*input).init_aad.len == 8)) || + (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) && + (zcbor_bstr_encode(state, (&(*input).init_aad)))) && + (((((*input).init_nonce.len == 12)) || + (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) && + (zcbor_bstr_encode(state, (&(*input).init_nonce)))) && + (((((*input).init_tag.len == 16)) || + (zcbor_error(state, ZCBOR_ERR_WRONG_RANGE), false)) && + (zcbor_bstr_encode(state, (&(*input).init_tag)))) && + ((zcbor_uint32_encode(state, (&(*input).init_buffer_addr)))) && + ((zcbor_uint32_encode(state, (&(*input).init_buffer_len)))) && + ((zcbor_uint32_encode(state, (&(*input).init_image_addr)))) && + ((zcbor_uint32_encode(state, (&(*input).init_image_len))))))); + + log_result(state, res, __func__); + return res; } -static bool encode_chunk(zcbor_state_t *state, const struct chunk *input) -{ - zcbor_log("%s\r\n", __func__); +static bool encode_chunk(zcbor_state_t *state, const struct chunk *input) { + zcbor_log("%s\r\n", __func__); - bool tmp_result = (((((zcbor_uint32_put(state, (1)))) && - ((zcbor_uint32_encode(state, (&(*input).chunk_length)))) && - ((zcbor_bool_encode(state, (&(*input).chunk_last))))))); + bool res = (((((zcbor_uint32_put(state, (1)))) && + ((zcbor_uint32_encode(state, (&(*input).chunk_length)))) && + ((zcbor_bool_encode(state, (&(*input).chunk_last))))))); - 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_enc_fw_rsp(zcbor_state_t *state, const int32_t *input) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = (((zcbor_list_start_encode(state, 1) && - ((((zcbor_int32_encode(state, (&(*input)))))) || - (zcbor_list_map_end_force_encode(state), false)) && - zcbor_list_end_encode(state, 1)))); +static bool encode_enc_fw_rsp(zcbor_state_t *state, const int32_t *input) { + zcbor_log("%s\r\n", __func__); - 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_list_start_encode(state, 1) && + ((((zcbor_int32_encode(state, (&(*input)))))) || + (zcbor_list_map_end_force_encode(state), false)) && + zcbor_list_end_encode(state, 1)))); - return tmp_result; + log_result(state, res, __func__); + return res; } -static bool encode_enc_fw_req(zcbor_state_t *state, const struct enc_fw_req *input) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = ((( - zcbor_list_start_encode(state, 8) && - ((((((*input).enc_fw_req_msg_choice == enc_fw_req_msg_init_m_c) - ? ((encode_init(state, (&(*input).enc_fw_req_msg_init_m)))) - : (((*input).enc_fw_req_msg_choice == enc_fw_req_msg_chunk_m_c) - ? ((encode_chunk(state, (&(*input).enc_fw_req_msg_chunk_m)))) - : false)))) || - (zcbor_list_map_end_force_encode(state), false)) && - zcbor_list_end_encode(state, 8)))); - - 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; +static bool encode_enc_fw_req(zcbor_state_t *state, + const struct enc_fw_req *input) { + zcbor_log("%s\r\n", __func__); + + bool res = + (((zcbor_list_start_encode(state, 8) && + ((((((*input).enc_fw_req_msg_choice == enc_fw_req_msg_init_m_c) + ? ((encode_init(state, (&(*input).enc_fw_req_msg_init_m)))) + : (((*input).enc_fw_req_msg_choice == enc_fw_req_msg_chunk_m_c) + ? ((encode_chunk(state, + (&(*input).enc_fw_req_msg_chunk_m)))) + : false)))) || + (zcbor_list_map_end_force_encode(state), false)) && + zcbor_list_end_encode(state, 8)))); + + log_result(state, res, __func__); + return res; } -int cbor_encode_enc_fw_req(uint8_t *payload, size_t payload_len, const struct enc_fw_req *input, - size_t *payload_len_out) -{ - zcbor_state_t states[4]; +int cbor_encode_enc_fw_req(uint8_t *payload, size_t payload_len, + const struct enc_fw_req *input, + size_t *payload_len_out) { + zcbor_state_t states[4]; - return zcbor_entry_function(payload, payload_len, (void *)input, payload_len_out, states, - (zcbor_decoder_t *)encode_enc_fw_req, - sizeof(states) / sizeof(zcbor_state_t), 1); + return zcbor_entry_function(payload, payload_len, (void *)input, + payload_len_out, states, + (zcbor_decoder_t *)encode_enc_fw_req, + sizeof(states) / sizeof(zcbor_state_t), 1); } -int cbor_encode_enc_fw_rsp(uint8_t *payload, size_t payload_len, const int32_t *input, - size_t *payload_len_out) -{ - zcbor_state_t states[3]; +int cbor_encode_enc_fw_rsp(uint8_t *payload, size_t payload_len, + const int32_t *input, size_t *payload_len_out) { + zcbor_state_t states[3]; - return zcbor_entry_function(payload, payload_len, (void *)input, payload_len_out, states, - (zcbor_decoder_t *)encode_enc_fw_rsp, - sizeof(states) / sizeof(zcbor_state_t), 1); + return zcbor_entry_function(payload, payload_len, (void *)input, + payload_len_out, states, + (zcbor_decoder_t *)encode_enc_fw_rsp, + sizeof(states) / sizeof(zcbor_state_t), 1); } diff --git a/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_encode.h b/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_encode.h index 4fec1b3d0352..e65681bd8fc4 100644 --- a/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_encode.h +++ b/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_encode.h @@ -5,7 +5,7 @@ */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ @@ -13,25 +13,27 @@ #ifndef ENC_FW_SERVICE_ENCODE_H__ #define ENC_FW_SERVICE_ENCODE_H__ -#include +#include "enc_fw_service_types.h" #include #include +#include #include -#include "enc_fw_service_types.h" #ifdef __cplusplus extern "C" { #endif #if DEFAULT_MAX_QTY != 3 -#error "The type file was generated with a different default_max_qty than this file" +#error \ + "The type file was generated with a different default_max_qty than this file" #endif -int cbor_encode_enc_fw_req(uint8_t *payload, size_t payload_len, const struct enc_fw_req *input, - size_t *payload_len_out); +int cbor_encode_enc_fw_req(uint8_t *payload, size_t payload_len, + const struct enc_fw_req *input, + size_t *payload_len_out); -int cbor_encode_enc_fw_rsp(uint8_t *payload, size_t payload_len, const int32_t *input, - size_t *payload_len_out); +int cbor_encode_enc_fw_rsp(uint8_t *payload, size_t payload_len, + const int32_t *input, size_t *payload_len_out); #ifdef __cplusplus } diff --git a/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_types.h b/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_types.h index c39dbb499309..32d99a9e19da 100644 --- a/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_types.h +++ b/subsys/sdfw_services/services/enc_fw/zcbor_generated/enc_fw_service_types.h @@ -5,7 +5,7 @@ */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ @@ -13,9 +13,9 @@ #ifndef ENC_FW_SERVICE_TYPES_H__ #define ENC_FW_SERVICE_TYPES_H__ -#include #include #include +#include #include #ifdef __cplusplus @@ -32,29 +32,29 @@ extern "C" { #define DEFAULT_MAX_QTY 3 struct init { - struct zcbor_string init_aad; - struct zcbor_string init_nonce; - struct zcbor_string init_tag; - uint32_t init_buffer_addr; - uint32_t init_buffer_len; - uint32_t init_image_addr; - uint32_t init_image_len; + struct zcbor_string init_aad; + struct zcbor_string init_nonce; + struct zcbor_string init_tag; + uint32_t init_buffer_addr; + uint32_t init_buffer_len; + uint32_t init_image_addr; + uint32_t init_image_len; }; struct chunk { - uint32_t chunk_length; - bool chunk_last; + uint32_t chunk_length; + bool chunk_last; }; struct enc_fw_req { - union { - struct init enc_fw_req_msg_init_m; - struct chunk enc_fw_req_msg_chunk_m; - }; - enum { - enc_fw_req_msg_init_m_c, - enc_fw_req_msg_chunk_m_c, - } enc_fw_req_msg_choice; + union { + struct init enc_fw_req_msg_init_m; + struct chunk enc_fw_req_msg_chunk_m; + }; + enum { + enc_fw_req_msg_init_m_c, + enc_fw_req_msg_chunk_m_c, + } enc_fw_req_msg_choice; }; #ifdef __cplusplus diff --git a/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_decode.c b/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_decode.c index bb16407ee17b..d4a658735086 100644 --- a/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_decode.c +++ b/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_decode.c @@ -5,403 +5,374 @@ */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ -#include +#include "extmem_service_decode.h" +#include "zcbor_decode.h" +#include "zcbor_print.h" #include #include +#include #include -#include "zcbor_decode.h" -#include "extmem_service_decode.h" -#include "zcbor_print.h" #if DEFAULT_MAX_QTY != 3 -#error "The type file was generated with a different default_max_qty than this file" +#error \ + "The type file was generated with a different default_max_qty than this file" #endif -static bool decode_extmem_read_done_req(zcbor_state_t *state, struct extmem_read_done_req *result); -static bool decode_extmem_write_setup_req(zcbor_state_t *state, - struct extmem_write_setup_req *result); +#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_extmem_read_done_req(zcbor_state_t *state, + struct extmem_read_done_req *result); +static bool +decode_extmem_write_setup_req(zcbor_state_t *state, + struct extmem_write_setup_req *result); static bool decode_extmem_write_done_req(zcbor_state_t *state, - struct extmem_write_done_req *result); + struct extmem_write_done_req *result); static bool decode_extmem_erase_done_req(zcbor_state_t *state, - struct extmem_erase_done_req *result); -static bool decode_extmem_get_capabilities_req(zcbor_state_t *state, - struct extmem_get_capabilities_req *result); -static bool decode_extmem_read_pending_notify(zcbor_state_t *state, - struct extmem_read_pending_notify *result); -static bool decode_extmem_write_pending_notify(zcbor_state_t *state, - struct extmem_write_pending_notify *result); -static bool decode_extmem_erase_pending_notify(zcbor_state_t *state, - struct extmem_erase_pending_notify *result); + struct extmem_erase_done_req *result); +static bool +decode_extmem_get_capabilities_req(zcbor_state_t *state, + struct extmem_get_capabilities_req *result); +static bool +decode_extmem_read_pending_notify(zcbor_state_t *state, + struct extmem_read_pending_notify *result); +static bool +decode_extmem_write_pending_notify(zcbor_state_t *state, + struct extmem_write_pending_notify *result); +static bool +decode_extmem_erase_pending_notify(zcbor_state_t *state, + struct extmem_erase_pending_notify *result); static bool decode_extmem_get_capabilities_notify_pending( - zcbor_state_t *state, struct extmem_get_capabilities_notify_pending *result); + zcbor_state_t *state, + struct extmem_get_capabilities_notify_pending *result); static bool decode_extmem_nfy(zcbor_state_t *state, struct extmem_nfy *result); static bool decode_extmem_rsp(zcbor_state_t *state, struct extmem_rsp *result); static bool decode_extmem_req(zcbor_state_t *state, struct extmem_req *result); -static bool decode_extmem_read_done_req(zcbor_state_t *state, struct extmem_read_done_req *result) -{ - zcbor_log("%s\r\n", __func__); +static bool decode_extmem_read_done_req(zcbor_state_t *state, + struct extmem_read_done_req *result) { + zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_expect(state, (1)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_read_done_req_request_id)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_read_done_req_error)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_read_done_req_addr))))))); + bool res = ((( + ((zcbor_uint32_expect(state, (1)))) && + ((zcbor_uint32_decode(state, + (&(*result).extmem_read_done_req_request_id)))) && + ((zcbor_uint32_decode(state, (&(*result).extmem_read_done_req_error)))) && + ((zcbor_uint32_decode(state, (&(*result).extmem_read_done_req_addr))))))); - 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_extmem_write_setup_req(zcbor_state_t *state, - struct extmem_write_setup_req *result) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = - (((((zcbor_uint32_expect(state, (3)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_write_setup_req_request_id)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_write_setup_req_error)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_write_setup_req_addr))))))); - - 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; +static bool +decode_extmem_write_setup_req(zcbor_state_t *state, + struct extmem_write_setup_req *result) { + zcbor_log("%s\r\n", __func__); + + bool res = (((((zcbor_uint32_expect(state, (3)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_write_setup_req_request_id)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_write_setup_req_error)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_write_setup_req_addr))))))); + + log_result(state, res, __func__); + return res; } -static bool decode_extmem_write_done_req(zcbor_state_t *state, struct extmem_write_done_req *result) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = - (((((zcbor_uint32_expect(state, (5)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_write_done_req_request_id)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_write_done_req_error))))))); +static bool decode_extmem_write_done_req(zcbor_state_t *state, + struct extmem_write_done_req *result) { + zcbor_log("%s\r\n", __func__); - 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, (5)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_write_done_req_request_id)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_write_done_req_error))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } -static bool decode_extmem_erase_done_req(zcbor_state_t *state, struct extmem_erase_done_req *result) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = - (((((zcbor_uint32_expect(state, (7)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_erase_done_req_request_id)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_erase_done_req_error))))))); +static bool decode_extmem_erase_done_req(zcbor_state_t *state, + struct extmem_erase_done_req *result) { + zcbor_log("%s\r\n", __func__); - 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, (7)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_erase_done_req_request_id)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_erase_done_req_error))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } -static bool decode_extmem_get_capabilities_req(zcbor_state_t *state, - struct extmem_get_capabilities_req *result) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = ((( - ((zcbor_uint32_expect(state, (9)))) && - ((zcbor_uint32_decode(state, - (&(*result).extmem_get_capabilities_req_request_id)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_get_capabilities_req_error)))) && - ((zcbor_uint32_decode(state, - (&(*result).extmem_get_capabilities_req_base_addr)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_get_capabilities_req_capacity)))) && - ((zcbor_uint32_decode(state, - (&(*result).extmem_get_capabilities_req_erase_size)))) && - ((zcbor_uint32_decode(state, - (&(*result).extmem_get_capabilities_req_write_size)))) && - ((zcbor_uint32_decode(state, - (&(*result).extmem_get_capabilities_req_chunk_size)))) && - ((zcbor_bool_decode(state, - (&(*result).extmem_get_capabilities_req_memory_mapped))))))); - - 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; +static bool +decode_extmem_get_capabilities_req(zcbor_state_t *state, + struct extmem_get_capabilities_req *result) { + zcbor_log("%s\r\n", __func__); + + bool res = (( + (((zcbor_uint32_expect(state, (9)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_get_capabilities_req_request_id)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_get_capabilities_req_error)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_get_capabilities_req_base_addr)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_get_capabilities_req_capacity)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_get_capabilities_req_erase_size)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_get_capabilities_req_write_size)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_get_capabilities_req_chunk_size)))) && + ((zcbor_bool_decode( + state, (&(*result).extmem_get_capabilities_req_memory_mapped))))))); + + log_result(state, res, __func__); + return res; } -static bool decode_extmem_read_pending_notify(zcbor_state_t *state, - struct extmem_read_pending_notify *result) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = - (((((zcbor_uint32_expect(state, (2)))) && - ((zcbor_uint32_decode(state, - (&(*result).extmem_read_pending_notify_request_id)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_read_pending_notify_offset)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_read_pending_notify_size))))))); - - 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; +static bool +decode_extmem_read_pending_notify(zcbor_state_t *state, + struct extmem_read_pending_notify *result) { + zcbor_log("%s\r\n", __func__); + + bool res = + (((((zcbor_uint32_expect(state, (2)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_read_pending_notify_request_id)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_read_pending_notify_offset)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_read_pending_notify_size))))))); + + log_result(state, res, __func__); + return res; } -static bool decode_extmem_write_pending_notify(zcbor_state_t *state, - struct extmem_write_pending_notify *result) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = (( - (((zcbor_uint32_expect(state, (6)))) && - ((zcbor_uint32_decode(state, - (&(*result).extmem_write_pending_notify_request_id)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_write_pending_notify_offset)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_write_pending_notify_size))))))); - - 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; +static bool +decode_extmem_write_pending_notify(zcbor_state_t *state, + struct extmem_write_pending_notify *result) { + zcbor_log("%s\r\n", __func__); + + bool res = + (((((zcbor_uint32_expect(state, (6)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_write_pending_notify_request_id)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_write_pending_notify_offset)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_write_pending_notify_size))))))); + + log_result(state, res, __func__); + return res; } -static bool decode_extmem_erase_pending_notify(zcbor_state_t *state, - struct extmem_erase_pending_notify *result) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = (( - (((zcbor_uint32_expect(state, (8)))) && - ((zcbor_uint32_decode(state, - (&(*result).extmem_erase_pending_notify_request_id)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_erase_pending_notify_offset)))) && - ((zcbor_uint32_decode(state, (&(*result).extmem_erase_pending_notify_size))))))); - - 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; +static bool +decode_extmem_erase_pending_notify(zcbor_state_t *state, + struct extmem_erase_pending_notify *result) { + zcbor_log("%s\r\n", __func__); + + bool res = + (((((zcbor_uint32_expect(state, (8)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_erase_pending_notify_request_id)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_erase_pending_notify_offset)))) && + ((zcbor_uint32_decode( + state, (&(*result).extmem_erase_pending_notify_size))))))); + + log_result(state, res, __func__); + return res; } -static bool -decode_extmem_get_capabilities_notify_pending(zcbor_state_t *state, - struct extmem_get_capabilities_notify_pending *result) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = ((( - ((zcbor_uint32_expect(state, (10)))) && - ((zcbor_uint32_decode( - state, (&(*result).extmem_get_capabilities_notify_pending_request_id))))))); - - 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; +static bool decode_extmem_get_capabilities_notify_pending( + zcbor_state_t *state, + struct extmem_get_capabilities_notify_pending *result) { + zcbor_log("%s\r\n", __func__); + + bool res = (( + (((zcbor_uint32_expect(state, (10)))) && + ((zcbor_uint32_decode( + state, + (&(*result).extmem_get_capabilities_notify_pending_request_id))))))); + + log_result(state, res, __func__); + return res; } -static bool decode_extmem_nfy(zcbor_state_t *state, struct extmem_nfy *result) -{ - zcbor_log("%s\r\n", __func__); - bool int_res; - - bool tmp_result = (((zcbor_list_start_decode(state) && ((((zcbor_union_start_code(state) && - (int_res = ((((decode_extmem_read_pending_notify( - state, (&(*result).extmem_nfy_msg_extmem_read_pending_notify_m)))) && - (((*result).extmem_nfy_msg_choice = - extmem_nfy_msg_extmem_read_pending_notify_m_c), true)) || - (zcbor_union_elem_code(state) && - (((decode_extmem_write_pending_notify( - state, (&(*result).extmem_nfy_msg_extmem_write_pending_notify_m)))) && - (((*result).extmem_nfy_msg_choice = - extmem_nfy_msg_extmem_write_pending_notify_m_c), true))) || - (zcbor_union_elem_code(state) && - (((decode_extmem_erase_pending_notify( - state, (&(*result).extmem_nfy_msg_extmem_erase_pending_notify_m)))) && - (((*result).extmem_nfy_msg_choice = - extmem_nfy_msg_extmem_erase_pending_notify_m_c), true))) || - (zcbor_union_elem_code(state) && - (((decode_extmem_get_capabilities_notify_pending( - state, - (&(*result).extmem_nfy_msg_extmem_get_capabilities_notify_pending_m)))) && - (((*result).extmem_nfy_msg_choice = - extmem_nfy_msg_extmem_get_capabilities_notify_pending_m_c), true)))), - zcbor_union_end_code(state), int_res)))) || - (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__); - } - - return tmp_result; +static bool decode_extmem_nfy(zcbor_state_t *state, struct extmem_nfy *result) { + zcbor_log("%s\r\n", __func__); + bool int_res; + + bool res = ((( + zcbor_list_start_decode(state) && + ((((zcbor_union_start_code(state) && + (int_res = + ((((decode_extmem_read_pending_notify( + state, + (&(*result) + .extmem_nfy_msg_extmem_read_pending_notify_m)))) && + (((*result).extmem_nfy_msg_choice = + extmem_nfy_msg_extmem_read_pending_notify_m_c), + true)) || + (zcbor_union_elem_code(state) && + (((decode_extmem_write_pending_notify( + state, + (&(*result) + .extmem_nfy_msg_extmem_write_pending_notify_m)))) && + (((*result).extmem_nfy_msg_choice = + extmem_nfy_msg_extmem_write_pending_notify_m_c), + true))) || + (zcbor_union_elem_code(state) && + (((decode_extmem_erase_pending_notify( + state, + (&(*result) + .extmem_nfy_msg_extmem_erase_pending_notify_m)))) && + (((*result).extmem_nfy_msg_choice = + extmem_nfy_msg_extmem_erase_pending_notify_m_c), + true))) || + (zcbor_union_elem_code(state) && + (((decode_extmem_get_capabilities_notify_pending( + state, + (&(*result) + .extmem_nfy_msg_extmem_get_capabilities_notify_pending_m)))) && + (((*result).extmem_nfy_msg_choice = + extmem_nfy_msg_extmem_get_capabilities_notify_pending_m_c), + true)))), + zcbor_union_end_code(state), int_res)))) || + (zcbor_list_map_end_force_decode(state), false)) && + zcbor_list_end_decode(state)))); + + log_result(state, res, __func__); + return res; } -static bool decode_extmem_rsp(zcbor_state_t *state, struct extmem_rsp *result) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = (((zcbor_list_start_decode(state) && - ((((((zcbor_uint_decode(state, &(*result).extmem_rsp_msg_choice, - sizeof((*result).extmem_rsp_msg_choice)))) && - ((((((*result).extmem_rsp_msg_choice == - extmem_rsp_msg_extmem_read_done_rsp_m_c) && - ((1))) || - (((*result).extmem_rsp_msg_choice == - extmem_rsp_msg_extmem_write_setup_rsp_m_c) && - ((1))) || - (((*result).extmem_rsp_msg_choice == - extmem_rsp_msg_extmem_write_done_rsp_m_c) && - ((1))) || - (((*result).extmem_rsp_msg_choice == - extmem_rsp_msg_extmem_erase_done_rsp_m_c) && - ((1))) || - (((*result).extmem_rsp_msg_choice == - extmem_rsp_msg_extmem_get_capabilities_rsp_m_c) && - ((1)))) || - (zcbor_error(state, ZCBOR_ERR_WRONG_VALUE), false)))))) || - (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__); - } - - return tmp_result; +static bool decode_extmem_rsp(zcbor_state_t *state, struct extmem_rsp *result) { + zcbor_log("%s\r\n", __func__); + + bool res = + (((zcbor_list_start_decode(state) && + ((((((zcbor_uint_decode(state, &(*result).extmem_rsp_msg_choice, + sizeof((*result).extmem_rsp_msg_choice)))) && + ((((((*result).extmem_rsp_msg_choice == + extmem_rsp_msg_extmem_read_done_rsp_m_c) && + ((1))) || + (((*result).extmem_rsp_msg_choice == + extmem_rsp_msg_extmem_write_setup_rsp_m_c) && + ((1))) || + (((*result).extmem_rsp_msg_choice == + extmem_rsp_msg_extmem_write_done_rsp_m_c) && + ((1))) || + (((*result).extmem_rsp_msg_choice == + extmem_rsp_msg_extmem_erase_done_rsp_m_c) && + ((1))) || + (((*result).extmem_rsp_msg_choice == + extmem_rsp_msg_extmem_get_capabilities_rsp_m_c) && + ((1)))) || + (zcbor_error(state, ZCBOR_ERR_WRONG_VALUE), false)))))) || + (zcbor_list_map_end_force_decode(state), false)) && + zcbor_list_end_decode(state)))); + + log_result(state, res, __func__); + return res; } -static bool decode_extmem_req(zcbor_state_t *state, struct extmem_req *result) -{ - zcbor_log("%s\r\n", __func__); - bool int_res; - - bool tmp_result = ((( - zcbor_list_start_decode(state) && - ((((zcbor_union_start_code(state) && - (int_res = - ((((decode_extmem_read_done_req( - state, - (&(*result).extmem_req_msg_extmem_read_done_req_m)))) && - (((*result).extmem_req_msg_choice = - extmem_req_msg_extmem_read_done_req_m_c), - true)) || - (zcbor_union_elem_code(state) && - (((decode_extmem_write_setup_req( - state, - (&(*result).extmem_req_msg_extmem_write_setup_req_m)))) && - (((*result).extmem_req_msg_choice = - extmem_req_msg_extmem_write_setup_req_m_c), - true))) || - (zcbor_union_elem_code(state) && - (((decode_extmem_write_done_req( - state, - (&(*result).extmem_req_msg_extmem_write_done_req_m)))) && - (((*result).extmem_req_msg_choice = - extmem_req_msg_extmem_write_done_req_m_c), - true))) || - (zcbor_union_elem_code(state) && - (((decode_extmem_erase_done_req( - state, - (&(*result).extmem_req_msg_extmem_erase_done_req_m)))) && - (((*result).extmem_req_msg_choice = - extmem_req_msg_extmem_erase_done_req_m_c), - true))) || - (zcbor_union_elem_code(state) && - (((decode_extmem_get_capabilities_req( - state, - (&(*result) - .extmem_req_msg_extmem_get_capabilities_req_m))) - ) && - (((*result).extmem_req_msg_choice = - extmem_req_msg_extmem_get_capabilities_req_m_c), - true)))), - zcbor_union_end_code(state), int_res)))) || - (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__); - } - - return tmp_result; +static bool decode_extmem_req(zcbor_state_t *state, struct extmem_req *result) { + zcbor_log("%s\r\n", __func__); + bool int_res; + + bool res = ((( + zcbor_list_start_decode(state) && + ((((zcbor_union_start_code(state) && + (int_res = + ((((decode_extmem_read_done_req( + state, + (&(*result).extmem_req_msg_extmem_read_done_req_m)))) && + (((*result).extmem_req_msg_choice = + extmem_req_msg_extmem_read_done_req_m_c), + true)) || + (zcbor_union_elem_code(state) && + (((decode_extmem_write_setup_req( + state, + (&(*result).extmem_req_msg_extmem_write_setup_req_m)))) && + (((*result).extmem_req_msg_choice = + extmem_req_msg_extmem_write_setup_req_m_c), + true))) || + (zcbor_union_elem_code(state) && + (((decode_extmem_write_done_req( + state, + (&(*result).extmem_req_msg_extmem_write_done_req_m)))) && + (((*result).extmem_req_msg_choice = + extmem_req_msg_extmem_write_done_req_m_c), + true))) || + (zcbor_union_elem_code(state) && + (((decode_extmem_erase_done_req( + state, + (&(*result).extmem_req_msg_extmem_erase_done_req_m)))) && + (((*result).extmem_req_msg_choice = + extmem_req_msg_extmem_erase_done_req_m_c), + true))) || + (zcbor_union_elem_code(state) && + (((decode_extmem_get_capabilities_req( + state, + (&(*result) + .extmem_req_msg_extmem_get_capabilities_req_m)))) && + (((*result).extmem_req_msg_choice = + extmem_req_msg_extmem_get_capabilities_req_m_c), + true)))), + zcbor_union_end_code(state), int_res)))) || + (zcbor_list_map_end_force_decode(state), false)) && + zcbor_list_end_decode(state)))); + + log_result(state, res, __func__); + return res; } -int cbor_decode_extmem_req(const uint8_t *payload, size_t payload_len, struct extmem_req *result, - size_t *payload_len_out) -{ - zcbor_state_t states[4]; +int cbor_decode_extmem_req(const uint8_t *payload, size_t payload_len, + struct extmem_req *result, size_t *payload_len_out) { + zcbor_state_t states[4]; - return zcbor_entry_function(payload, payload_len, (void *)result, payload_len_out, states, - (zcbor_decoder_t *)decode_extmem_req, - sizeof(states) / sizeof(zcbor_state_t), 1); + return zcbor_entry_function(payload, payload_len, (void *)result, + payload_len_out, states, + (zcbor_decoder_t *)decode_extmem_req, + sizeof(states) / sizeof(zcbor_state_t), 1); } -int cbor_decode_extmem_rsp(const uint8_t *payload, size_t payload_len, struct extmem_rsp *result, - size_t *payload_len_out) -{ - zcbor_state_t states[4]; +int cbor_decode_extmem_rsp(const uint8_t *payload, size_t payload_len, + struct extmem_rsp *result, size_t *payload_len_out) { + zcbor_state_t states[4]; - return zcbor_entry_function(payload, payload_len, (void *)result, payload_len_out, states, - (zcbor_decoder_t *)decode_extmem_rsp, - sizeof(states) / sizeof(zcbor_state_t), 1); + return zcbor_entry_function(payload, payload_len, (void *)result, + payload_len_out, states, + (zcbor_decoder_t *)decode_extmem_rsp, + sizeof(states) / sizeof(zcbor_state_t), 1); } -int cbor_decode_extmem_nfy(const uint8_t *payload, size_t payload_len, struct extmem_nfy *result, - size_t *payload_len_out) -{ - zcbor_state_t states[4]; +int cbor_decode_extmem_nfy(const uint8_t *payload, size_t payload_len, + struct extmem_nfy *result, size_t *payload_len_out) { + zcbor_state_t states[4]; - return zcbor_entry_function(payload, payload_len, (void *)result, payload_len_out, states, - (zcbor_decoder_t *)decode_extmem_nfy, - sizeof(states) / sizeof(zcbor_state_t), 1); + return zcbor_entry_function(payload, payload_len, (void *)result, + payload_len_out, states, + (zcbor_decoder_t *)decode_extmem_nfy, + sizeof(states) / sizeof(zcbor_state_t), 1); } diff --git a/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_decode.h b/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_decode.h index b4e7887df8d7..aebe4204c36c 100644 --- a/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_decode.h +++ b/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_decode.h @@ -5,7 +5,7 @@ */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ @@ -13,28 +13,29 @@ #ifndef EXTMEM_SERVICE_DECODE_H__ #define EXTMEM_SERVICE_DECODE_H__ -#include +#include "extmem_service_types.h" #include #include +#include #include -#include "extmem_service_types.h" #ifdef __cplusplus extern "C" { #endif #if DEFAULT_MAX_QTY != 3 -#error "The type file was generated with a different default_max_qty than this file" +#error \ + "The type file was generated with a different default_max_qty than this file" #endif -int cbor_decode_extmem_req(const uint8_t *payload, size_t payload_len, struct extmem_req *result, - size_t *payload_len_out); +int cbor_decode_extmem_req(const uint8_t *payload, size_t payload_len, + struct extmem_req *result, size_t *payload_len_out); -int cbor_decode_extmem_rsp(const uint8_t *payload, size_t payload_len, struct extmem_rsp *result, - size_t *payload_len_out); +int cbor_decode_extmem_rsp(const uint8_t *payload, size_t payload_len, + struct extmem_rsp *result, size_t *payload_len_out); -int cbor_decode_extmem_nfy(const uint8_t *payload, size_t payload_len, struct extmem_nfy *result, - size_t *payload_len_out); +int cbor_decode_extmem_nfy(const uint8_t *payload, size_t payload_len, + struct extmem_nfy *result, size_t *payload_len_out); #ifdef __cplusplus } diff --git a/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_encode.c b/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_encode.c index 2eee86cb577b..f8a2128dba06 100644 --- a/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_encode.c +++ b/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_encode.c @@ -5,379 +5,358 @@ */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ -#include +#include "extmem_service_encode.h" +#include "zcbor_encode.h" +#include "zcbor_print.h" #include #include +#include #include -#include "zcbor_encode.h" -#include "extmem_service_encode.h" -#include "zcbor_print.h" #if DEFAULT_MAX_QTY != 3 -#error "The type file was generated with a different default_max_qty than this file" +#error \ + "The type file was generated with a different default_max_qty than this file" #endif -static bool encode_extmem_read_done_req(zcbor_state_t *state, - const struct extmem_read_done_req *input); -static bool encode_extmem_write_setup_req(zcbor_state_t *state, - const struct extmem_write_setup_req *input); -static bool encode_extmem_write_done_req(zcbor_state_t *state, - const struct extmem_write_done_req *input); -static bool encode_extmem_erase_done_req(zcbor_state_t *state, - const struct extmem_erase_done_req *input); -static bool encode_extmem_get_capabilities_req(zcbor_state_t *state, - const struct extmem_get_capabilities_req *input); -static bool encode_extmem_read_pending_notify(zcbor_state_t *state, - const struct extmem_read_pending_notify *input); -static bool encode_extmem_write_pending_notify(zcbor_state_t *state, - const struct extmem_write_pending_notify *input); -static bool encode_extmem_erase_pending_notify(zcbor_state_t *state, - const struct extmem_erase_pending_notify *input); +#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_extmem_read_done_req(zcbor_state_t *state, + const struct extmem_read_done_req *input); +static bool +encode_extmem_write_setup_req(zcbor_state_t *state, + const struct extmem_write_setup_req *input); +static bool +encode_extmem_write_done_req(zcbor_state_t *state, + const struct extmem_write_done_req *input); +static bool +encode_extmem_erase_done_req(zcbor_state_t *state, + const struct extmem_erase_done_req *input); +static bool encode_extmem_get_capabilities_req( + zcbor_state_t *state, const struct extmem_get_capabilities_req *input); +static bool encode_extmem_read_pending_notify( + zcbor_state_t *state, const struct extmem_read_pending_notify *input); +static bool encode_extmem_write_pending_notify( + zcbor_state_t *state, const struct extmem_write_pending_notify *input); +static bool encode_extmem_erase_pending_notify( + zcbor_state_t *state, const struct extmem_erase_pending_notify *input); static bool encode_extmem_get_capabilities_notify_pending( - zcbor_state_t *state, const struct extmem_get_capabilities_notify_pending *input); -static bool encode_extmem_nfy(zcbor_state_t *state, const struct extmem_nfy *input); -static bool encode_extmem_rsp(zcbor_state_t *state, const struct extmem_rsp *input); -static bool encode_extmem_req(zcbor_state_t *state, const struct extmem_req *input); - -static bool encode_extmem_read_done_req(zcbor_state_t *state, - const struct extmem_read_done_req *input) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = - (((((zcbor_uint32_put(state, (1)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_read_done_req_request_id)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_read_done_req_error)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_read_done_req_addr))))))); - - 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_state_t *state, + const struct extmem_get_capabilities_notify_pending *input); +static bool encode_extmem_nfy(zcbor_state_t *state, + const struct extmem_nfy *input); +static bool encode_extmem_rsp(zcbor_state_t *state, + const struct extmem_rsp *input); +static bool encode_extmem_req(zcbor_state_t *state, + const struct extmem_req *input); + +static bool +encode_extmem_read_done_req(zcbor_state_t *state, + const struct extmem_read_done_req *input) { + zcbor_log("%s\r\n", __func__); + + bool res = (( + (((zcbor_uint32_put(state, (1)))) && + ((zcbor_uint32_encode(state, + (&(*input).extmem_read_done_req_request_id)))) && + ((zcbor_uint32_encode(state, (&(*input).extmem_read_done_req_error)))) && + ((zcbor_uint32_encode(state, (&(*input).extmem_read_done_req_addr))))))); + + log_result(state, res, __func__); + return res; } -static bool encode_extmem_write_setup_req(zcbor_state_t *state, - const struct extmem_write_setup_req *input) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = - (((((zcbor_uint32_put(state, (3)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_write_setup_req_request_id)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_write_setup_req_error)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_write_setup_req_addr))))))); - - 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; +static bool +encode_extmem_write_setup_req(zcbor_state_t *state, + const struct extmem_write_setup_req *input) { + zcbor_log("%s\r\n", __func__); + + bool res = (((((zcbor_uint32_put(state, (3)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_write_setup_req_request_id)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_write_setup_req_error)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_write_setup_req_addr))))))); + + log_result(state, res, __func__); + return res; } -static bool encode_extmem_write_done_req(zcbor_state_t *state, - const struct extmem_write_done_req *input) -{ - zcbor_log("%s\r\n", __func__); +static bool +encode_extmem_write_done_req(zcbor_state_t *state, + const struct extmem_write_done_req *input) { + zcbor_log("%s\r\n", __func__); - bool tmp_result = - (((((zcbor_uint32_put(state, (5)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_write_done_req_request_id)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_write_done_req_error))))))); + bool res = (((((zcbor_uint32_put(state, (5)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_write_done_req_request_id)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_write_done_req_error))))))); - 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_extmem_erase_done_req(zcbor_state_t *state, - const struct extmem_erase_done_req *input) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = - (((((zcbor_uint32_put(state, (7)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_erase_done_req_request_id)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_erase_done_req_error))))))); +static bool +encode_extmem_erase_done_req(zcbor_state_t *state, + const struct extmem_erase_done_req *input) { + zcbor_log("%s\r\n", __func__); - 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, (7)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_erase_done_req_request_id)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_erase_done_req_error))))))); - return tmp_result; + log_result(state, res, __func__); + return res; } -static bool encode_extmem_get_capabilities_req(zcbor_state_t *state, - const struct extmem_get_capabilities_req *input) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = ((( - ((zcbor_uint32_put(state, (9)))) && - ((zcbor_uint32_encode(state, - (&(*input).extmem_get_capabilities_req_request_id)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_get_capabilities_req_error)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_get_capabilities_req_base_addr)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_get_capabilities_req_capacity)))) && - ((zcbor_uint32_encode(state, - (&(*input).extmem_get_capabilities_req_erase_size)))) && - ((zcbor_uint32_encode(state, - (&(*input).extmem_get_capabilities_req_write_size)))) && - ((zcbor_uint32_encode(state, - (&(*input).extmem_get_capabilities_req_chunk_size)))) && - ((zcbor_bool_encode(state, - (&(*input).extmem_get_capabilities_req_memory_mapped))))))); - - 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; +static bool encode_extmem_get_capabilities_req( + zcbor_state_t *state, const struct extmem_get_capabilities_req *input) { + zcbor_log("%s\r\n", __func__); + + bool res = + (((((zcbor_uint32_put(state, (9)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_get_capabilities_req_request_id)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_get_capabilities_req_error)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_get_capabilities_req_base_addr)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_get_capabilities_req_capacity)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_get_capabilities_req_erase_size)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_get_capabilities_req_write_size)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_get_capabilities_req_chunk_size)))) && + ((zcbor_bool_encode( + state, (&(*input).extmem_get_capabilities_req_memory_mapped))))))); + + log_result(state, res, __func__); + return res; } -static bool encode_extmem_read_pending_notify(zcbor_state_t *state, - const struct extmem_read_pending_notify *input) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = ((( - ((zcbor_uint32_put(state, (2)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_read_pending_notify_request_id)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_read_pending_notify_offset)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_read_pending_notify_size))))))); - - 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; +static bool encode_extmem_read_pending_notify( + zcbor_state_t *state, const struct extmem_read_pending_notify *input) { + zcbor_log("%s\r\n", __func__); + + bool res = + (((((zcbor_uint32_put(state, (2)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_read_pending_notify_request_id)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_read_pending_notify_offset)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_read_pending_notify_size))))))); + + log_result(state, res, __func__); + return res; } -static bool encode_extmem_write_pending_notify(zcbor_state_t *state, - const struct extmem_write_pending_notify *input) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = - (((((zcbor_uint32_put(state, (6)))) && - ((zcbor_uint32_encode(state, - (&(*input).extmem_write_pending_notify_request_id)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_write_pending_notify_offset)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_write_pending_notify_size))))))); - - 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; +static bool encode_extmem_write_pending_notify( + zcbor_state_t *state, const struct extmem_write_pending_notify *input) { + zcbor_log("%s\r\n", __func__); + + bool res = + (((((zcbor_uint32_put(state, (6)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_write_pending_notify_request_id)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_write_pending_notify_offset)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_write_pending_notify_size))))))); + + log_result(state, res, __func__); + return res; } -static bool encode_extmem_erase_pending_notify(zcbor_state_t *state, - const struct extmem_erase_pending_notify *input) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = - (((((zcbor_uint32_put(state, (8)))) && - ((zcbor_uint32_encode(state, - (&(*input).extmem_erase_pending_notify_request_id)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_erase_pending_notify_offset)))) && - ((zcbor_uint32_encode(state, (&(*input).extmem_erase_pending_notify_size))))))); - - 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; +static bool encode_extmem_erase_pending_notify( + zcbor_state_t *state, const struct extmem_erase_pending_notify *input) { + zcbor_log("%s\r\n", __func__); + + bool res = + (((((zcbor_uint32_put(state, (8)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_erase_pending_notify_request_id)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_erase_pending_notify_offset)))) && + ((zcbor_uint32_encode( + state, (&(*input).extmem_erase_pending_notify_size))))))); + + log_result(state, res, __func__); + return res; } static bool encode_extmem_get_capabilities_notify_pending( - zcbor_state_t *state, const struct extmem_get_capabilities_notify_pending *input) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = (( - (((zcbor_uint32_put(state, (10)))) && - ((zcbor_uint32_encode( - state, (&(*input).extmem_get_capabilities_notify_pending_request_id))))))); - - 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_state_t *state, + const struct extmem_get_capabilities_notify_pending *input) { + zcbor_log("%s\r\n", __func__); + + bool res = (( + (((zcbor_uint32_put(state, (10)))) && + ((zcbor_uint32_encode( + state, + (&(*input).extmem_get_capabilities_notify_pending_request_id))))))); + + log_result(state, res, __func__); + return res; } -static bool encode_extmem_nfy(zcbor_state_t *state, const struct extmem_nfy *input) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = ((( - zcbor_list_start_encode(state, 4) && - ((((((*input).extmem_nfy_msg_choice == - extmem_nfy_msg_extmem_read_pending_notify_m_c) - ? ((encode_extmem_read_pending_notify( - state, (&(*input).extmem_nfy_msg_extmem_read_pending_notify_m)))) - : (((*input).extmem_nfy_msg_choice == - extmem_nfy_msg_extmem_write_pending_notify_m_c) - ? ((encode_extmem_write_pending_notify( - state, (&(*input).extmem_nfy_msg_extmem_write_pending_notify_m)))) - : (((*input).extmem_nfy_msg_choice == - extmem_nfy_msg_extmem_erase_pending_notify_m_c) - ? ((encode_extmem_erase_pending_notify( - state, (&(*input).extmem_nfy_msg_extmem_erase_pending_notify_m)))) - : (((*input).extmem_nfy_msg_choice == - extmem_nfy_msg_extmem_get_capabilities_notify_pending_m_c) - ? ((encode_extmem_get_capabilities_notify_pending( - state, - (&(*input).extmem_nfy_msg_extmem_get_capabilities_notify_pending_m)))) - : false)))))) || - (zcbor_list_map_end_force_encode(state), false)) && - zcbor_list_end_encode(state, 4)))); - - 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; +static bool encode_extmem_nfy(zcbor_state_t *state, + const struct extmem_nfy *input) { + zcbor_log("%s\r\n", __func__); + + bool res = ((( + zcbor_list_start_encode(state, 4) && + ((((((*input).extmem_nfy_msg_choice == + extmem_nfy_msg_extmem_read_pending_notify_m_c) + ? ((encode_extmem_read_pending_notify( + state, + (&(*input).extmem_nfy_msg_extmem_read_pending_notify_m)))) + : (((*input).extmem_nfy_msg_choice == + extmem_nfy_msg_extmem_write_pending_notify_m_c) + ? ((encode_extmem_write_pending_notify( + state, + (&(*input) + .extmem_nfy_msg_extmem_write_pending_notify_m)))) + : (((*input).extmem_nfy_msg_choice == + extmem_nfy_msg_extmem_erase_pending_notify_m_c) + ? ((encode_extmem_erase_pending_notify( + state, + (&(*input) + .extmem_nfy_msg_extmem_erase_pending_notify_m)))) + : (((*input).extmem_nfy_msg_choice == + extmem_nfy_msg_extmem_get_capabilities_notify_pending_m_c) + ? ((encode_extmem_get_capabilities_notify_pending( + state, + (&(*input) + .extmem_nfy_msg_extmem_get_capabilities_notify_pending_m)))) + : false)))))) || + (zcbor_list_map_end_force_encode(state), false)) && + zcbor_list_end_encode(state, 4)))); + + log_result(state, res, __func__); + return res; } -static bool encode_extmem_rsp(zcbor_state_t *state, const struct extmem_rsp *input) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = ((( - zcbor_list_start_encode(state, 1) && - ((((((*input).extmem_rsp_msg_choice == extmem_rsp_msg_extmem_read_done_rsp_m_c) - ? ((zcbor_uint32_put(state, (1)))) - : (((*input).extmem_rsp_msg_choice == - extmem_rsp_msg_extmem_write_setup_rsp_m_c) - ? ((zcbor_uint32_put(state, (3)))) - : (((*input).extmem_rsp_msg_choice == - extmem_rsp_msg_extmem_write_done_rsp_m_c) - ? ((zcbor_uint32_put(state, (5)))) - : (((*input).extmem_rsp_msg_choice == - extmem_rsp_msg_extmem_erase_done_rsp_m_c) - ? ((zcbor_uint32_put(state, (7)))) - : (((*input).extmem_rsp_msg_choice == - extmem_rsp_msg_extmem_get_capabilities_rsp_m_c) - ? ((zcbor_uint32_put(state, (9)))) - : false))))))) || - (zcbor_list_map_end_force_encode(state), false)) && - zcbor_list_end_encode(state, 1)))); - - 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; +static bool encode_extmem_rsp(zcbor_state_t *state, + const struct extmem_rsp *input) { + zcbor_log("%s\r\n", __func__); + + bool res = ((( + zcbor_list_start_encode(state, 1) && + ((((((*input).extmem_rsp_msg_choice == + extmem_rsp_msg_extmem_read_done_rsp_m_c) + ? ((zcbor_uint32_put(state, (1)))) + : (((*input).extmem_rsp_msg_choice == + extmem_rsp_msg_extmem_write_setup_rsp_m_c) + ? ((zcbor_uint32_put(state, (3)))) + : (((*input).extmem_rsp_msg_choice == + extmem_rsp_msg_extmem_write_done_rsp_m_c) + ? ((zcbor_uint32_put(state, (5)))) + : (((*input).extmem_rsp_msg_choice == + extmem_rsp_msg_extmem_erase_done_rsp_m_c) + ? ((zcbor_uint32_put(state, (7)))) + : (((*input).extmem_rsp_msg_choice == + extmem_rsp_msg_extmem_get_capabilities_rsp_m_c) + ? ((zcbor_uint32_put(state, (9)))) + : false))))))) || + (zcbor_list_map_end_force_encode(state), false)) && + zcbor_list_end_encode(state, 1)))); + + log_result(state, res, __func__); + return res; } -static bool encode_extmem_req(zcbor_state_t *state, const struct extmem_req *input) -{ - zcbor_log("%s\r\n", __func__); - - bool tmp_result = ((( - zcbor_list_start_encode(state, 9) && - ((((((*input).extmem_req_msg_choice == extmem_req_msg_extmem_read_done_req_m_c) - ? ((encode_extmem_read_done_req( - state, (&(*input).extmem_req_msg_extmem_read_done_req_m)))) - : (((*input).extmem_req_msg_choice == - extmem_req_msg_extmem_write_setup_req_m_c) - ? ((encode_extmem_write_setup_req( - state, (&(*input).extmem_req_msg_extmem_write_setup_req_m)))) - : (((*input).extmem_req_msg_choice == - extmem_req_msg_extmem_write_done_req_m_c) - ? ((encode_extmem_write_done_req( - state, (&(*input).extmem_req_msg_extmem_write_done_req_m)))) - : (((*input).extmem_req_msg_choice == - extmem_req_msg_extmem_erase_done_req_m_c) - ? ((encode_extmem_erase_done_req( - state, (&(*input).extmem_req_msg_extmem_erase_done_req_m)))) - : (((*input).extmem_req_msg_choice == - extmem_req_msg_extmem_get_capabilities_req_m_c) - ? ((encode_extmem_get_capabilities_req( - state, (&(*input).extmem_req_msg_extmem_get_capabilities_req_m)))) - : false))))))) || - (zcbor_list_map_end_force_encode(state), false)) && - zcbor_list_end_encode(state, 9)))); - - 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; +static bool encode_extmem_req(zcbor_state_t *state, + const struct extmem_req *input) { + zcbor_log("%s\r\n", __func__); + + bool res = ((( + zcbor_list_start_encode(state, 9) && + ((((((*input).extmem_req_msg_choice == + extmem_req_msg_extmem_read_done_req_m_c) + ? ((encode_extmem_read_done_req( + state, (&(*input).extmem_req_msg_extmem_read_done_req_m)))) + : (((*input).extmem_req_msg_choice == + extmem_req_msg_extmem_write_setup_req_m_c) + ? ((encode_extmem_write_setup_req( + state, + (&(*input) + .extmem_req_msg_extmem_write_setup_req_m)))) + : (((*input).extmem_req_msg_choice == + extmem_req_msg_extmem_write_done_req_m_c) + ? ((encode_extmem_write_done_req( + state, + (&(*input) + .extmem_req_msg_extmem_write_done_req_m)))) + : (((*input).extmem_req_msg_choice == + extmem_req_msg_extmem_erase_done_req_m_c) + ? ((encode_extmem_erase_done_req( + state, + (&(*input) + .extmem_req_msg_extmem_erase_done_req_m)))) + : (((*input).extmem_req_msg_choice == + extmem_req_msg_extmem_get_capabilities_req_m_c) + ? ((encode_extmem_get_capabilities_req( + state, + (&(*input) + .extmem_req_msg_extmem_get_capabilities_req_m)))) + : false))))))) || + (zcbor_list_map_end_force_encode(state), false)) && + zcbor_list_end_encode(state, 9)))); + + log_result(state, res, __func__); + return res; } -int cbor_encode_extmem_req(uint8_t *payload, size_t payload_len, const struct extmem_req *input, - size_t *payload_len_out) -{ - zcbor_state_t states[4]; +int cbor_encode_extmem_req(uint8_t *payload, size_t payload_len, + const struct extmem_req *input, + size_t *payload_len_out) { + zcbor_state_t states[4]; - return zcbor_entry_function(payload, payload_len, (void *)input, payload_len_out, states, - (zcbor_decoder_t *)encode_extmem_req, - sizeof(states) / sizeof(zcbor_state_t), 1); + return zcbor_entry_function(payload, payload_len, (void *)input, + payload_len_out, states, + (zcbor_decoder_t *)encode_extmem_req, + sizeof(states) / sizeof(zcbor_state_t), 1); } -int cbor_encode_extmem_rsp(uint8_t *payload, size_t payload_len, const struct extmem_rsp *input, - size_t *payload_len_out) -{ - zcbor_state_t states[4]; +int cbor_encode_extmem_rsp(uint8_t *payload, size_t payload_len, + const struct extmem_rsp *input, + size_t *payload_len_out) { + zcbor_state_t states[4]; - return zcbor_entry_function(payload, payload_len, (void *)input, payload_len_out, states, - (zcbor_decoder_t *)encode_extmem_rsp, - sizeof(states) / sizeof(zcbor_state_t), 1); + return zcbor_entry_function(payload, payload_len, (void *)input, + payload_len_out, states, + (zcbor_decoder_t *)encode_extmem_rsp, + sizeof(states) / sizeof(zcbor_state_t), 1); } -int cbor_encode_extmem_nfy(uint8_t *payload, size_t payload_len, const struct extmem_nfy *input, - size_t *payload_len_out) -{ - zcbor_state_t states[4]; +int cbor_encode_extmem_nfy(uint8_t *payload, size_t payload_len, + const struct extmem_nfy *input, + size_t *payload_len_out) { + zcbor_state_t states[4]; - return zcbor_entry_function(payload, payload_len, (void *)input, payload_len_out, states, - (zcbor_decoder_t *)encode_extmem_nfy, - sizeof(states) / sizeof(zcbor_state_t), 1); + return zcbor_entry_function(payload, payload_len, (void *)input, + payload_len_out, states, + (zcbor_decoder_t *)encode_extmem_nfy, + sizeof(states) / sizeof(zcbor_state_t), 1); } diff --git a/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_encode.h b/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_encode.h index 689b5f1087fd..55441cd0bb5e 100644 --- a/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_encode.h +++ b/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_encode.h @@ -5,7 +5,7 @@ */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ @@ -13,28 +13,32 @@ #ifndef EXTMEM_SERVICE_ENCODE_H__ #define EXTMEM_SERVICE_ENCODE_H__ -#include +#include "extmem_service_types.h" #include #include +#include #include -#include "extmem_service_types.h" #ifdef __cplusplus extern "C" { #endif #if DEFAULT_MAX_QTY != 3 -#error "The type file was generated with a different default_max_qty than this file" +#error \ + "The type file was generated with a different default_max_qty than this file" #endif -int cbor_encode_extmem_req(uint8_t *payload, size_t payload_len, const struct extmem_req *input, - size_t *payload_len_out); +int cbor_encode_extmem_req(uint8_t *payload, size_t payload_len, + const struct extmem_req *input, + size_t *payload_len_out); -int cbor_encode_extmem_rsp(uint8_t *payload, size_t payload_len, const struct extmem_rsp *input, - size_t *payload_len_out); +int cbor_encode_extmem_rsp(uint8_t *payload, size_t payload_len, + const struct extmem_rsp *input, + size_t *payload_len_out); -int cbor_encode_extmem_nfy(uint8_t *payload, size_t payload_len, const struct extmem_nfy *input, - size_t *payload_len_out); +int cbor_encode_extmem_nfy(uint8_t *payload, size_t payload_len, + const struct extmem_nfy *input, + size_t *payload_len_out); #ifdef __cplusplus } diff --git a/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_types.h b/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_types.h index adaa70c696a6..074260018c2f 100644 --- a/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_types.h +++ b/subsys/sdfw_services/services/extmem/zcbor_generated/extmem_service_types.h @@ -5,7 +5,7 @@ */ /* - * Generated using zcbor version 0.8.1 + * Generated using zcbor version 0.9.0 * https://github.com/NordicSemiconductor/zcbor * Generated with a --default-max-qty of 3 */ @@ -13,9 +13,9 @@ #ifndef EXTMEM_SERVICE_TYPES_H__ #define EXTMEM_SERVICE_TYPES_H__ -#include #include #include +#include #ifdef __cplusplus extern "C" { @@ -31,101 +31,105 @@ extern "C" { #define DEFAULT_MAX_QTY 3 struct extmem_read_done_req { - uint32_t extmem_read_done_req_request_id; - uint32_t extmem_read_done_req_error; - uint32_t extmem_read_done_req_addr; + uint32_t extmem_read_done_req_request_id; + uint32_t extmem_read_done_req_error; + uint32_t extmem_read_done_req_addr; }; struct extmem_write_setup_req { - uint32_t extmem_write_setup_req_request_id; - uint32_t extmem_write_setup_req_error; - uint32_t extmem_write_setup_req_addr; + uint32_t extmem_write_setup_req_request_id; + uint32_t extmem_write_setup_req_error; + uint32_t extmem_write_setup_req_addr; }; struct extmem_write_done_req { - uint32_t extmem_write_done_req_request_id; - uint32_t extmem_write_done_req_error; + uint32_t extmem_write_done_req_request_id; + uint32_t extmem_write_done_req_error; }; struct extmem_erase_done_req { - uint32_t extmem_erase_done_req_request_id; - uint32_t extmem_erase_done_req_error; + uint32_t extmem_erase_done_req_request_id; + uint32_t extmem_erase_done_req_error; }; struct extmem_get_capabilities_req { - uint32_t extmem_get_capabilities_req_request_id; - uint32_t extmem_get_capabilities_req_error; - uint32_t extmem_get_capabilities_req_base_addr; - uint32_t extmem_get_capabilities_req_capacity; - uint32_t extmem_get_capabilities_req_erase_size; - uint32_t extmem_get_capabilities_req_write_size; - uint32_t extmem_get_capabilities_req_chunk_size; - bool extmem_get_capabilities_req_memory_mapped; + uint32_t extmem_get_capabilities_req_request_id; + uint32_t extmem_get_capabilities_req_error; + uint32_t extmem_get_capabilities_req_base_addr; + uint32_t extmem_get_capabilities_req_capacity; + uint32_t extmem_get_capabilities_req_erase_size; + uint32_t extmem_get_capabilities_req_write_size; + uint32_t extmem_get_capabilities_req_chunk_size; + bool extmem_get_capabilities_req_memory_mapped; }; struct extmem_req { - union { - struct extmem_read_done_req extmem_req_msg_extmem_read_done_req_m; - struct extmem_write_setup_req extmem_req_msg_extmem_write_setup_req_m; - struct extmem_write_done_req extmem_req_msg_extmem_write_done_req_m; - struct extmem_erase_done_req extmem_req_msg_extmem_erase_done_req_m; - struct extmem_get_capabilities_req extmem_req_msg_extmem_get_capabilities_req_m; - }; - enum { - extmem_req_msg_extmem_read_done_req_m_c, - extmem_req_msg_extmem_write_setup_req_m_c, - extmem_req_msg_extmem_write_done_req_m_c, - extmem_req_msg_extmem_erase_done_req_m_c, - extmem_req_msg_extmem_get_capabilities_req_m_c, - } extmem_req_msg_choice; + union { + struct extmem_read_done_req extmem_req_msg_extmem_read_done_req_m; + struct extmem_write_setup_req extmem_req_msg_extmem_write_setup_req_m; + struct extmem_write_done_req extmem_req_msg_extmem_write_done_req_m; + struct extmem_erase_done_req extmem_req_msg_extmem_erase_done_req_m; + struct extmem_get_capabilities_req + extmem_req_msg_extmem_get_capabilities_req_m; + }; + enum { + extmem_req_msg_extmem_read_done_req_m_c, + extmem_req_msg_extmem_write_setup_req_m_c, + extmem_req_msg_extmem_write_done_req_m_c, + extmem_req_msg_extmem_erase_done_req_m_c, + extmem_req_msg_extmem_get_capabilities_req_m_c, + } extmem_req_msg_choice; }; struct extmem_rsp { - enum { - extmem_rsp_msg_extmem_read_done_rsp_m_c = 1, - extmem_rsp_msg_extmem_write_setup_rsp_m_c = 3, - extmem_rsp_msg_extmem_write_done_rsp_m_c = 5, - extmem_rsp_msg_extmem_erase_done_rsp_m_c = 7, - extmem_rsp_msg_extmem_get_capabilities_rsp_m_c = 9, - } extmem_rsp_msg_choice; + enum { + extmem_rsp_msg_extmem_read_done_rsp_m_c = 1, + extmem_rsp_msg_extmem_write_setup_rsp_m_c = 3, + extmem_rsp_msg_extmem_write_done_rsp_m_c = 5, + extmem_rsp_msg_extmem_erase_done_rsp_m_c = 7, + extmem_rsp_msg_extmem_get_capabilities_rsp_m_c = 9, + } extmem_rsp_msg_choice; }; struct extmem_read_pending_notify { - uint32_t extmem_read_pending_notify_request_id; - uint32_t extmem_read_pending_notify_offset; - uint32_t extmem_read_pending_notify_size; + uint32_t extmem_read_pending_notify_request_id; + uint32_t extmem_read_pending_notify_offset; + uint32_t extmem_read_pending_notify_size; }; struct extmem_write_pending_notify { - uint32_t extmem_write_pending_notify_request_id; - uint32_t extmem_write_pending_notify_offset; - uint32_t extmem_write_pending_notify_size; + uint32_t extmem_write_pending_notify_request_id; + uint32_t extmem_write_pending_notify_offset; + uint32_t extmem_write_pending_notify_size; }; struct extmem_erase_pending_notify { - uint32_t extmem_erase_pending_notify_request_id; - uint32_t extmem_erase_pending_notify_offset; - uint32_t extmem_erase_pending_notify_size; + uint32_t extmem_erase_pending_notify_request_id; + uint32_t extmem_erase_pending_notify_offset; + uint32_t extmem_erase_pending_notify_size; }; struct extmem_get_capabilities_notify_pending { - uint32_t extmem_get_capabilities_notify_pending_request_id; + uint32_t extmem_get_capabilities_notify_pending_request_id; }; struct extmem_nfy { - union { - struct extmem_read_pending_notify extmem_nfy_msg_extmem_read_pending_notify_m; - struct extmem_write_pending_notify extmem_nfy_msg_extmem_write_pending_notify_m; - struct extmem_erase_pending_notify extmem_nfy_msg_extmem_erase_pending_notify_m; - struct extmem_get_capabilities_notify_pending - extmem_nfy_msg_extmem_get_capabilities_notify_pending_m; - }; - enum { - extmem_nfy_msg_extmem_read_pending_notify_m_c, - extmem_nfy_msg_extmem_write_pending_notify_m_c, - extmem_nfy_msg_extmem_erase_pending_notify_m_c, - extmem_nfy_msg_extmem_get_capabilities_notify_pending_m_c, - } extmem_nfy_msg_choice; + union { + struct extmem_read_pending_notify + extmem_nfy_msg_extmem_read_pending_notify_m; + struct extmem_write_pending_notify + extmem_nfy_msg_extmem_write_pending_notify_m; + struct extmem_erase_pending_notify + extmem_nfy_msg_extmem_erase_pending_notify_m; + struct extmem_get_capabilities_notify_pending + extmem_nfy_msg_extmem_get_capabilities_notify_pending_m; + }; + enum { + extmem_nfy_msg_extmem_read_pending_notify_m_c, + extmem_nfy_msg_extmem_write_pending_notify_m_c, + extmem_nfy_msg_extmem_erase_pending_notify_m_c, + extmem_nfy_msg_extmem_get_capabilities_notify_pending_m_c, + } extmem_nfy_msg_choice; }; #ifdef __cplusplus