Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zcbor 0.8.1 #293

Merged
merged 5 commits into from
Feb 20, 2024
Merged

zcbor 0.8.1 #293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4e97bba
[nrf fromtree] zcbor: Copy source and header files
oyvindronningstad Jan 10, 2024
55fcfec
[nrf fromtree] zcbor: Add copy notice to all copied files
oyvindronningstad Jan 10, 2024
df46b95
[nrf fromtree] boot_serial: Adapt to API changes in zcbor 0.8.0
oyvindronningstad Jan 10, 2024
9cbf90d
[nrf fromtree] zcbor: Copy source and header files
oyvindronningstad Jan 26, 2024
6e54271
[nrf fromtree] boot_serial: Adapt to zcbor 0.8.x
oyvindronningstad Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions boot/boot_serial/src/boot_serial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ bs_set(char *buf, int len)
#endif

zcbor_state_t zsd[4];
zcbor_new_state(zsd, sizeof(zsd) / sizeof(zcbor_state_t), (uint8_t *)buf, len, 1);
zcbor_new_state(zsd, sizeof(zsd) / sizeof(zcbor_state_t), (uint8_t *)buf, len, 1, NULL, 0);

struct zcbor_map_decode_key_val image_set_state_decode[] = {
ZCBOR_MAP_DECODE_KEY_DECODER("confirm", zcbor_bool_decode, &confirm),
Expand Down Expand Up @@ -655,7 +655,7 @@ bs_upload(char *buf, int len)
#endif

zcbor_state_t zsd[4];
zcbor_new_state(zsd, sizeof(zsd) / sizeof(zcbor_state_t), (uint8_t *)buf, len, 1);
zcbor_new_state(zsd, sizeof(zsd) / sizeof(zcbor_state_t), (uint8_t *)buf, len, 1, NULL, 0);

struct zcbor_map_decode_key_val image_upload_decode[] = {
ZCBOR_MAP_DECODE_KEY_DECODER("image", zcbor_uint32_decode, &img_num_tmp),
Expand Down Expand Up @@ -908,7 +908,7 @@ bs_echo(char *buf, int len)
uint32_t rc = MGMT_ERR_EINVAL;

zcbor_state_t zsd[4];
zcbor_new_state(zsd, sizeof(zsd) / sizeof(zcbor_state_t), (uint8_t *)buf, len, 1);
zcbor_new_state(zsd, sizeof(zsd) / sizeof(zcbor_state_t), (uint8_t *)buf, len, 1, NULL, 0);

if (!zcbor_map_start_decode(zsd)) {
goto out;
Expand All @@ -932,7 +932,7 @@ bs_echo(char *buf, int len)
}

zcbor_map_start_encode(cbor_state, 10);
zcbor_tstr_put_term(cbor_state, "r");
zcbor_tstr_put_lit(cbor_state, "r");
if (zcbor_tstr_encode(cbor_state, &value) && zcbor_map_end_encode(cbor_state, 10)) {
boot_serial_output();
return;
Expand Down
2 changes: 2 additions & 0 deletions boot/zcbor/add_zcbor_copy_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,5 @@ add_copy_notice src/zcbor_common.c "copied"
add_copy_notice include/zcbor_decode.h "copied"
add_copy_notice include/zcbor_encode.h "copied"
add_copy_notice include/zcbor_common.h "copied"
add_copy_notice include/zcbor_print.h "copied"
add_copy_notice include/zcbor_tags.h "copied"
Loading
Loading