Commit 393af79e authored by Jamie McCrae's avatar Jamie McCrae Committed by Dominik Ermel
Browse files

boot_serial: Update zcbor files from zcbor 0.7.0 



Updates zcbor files from version 0.7.0, needed for size variable
support.

Signed-off-by: default avatarJamie McCrae <jamie.mccrae@nordicsemi.no>
parent 6021d603

boot/boot_serial/src/boot_serial.c

+2 −2
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ extern int bs_peruser_system_specific(const struct nmgr_hdr *hdr, 
                                      int len, zcbor_state_t *cs);



#define zcbor_tstr_put_lit_cast(state, string) \

	zcbor_tstr_encode_ptr(state, (uint8_t *)string, sizeof(string) - 1)

	zcbor_tstr_encode_ptr(state, (char *)string, sizeof(string) - 1)



#ifndef MCUBOOT_USE_SNPRINTF

/*
@@ -312,7 +312,7 @@ bs_list(char *buf, int len) 


            bs_list_img_ver((char *)tmpbuf, sizeof(tmpbuf), &hdr.ih_ver);



            zcbor_tstr_encode_ptr(cbor_state, tmpbuf, strlen((char *)tmpbuf));

            zcbor_tstr_encode_ptr(cbor_state, (char *)tmpbuf, strlen((char *)tmpbuf));

            zcbor_map_end_encode(cbor_state, 20);

        }

    }

boot/boot_serial/src/regenerate_serial_recovery_cbor.sh

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ copy_with_copy_notice() { 




echo "Generating serial_recovery_cbor.c|h"

zcbor -c serial_recovery.cddl code -d -t Upload --oc serial_recovery_cbor.c --oh serial_recovery_cbor.h --time-header --copy-sources

zcbor code -c serial_recovery.cddl -d -t Upload --oc serial_recovery_cbor.c --oh serial_recovery_cbor.h --time-header --copy-sources



add_copyright() {

echo "$(printf '/*

boot/boot_serial/src/serial_recovery_cbor.c

+16 −10
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2022 Nordic Semiconductor ASA

 * Copyright (c) 2023 Nordic Semiconductor ASA

 *

 * SPDX-License-Identifier: Apache-2.0

 */



/*

 * Generated using zcbor version 0.4.0

 * Generated using zcbor version 0.7.0

 * https://github.com/NordicSemiconductor/zcbor

 * at: 2022-03-31 12:37:11

 * at: 2023-04-14 11:34:28

 * Generated with a --default-max-qty of 3

 */
@@ -28,6 +28,10 @@ 
#error "The type file was generated with a different default_max_qty than this file"

#endif



static bool decode_Member(zcbor_state_t *state, struct Member_ *result);

static bool decode_repeated_Upload_members(zcbor_state_t *state, struct Upload_members *result);

static bool decode_Upload(zcbor_state_t *state, struct Upload *result);





static bool decode_Member(

		zcbor_state_t *state, struct Member_ *result)
