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

boot_serial: Update cddl-gen version 



To bring in bugfixes.
Regenerate code.

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

boot/boot_serial/src/cbor_common.c

+1 −1
Original line number Diff line number Diff line 
/*

 * This file has been copied from the cddl-gen submodule.

 * Commit 8f9358a0b4b0e9b0cd579f0988056ef0b60760e4

 * Commit 9f77837f9950da1633d22abf6181a830521a6688

 */



/*

boot/boot_serial/src/cbor_common.h

+1 −1
Original line number Diff line number Diff line 
/*

 * This file has been copied from the cddl-gen submodule.

 * Commit 8f9358a0b4b0e9b0cd579f0988056ef0b60760e4

 * Commit 9f77837f9950da1633d22abf6181a830521a6688

 */



/*

boot/boot_serial/src/cbor_decode.c

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

 * This file has been copied from the cddl-gen submodule.

 * Commit 8f9358a0b4b0e9b0cd579f0988056ef0b60760e4

 * Commit 9f77837f9950da1633d22abf6181a830521a6688

 */



/*
@@ -126,6 +126,7 @@ static bool value_extract(cbor_state_t *state, 


static bool int32_decode(cbor_state_t *state, int32_t *result)

{

	FAIL_IF(state->payload >= state->payload_end);

	uint8_t major_type = MAJOR_TYPE(*state->payload);

	uint32_t uint_result;

	int32_t int_result;
@@ -155,6 +156,7 @@ static bool int32_decode(cbor_state_t *state, int32_t *result) 


bool intx32_decode(cbor_state_t *state, int32_t *result)

{

	FAIL_IF(state->payload >= state->payload_end);

	uint8_t major_type = MAJOR_TYPE(*state->payload);



	if (major_type != CBOR_MAJOR_TYPE_PINT
@@ -197,6 +199,7 @@ static bool uint32_decode(cbor_state_t *state, uint32_t *result) 


bool uintx32_decode(cbor_state_t *state, uint32_t *result)

{

	FAIL_IF(state->payload >= state->payload_end);

	uint8_t major_type = MAJOR_TYPE(*state->payload);



	if (major_type != CBOR_MAJOR_TYPE_PINT) {
@@ -233,6 +236,7 @@ bool uintx32_expect_union(cbor_state_t *state, uint32_t result) 
static bool strx_start_decode(cbor_state_t *state,

		cbor_string_type_t *result, cbor_major_type_t exp_major_type)

{

	FAIL_IF(state->payload >= state->payload_end);

	uint8_t major_type = MAJOR_TYPE(*state->payload);



	if (major_type != exp_major_type) {
@@ -243,10 +247,10 @@ static bool strx_start_decode(cbor_state_t *state, 
		FAIL();

	}



	if ((state->payload + result->len) > state->payload_end) {

	if (result->len > (state->payload_end - state->payload)) {

		cbor_print("error: 0x%x > 0x%x\r\n",

		(uint32_t)(state->payload + result->len),

		(uint32_t)state->payload_end);

		(uint32_t)result->len,

		(uint32_t)(state->payload_end - state->payload));

		FAIL_RESTORE();

	}
@@ -264,6 +268,7 @@ bool bstrx_cbor_start_decode(cbor_state_t *state, cbor_string_type_t *result) 
		FAIL_RESTORE();

	}



	/* Overflow is checked in strx_start_decode() */

	state->payload_end = result->value + result->len;

	return true;

}
@@ -290,6 +295,7 @@ bool strx_decode(cbor_state_t *state, cbor_string_type_t *result, 
		FAIL();

	}



	/* Overflow is checked in strx_start_decode() */

	(state->payload) += result->len;

	return true;

}
@@ -338,8 +344,9 @@ bool tstrx_expect(cbor_state_t *state, cbor_string_type_t *result) 
static bool list_map_start_decode(cbor_state_t *state,

		cbor_major_type_t exp_major_type)

{

	uint32_t new_elem_count;

	FAIL_IF(state->payload >= state->payload_end);

	uint8_t major_type = MAJOR_TYPE(*state->payload);

	uint32_t new_elem_count;



	if (major_type != exp_major_type) {

		FAIL();
@@ -400,6 +407,7 @@ bool map_end_decode(cbor_state_t *state) 


static bool primx_decode(cbor_state_t *state, uint32_t *result)

{

	FAIL_IF(state->payload >= state->payload_end);

	uint8_t major_type = MAJOR_TYPE(*state->payload);



	if (major_type != CBOR_MAJOR_TYPE_PRIM) {
@@ -468,6 +476,7 @@ bool boolx_expect(cbor_state_t *state, bool result) 


bool double_decode(cbor_state_t *state, double *result)

{

	FAIL_IF(state->payload >= state->payload_end);

	uint8_t major_type = MAJOR_TYPE(*state->payload);



	if (major_type != CBOR_MAJOR_TYPE_PRIM) {
@@ -501,6 +510,7 @@ bool any_decode(cbor_state_t *state, void *result) 
	cbor_assert(result == NULL,

			"'any' type cannot be returned, only skipped.\n");



	FAIL_IF(state->payload >= state->payload_end);

	uint8_t major_type = MAJOR_TYPE(*state->payload);

	uint32_t value;

	uint32_t num_decode;
@@ -545,6 +555,7 @@ bool any_decode(cbor_state_t *state, void *result) 


bool tag_decode(cbor_state_t *state, uint32_t *result)

{

	FAIL_IF(state->payload >= state->payload_end);

	uint8_t major_type = MAJOR_TYPE(*state->payload);



	if (major_type != CBOR_MAJOR_TYPE_TAG) {

boot/boot_serial/src/cbor_decode.h

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

 * This file has been copied from the cddl-gen submodule.

 * Commit 8f9358a0b4b0e9b0cd579f0988056ef0b60760e4

 * Commit 9f77837f9950da1633d22abf6181a830521a6688

 */



/*
@@ -19,7 +19,8 @@ 
/** The cbor_decode library provides functions for decoding CBOR data elements.

 *

 * This library is primarily meant to be called from code generated by

 * $CDDL_GEN_BASE/scripts/cddl_gen.py

 * $CDDL_GEN_BASE/cddl_gen/cddl_gen.py script, or its equivalent cddl_gen

 * command line executable.

 *

 * Some details to notice about this library:

 *  - Integers are all 32 bits (uint32_t). This means that CBOR's 64 bit values

boot/boot_serial/src/cbor_encode.c

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

 * This file has been copied from the cddl-gen submodule.

 * Commit 8f9358a0b4b0e9b0cd579f0988056ef0b60760e4

 * Commit 9f77837f9950da1633d22abf6181a830521a6688

 */



/*
@@ -239,6 +239,9 @@ static bool strx_encode(cbor_state_t *state, 
	if (!strx_start_encode(state, input, major_type)) {

		FAIL();

	}

	if (input->len > (state->payload_end - state->payload)) {

		FAIL();

	}

	if (state->payload_mut != input->value) {

		memmove(state->payload_mut, input->value, input->len);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE