patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

mgmt/mcumgr: Remove redundant memcpy from buf processing

Browse source 
The commit removes redundant memcpy operations and switches from
using TinyCBOR provided byte order converters to sys_be, native
to Zephyr.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2022-01-21 15:52:12 +00:00 committed by Carles Cufí
parent 86574107dd
commit a30698a148
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
subsys/mgmt/mcumgr/buf.c
View file

@ -5,9 +5,9 @@
*/
#include <string.h>
#include <sys/byteorder.h>
#include "net/buf.h"
#include "mgmt/mcumgr/buf.h"
#include <tinycbor/compilersupport_p.h>
NET_BUF_POOL_DEFINE(pkt_pool, CONFIG_MCUMGR_BUF_COUNT, CONFIG_MCUMGR_BUF_SIZE,
CONFIG_MCUMGR_BUF_USER_DATA_SIZE, NULL);
@ -42,48 +42,42 @@ static uint16_t
cbor_nb_reader_get16(struct cbor_decoder_reader *d, int offset)
{
struct cbor_nb_reader *cnr;
uint16_t val;
cnr = (struct cbor_nb_reader *) d;
if (offset < 0 || offset > cnr->nb->len - (int)sizeof(val)) {
if (offset < 0 || offset > cnr->nb->len - (int)sizeof(uint16_t)) {
return UINT16_MAX;
}
memcpy(&val, cnr->nb->data + offset, sizeof(val));
return cbor_ntohs(val);
return sys_get_be16(cnr->nb->data + offset);
}
static uint32_t
cbor_nb_reader_get32(struct cbor_decoder_reader *d, int offset)
{
struct cbor_nb_reader *cnr;
uint32_t val;
cnr = (struct cbor_nb_reader *) d;
if (offset < 0 || offset > cnr->nb->len - (int)sizeof(val)) {
if (offset < 0 || offset > cnr->nb->len - (int)sizeof(uint32_t)) {
return UINT32_MAX;
}
memcpy(&val, cnr->nb->data + offset, sizeof(val));
return cbor_ntohl(val);
return sys_get_be32(cnr->nb->data + offset);
}
static uint64_t
cbor_nb_reader_get64(struct cbor_decoder_reader *d, int offset)
{
struct cbor_nb_reader *cnr;
uint64_t val;
cnr = (struct cbor_nb_reader *) d;
if (offset < 0 || offset > cnr->nb->len - (int)sizeof(val)) {
if (offset < 0 || offset > cnr->nb->len - (int)sizeof(uint64_t)) {
return UINT64_MAX;
}
memcpy(&val, cnr->nb->data + offset, sizeof(val));
return cbor_ntohll(val);
return sys_get_be64(cnr->nb->data + offset);
}
static uintptr_t