tests/mgmt/mcumgr: Apply rework in MCUMgr subsystem

Code changes required by rework in MCUMgr souce code structure.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2022-10-03 15:59:46 +00:00 committed by Carles Cufí
commit b3833cf2bc
7 changed files with 17 additions and 15 deletions

View file

@ -13,4 +13,4 @@ FILE(GLOB app_sources
)
target_sources(app PRIVATE ${app_sources})
zephyr_library_include_directories(${ZEPHYR_BASE}/subsys/mgmt/mcumgr/)
zephyr_library_include_directories(${ZEPHYR_BASE}/subsys/mgmt/mcumgr/transport/include)

View file

@ -8,12 +8,12 @@
#include <zephyr/sys/byteorder.h>
#include <zephyr/net/buf.h>
#include <zephyr/net/net_ip.h>
#include <mgmt/mgmt.h>
#include <fs_mgmt/fs_mgmt.h>
#include <zephyr/mgmt/mcumgr/mgmt/mgmt.h>
#include <zephyr/mgmt/mcumgr/transport/smp_dummy.h>
#include <zephyr/mgmt/mcumgr/grp/fs_mgmt/fs_mgmt.h>
#include <zcbor_common.h>
#include <zcbor_decode.h>
#include <smp_internal.h>
#include <mgmt/mcumgr/transport/smp_internal.h>
#define SMP_RESPONSE_WAIT_TIME 3

View file

@ -6,9 +6,9 @@
#include <zephyr/ztest.h>
#include <zephyr/net/buf.h>
#include <zephyr/mgmt/mcumgr/mgmt/mgmt.h>
#include <zephyr/mgmt/mcumgr/transport/smp_dummy.h>
#include <mgmt/mgmt.h>
#include <os_mgmt/os_mgmt.h>
#include <zephyr/mgmt/mcumgr/grp/os_mgmt/os_mgmt.h>
#define SMP_RESPONSE_WAIT_TIME 3

View file

@ -11,5 +11,8 @@ project(smp_reassembly)
FILE(GLOB app_sources
src/*.c
)
zephyr_library_include_directories(${ZEPHYR_BASE}/subsys/mgmt/mcumgr/)
zephyr_library_include_directories(
${ZEPHYR_BASE}/subsys/mgmt/mcumgr/
${ZEPHYR_BASE}/subsys/mgmt/mcumgr/transport/include/
)
target_sources(app PRIVATE ${app_sources})

View file

@ -7,12 +7,11 @@
#include <zephyr/ztest.h>
#include <zephyr/sys/byteorder.h>
#include <zephyr/net/buf.h>
#include <zephyr/mgmt/mcumgr/mgmt/mgmt.h>
#include <zephyr/mgmt/mcumgr/smp/smp.h>
#include <zephyr/mgmt/mcumgr/transport/smp.h>
#include <mgmt/mgmt.h>
#include <smp/smp.h>
#include "../../../../../../subsys/mgmt/mcumgr/smp_reassembly.h"
#include "../../../../../../subsys/mgmt/mcumgr/smp_internal.h"
#include "mgmt/mcumgr/transport/smp_reassembly.h"
#include "mgmt/mcumgr/transport/smp_internal.h"
static struct smp_transport smpt;
static uint8_t buff[CONFIG_MCUMGR_BUF_SIZE];

View file

@ -10,10 +10,10 @@ project(zcbor_bulk)
FILE(GLOB app_sources
src/*.c
${ZEPHYR_BASE}/subsys/mgmt/mcumgr/lib/util/src/zcbor_bulk.c
${ZEPHYR_BASE}/subsys/mgmt/mcumgr/util/src/zcbor_bulk.c
)
zephyr_include_directories(
${ZEPHYR_BASE}/subsys/mgmt/mcumgr/lib/util/include/
${ZEPHYR_BASE}/subsys/mgmt/mcumgr/util/include/
)
target_sources(app PRIVATE ${app_sources})

View file

@ -9,7 +9,7 @@
#include <zcbor_common.h>
#include <zcbor_decode.h>
#include <zcbor_encode.h>
#include <zcbor_bulk/zcbor_bulk_priv.h>
#include "mgmt/mcumgr/util/zcbor_bulk.h"
#define zcbor_true_put(zse) zcbor_bool_put(zse, true)