michaelh/zephyr
1
0
Fork 0
Code Releases Activity

samples/smp_svr: Switch to ZCBOR_MAP_DECODE_KEY_DECODER

Browse source 
Swithc zcbor_map_decode_bulk to use ZCBOR_MAP_DECODE_KEY_DECODER
macros.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2022-12-06 16:42:18 +00:00 • committed by Carles Cufí
commit 72db5c09c0
4 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

22
subsys/mgmt/mcumgr/grp/fs_mgmt/src/fs_mgmt.c
View file

@ -175,8 +175,8 @@ static int fs_mgmt_file_download(struct smp_streamer *ctxt)
size_t decoded;
struct zcbor_map_decode_key_val fs_download_decode[] = {
ZCBOR_MAP_DECODE_KEY_VAL(off, zcbor_uint64_decode, &off),
ZCBOR_MAP_DECODE_KEY_VAL(name, zcbor_tstr_decode, &name),
ZCBOR_MAP_DECODE_KEY_DECODER("off", zcbor_uint64_decode, &off),
ZCBOR_MAP_DECODE_KEY_DECODER("name", zcbor_tstr_decode, &name),
};
#if defined(CONFIG_MCUMGR_GRP_FS_FILE_ACCESS_HOOK)
@ -313,10 +313,10 @@ static int fs_mgmt_file_upload(struct smp_streamer *ctxt)
size_t decoded = 0;
struct zcbor_map_decode_key_val fs_upload_decode[] = {
ZCBOR_MAP_DECODE_KEY_VAL(off, zcbor_uint64_decode, &off),
ZCBOR_MAP_DECODE_KEY_VAL(name, zcbor_tstr_decode, &name),
ZCBOR_MAP_DECODE_KEY_VAL(data, zcbor_bstr_decode, &file_data),
ZCBOR_MAP_DECODE_KEY_VAL(len, zcbor_uint64_decode, &len),
ZCBOR_MAP_DECODE_KEY_DECODER("off", zcbor_uint64_decode, &off),
ZCBOR_MAP_DECODE_KEY_DECODER("name", zcbor_tstr_decode, &name),
ZCBOR_MAP_DECODE_KEY_DECODER("data", zcbor_bstr_decode, &file_data),
ZCBOR_MAP_DECODE_KEY_DECODER("len", zcbor_uint64_decode, &len),
};
#if defined(CONFIG_MCUMGR_GRP_FS_FILE_ACCESS_HOOK)
@ -408,7 +408,7 @@ static int fs_mgmt_file_status(struct smp_streamer *ctxt)
size_t decoded;
struct zcbor_map_decode_key_val fs_status_decode[] = {
ZCBOR_MAP_DECODE_KEY_VAL(name, zcbor_tstr_decode, &name),
ZCBOR_MAP_DECODE_KEY_DECODER("name", zcbor_tstr_decode, &name),
};
ok = zcbor_map_decode_bulk(zsd, fs_status_decode,
@ -467,10 +467,10 @@ static int fs_mgmt_file_hash_checksum(struct smp_streamer *ctxt)
const struct fs_mgmt_hash_checksum_group *group = NULL;
struct zcbor_map_decode_key_val fs_hash_checksum_decode[] = {
ZCBOR_MAP_DECODE_KEY_VAL(type, zcbor_tstr_decode, &type),
ZCBOR_MAP_DECODE_KEY_VAL(name, zcbor_tstr_decode, &name),
ZCBOR_MAP_DECODE_KEY_VAL(off, zcbor_uint64_decode, &off),
ZCBOR_MAP_DECODE_KEY_VAL(len, zcbor_uint64_decode, &len),
ZCBOR_MAP_DECODE_KEY_DECODER("type", zcbor_tstr_decode, &type),
ZCBOR_MAP_DECODE_KEY_DECODER("name", zcbor_tstr_decode, &name),
ZCBOR_MAP_DECODE_KEY_DECODER("off", zcbor_uint64_decode, &off),
ZCBOR_MAP_DECODE_KEY_DECODER("len", zcbor_uint64_decode, &len),
};
ok = zcbor_map_decode_bulk(zsd, fs_hash_checksum_decode,

14
subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt.c
View file

@ -269,7 +269,7 @@ img_mgmt_erase(struct smp_streamer *ctxt)
size_t decoded = 0;
struct zcbor_map_decode_key_val image_erase_decode[] = {
ZCBOR_MAP_DECODE_KEY_VAL(slot, zcbor_uint32_decode, &slot),
ZCBOR_MAP_DECODE_KEY_DECODER("slot", zcbor_uint32_decode, &slot),
};
ok = zcbor_map_decode_bulk(zsd, image_erase_decode,
@ -376,12 +376,12 @@ img_mgmt_upload(struct smp_streamer *ctxt)
bool reset = false;
struct zcbor_map_decode_key_val image_upload_decode[] = {
ZCBOR_MAP_DECODE_KEY_VAL(image, zcbor_uint32_decode, &req.image),
ZCBOR_MAP_DECODE_KEY_VAL(data, zcbor_bstr_decode, &req.img_data),
ZCBOR_MAP_DECODE_KEY_VAL(len, zcbor_size_decode, &req.size),
ZCBOR_MAP_DECODE_KEY_VAL(off, zcbor_size_decode, &req.off),
ZCBOR_MAP_DECODE_KEY_VAL(sha, zcbor_bstr_decode, &req.data_sha),
ZCBOR_MAP_DECODE_KEY_VAL(upgrade, zcbor_bool_decode, &req.upgrade)
ZCBOR_MAP_DECODE_KEY_DECODER("image", zcbor_uint32_decode, &req.image),
ZCBOR_MAP_DECODE_KEY_DECODER("data", zcbor_bstr_decode, &req.img_data),
ZCBOR_MAP_DECODE_KEY_DECODER("len", zcbor_size_decode, &req.size),
ZCBOR_MAP_DECODE_KEY_DECODER("off", zcbor_size_decode, &req.off),
ZCBOR_MAP_DECODE_KEY_DECODER("sha", zcbor_bstr_decode, &req.data_sha),
ZCBOR_MAP_DECODE_KEY_DECODER("upgrade", zcbor_bool_decode, &req.upgrade)
};
#if defined(CONFIG_MCUMGR_SMP_COMMAND_STATUS_HOOKS)

4
subsys/mgmt/mcumgr/grp/img_mgmt/src/img_mgmt_state.c
View file

@ -281,8 +281,8 @@ img_mgmt_state_write(struct smp_streamer *ctxt)
struct zcbor_string zhash = { 0 };
struct zcbor_map_decode_key_val image_list_decode[] = {
ZCBOR_MAP_DECODE_KEY_VAL(hash, zcbor_bstr_decode, &zhash),
ZCBOR_MAP_DECODE_KEY_VAL(confirm, zcbor_bool_decode, &confirm)
ZCBOR_MAP_DECODE_KEY_DECODER("hash", zcbor_bstr_decode, &zhash),
ZCBOR_MAP_DECODE_KEY_DECODER("confirm", zcbor_bool_decode, &confirm)
};
zcbor_state_t *zsd = ctxt->reader->zs;

2
subsys/mgmt/mcumgr/grp/os_mgmt/src/os_mgmt.c
View file

@ -363,7 +363,7 @@ static int os_mgmt_info(struct smp_streamer *ctxt)
uint16_t valid_formats = 0;
struct zcbor_map_decode_key_val fs_info_decode[] = {
ZCBOR_MAP_DECODE_KEY_VAL(format, zcbor_tstr_decode, &format),
ZCBOR_MAP_DECODE_KEY_DECODER("format", zcbor_tstr_decode, &format),
};
#ifdef CONFIG_MCUMGR_GRP_OS_INFO_CUSTOM_HOOKS