@@ -37,15 +41,15 @@ static bool decode_Member( 
	bool int_res;



	bool tmp_result = (((zcbor_union_start_code(state) && (int_res = (((((zcbor_tstr_expect(state, ((tmp_str.value = (uint8_t *)"image", tmp_str.len = sizeof("image") - 1, &tmp_str)))))

	&& (zcbor_int32_decode(state, (&(*result)._Member_image)))) && (((*result)._Member_choice = _Member_image) || 1))

	&& (zcbor_int32_decode(state, (&(*result)._Member_image)))) && (((*result)._Member_choice = _Member_image), true))

	|| (zcbor_union_elem_code(state) && ((((zcbor_tstr_expect(state, ((tmp_str.value = (uint8_t *)"data", tmp_str.len = sizeof("data") - 1, &tmp_str)))))

	&& (zcbor_bstr_decode(state, (&(*result)._Member_data)))) && (((*result)._Member_choice = _Member_data) || 1)))

	&& (zcbor_bstr_decode(state, (&(*result)._Member_data)))) && (((*result)._Member_choice = _Member_data), true)))

	|| (zcbor_union_elem_code(state) && ((((zcbor_tstr_expect(state, ((tmp_str.value = (uint8_t *)"len", tmp_str.len = sizeof("len") - 1, &tmp_str)))))

	&& (zcbor_int32_decode(state, (&(*result)._Member_len)))) && (((*result)._Member_choice = _Member_len) || 1)))

	&& (zcbor_int32_decode(state, (&(*result)._Member_len)))) && (((*result)._Member_choice = _Member_len), true)))

	|| (zcbor_union_elem_code(state) && ((((zcbor_tstr_expect(state, ((tmp_str.value = (uint8_t *)"off", tmp_str.len = sizeof("off") - 1, &tmp_str)))))

	&& (zcbor_int32_decode(state, (&(*result)._Member_off)))) && (((*result)._Member_choice = _Member_off) || 1)))

	&& (zcbor_int32_decode(state, (&(*result)._Member_off)))) && (((*result)._Member_choice = _Member_off), true)))

	|| (zcbor_union_elem_code(state) && ((((zcbor_tstr_expect(state, ((tmp_str.value = (uint8_t *)"sha", tmp_str.len = sizeof("sha") - 1, &tmp_str)))))

	&& (zcbor_bstr_decode(state, (&(*result)._Member_sha)))) && (((*result)._Member_choice = _Member_sha) || 1)))), zcbor_union_end_code(state), int_res))));

	&& (zcbor_bstr_decode(state, (&(*result)._Member_sha)))) && (((*result)._Member_choice = _Member_sha), true)))), zcbor_union_end_code(state), int_res))));



	if (!tmp_result)

		zcbor_trace();
@@ -98,8 +102,10 @@ int cbor_decode_Upload( 
	}



	if (!ret) {

		int status = zcbor_pop_error(states);

		return (status == ZCBOR_SUCCESS) ? ZCBOR_ERR_UNKNOWN : status;

		int err = zcbor_pop_error(states);



		zcbor_print("Return error: %d\r\n", err);

		return (err == ZCBOR_SUCCESS) ? ZCBOR_ERR_UNKNOWN : err;

	}

	return ZCBOR_SUCCESS;

}

boot/boot_serial/src/serial_recovery_cbor.h

+11 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2022 Nordic Semiconductor ASA

 * Copyright (c) 2023 Nordic Semiconductor ASA

 *

 * SPDX-License-Identifier: Apache-2.0

 */



/*

 * Generated using zcbor version 0.4.0

 * Generated using zcbor version 0.7.0

 * https://github.com/NordicSemiconductor/zcbor

 * at: 2022-03-31 12:37:11

 * at: 2023-04-14 11:34:28

 * Generated with a --default-max-qty of 3

 */
@@ -27,6 +27,10 @@ 


#include "serial_recovery_cbor_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"

#endif
@@ -38,4 +42,8 @@ int cbor_decode_Upload( 
		size_t *payload_len_out);





#ifdef __cplusplus

}

#endif



#endif /* SERIAL_RECOVERY_CBOR_H__ */

boot/boot_serial/src/serial_recovery_cbor_types.h

+11 −4
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2022 Nordic Semiconductor ASA

 * Copyright (c) 2023 Nordic Semiconductor ASA

 *

 * SPDX-License-Identifier: Apache-2.0

 */



/*

 * Generated using zcbor version 0.4.0

 * Generated using zcbor version 0.7.0

 * https://github.com/NordicSemiconductor/zcbor

 * at: 2022-03-31 12:37:11

 * at: 2023-04-14 11:34:28

 * Generated with a --default-max-qty of 3

 */
@@ -25,6 +25,10 @@ 
#include "zcbor_decode.h"

#endif



#ifdef __cplusplus

extern "C" {

#endif



/** Which value for --default-max-qty this file was created with.

 *

 *  The define is used in the other generated file to do a build-time
@@ -67,8 +71,11 @@ struct Upload_members { 


struct Upload {

	struct Upload_members _Upload_members[5];

	uint_fast32_t _Upload_members_count;

	size_t _Upload_members_count;

};



#ifdef __cplusplus

}

#endif



#endif /* SERIAL_RECOVERY_CBOR_TYPES_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE