Commit ff554915 authored by Øyvind Rønningstad's avatar Øyvind Rønningstad Committed by Andrzej Puzdrowski
Browse files

boot_serial: Reintroduce change from fc1ad8d0 



Also, keep casts to make build pass.

Signed-off-by: default avatarØyvind Rønningstad <oyvind.ronningstad@nordicsemi.no>
(cherry picked from commit 6693067b)
Signed-off-by: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parent f6246004

boot/boot_serial/src/cbor_encode.h

+2 −2
Original line number Diff line number Diff line
@@ -55,10 +55,10 @@ bool bstrx_encode(cbor_state_t *state, const cbor_string_type_t *result); 
bool tstrx_encode(cbor_state_t *state, const cbor_string_type_t *result);



#define tstrx_put(state, string) \

	tstrx_encode(state, &(cbor_string_type_t){.value = string, len = (sizeof(string) - 1)})

	tstrx_encode(state, &(cbor_string_type_t){.value = (const uint8_t *)string, .len = (sizeof(string) - 1)})



#define tstrx_put_term(state, string) \

	tstrx_encode(state, &(cbor_string_type_t){.value = string, len = strlen(string)})

	tstrx_encode(state, &(cbor_string_type_t){.value = (const uint8_t *)string, .len = strlen((const char *)string)})



/** Encode a LIST header.

 *

boot/boot_serial/src/serial_recovery_cbor.c

+5 −5
Original line number Diff line number Diff line
@@ -34,19 +34,19 @@ static bool decode_Member( 
	cbor_string_type_t tmp_str;

	bool int_res;



	bool tmp_result = (((union_start_code(state) && (int_res = (((((tstrx_expect(state, ((tmp_str.value = "image",

	bool tmp_result = (((union_start_code(state) && (int_res = (((((tstrx_expect(state, ((tmp_str.value = (const uint8_t *)"image",

    tmp_str.len = sizeof("image") - 1, &tmp_str)))))

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

	|| (union_elem_code(state) && ((((tstrx_expect(state, ((tmp_str.value = "data",

	|| (union_elem_code(state) && ((((tstrx_expect(state, ((tmp_str.value = (const uint8_t *)"data",

    tmp_str.len = sizeof("data") - 1, &tmp_str)))))

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

	|| (union_elem_code(state) && ((((tstrx_expect(state, ((tmp_str.value = "len",

	|| (union_elem_code(state) && ((((tstrx_expect(state, ((tmp_str.value = (const uint8_t *)"len",

    tmp_str.len = sizeof("len") - 1, &tmp_str)))))

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

	|| (union_elem_code(state) && ((((tstrx_expect(state, ((tmp_str.value = "off",

	|| (union_elem_code(state) && ((((tstrx_expect(state, ((tmp_str.value = (const uint8_t *)"off",

    tmp_str.len = sizeof("off") - 1, &tmp_str)))))

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

	|| (union_elem_code(state) && ((((tstrx_expect(state, ((tmp_str.value = "sha",

	|| (union_elem_code(state) && ((((tstrx_expect(state, ((tmp_str.value = (const uint8_t *)"sha",

    tmp_str.len = sizeof("sha") - 1, &tmp_str)))))

	&& (bstrx_decode(state, (&(*result)._Member_sha)))) && (((*result)._Member_choice = _Member_sha) || 1)))), union_end_code(state), int_res))));

CRA Git | Maintained and supported by SUSTech CRA and CCSE