adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

mgmt/mcumgr: Move transport headers to transport subdir

Browse source 
The MCUmgr transport headers have been moved to
zephyr/mgmt/mcumgr/transport/

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
This commit is contained in:
Dominik Ermel 2022-10-27 13:57:29 +00:00 committed by Carles Cufí
parent aef9bdf348
commit 7c2924f4bc
24 changed files with 33 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/console/uart_console.c
View file

@ -32,7 +32,7 @@
#include <zephyr/sys/atomic.h>
#include <zephyr/sys/printk.h>
#ifdef CONFIG_UART_CONSOLE_MCUMGR
#include <zephyr/mgmt/mcumgr/serial.h>
#include <zephyr/mgmt/mcumgr/transport/serial.h>
#endif
static const struct device *const uart_console_dev =

2
drivers/console/uart_mcumgr.c
View file

@ -12,7 +12,7 @@
#include <string.h>
#include <zephyr/kernel.h>
#include <zephyr/drivers/uart.h>
#include <zephyr/mgmt/mcumgr/serial.h>
#include <zephyr/mgmt/mcumgr/transport/serial.h>
#include <zephyr/drivers/console/uart_mcumgr.h>
static const struct device *const uart_mcumgr_dev =

0
include/zephyr/mgmt/mcumgr/serial.h → include/zephyr/mgmt/mcumgr/transport/serial.h
View file

0
include/zephyr/mgmt/mcumgr/smp.h → include/zephyr/mgmt/mcumgr/transport/smp.h
View file

0
include/zephyr/mgmt/mcumgr/smp_bt.h → include/zephyr/mgmt/mcumgr/transport/smp_bt.h
View file

2
include/zephyr/mgmt/mcumgr/smp_dummy.h → include/zephyr/mgmt/mcumgr/transport/smp_dummy.h
View file

@ -14,7 +14,7 @@
#include <zephyr/kernel.h>
#include <zephyr/net/buf.h>
#include <mgmt/mgmt.h>
#include <zephyr/mgmt/mcumgr/serial.h>
#include <zephyr/mgmt/mcumgr/transport/serial.h>
#ifdef __cplusplus
extern "C" {

0
include/zephyr/mgmt/mcumgr/smp_shell.h → include/zephyr/mgmt/mcumgr/transport/smp_shell.h
View file

0
include/zephyr/mgmt/mcumgr/smp_udp.h → include/zephyr/mgmt/mcumgr/transport/smp_udp.h
View file

2
include/zephyr/shell/shell_uart.h
View file

@ -10,7 +10,7 @@
#include <zephyr/shell/shell.h>
#include <zephyr/sys/ring_buffer.h>
#include <zephyr/sys/atomic.h>
#include <zephyr/mgmt/mcumgr/smp_shell.h>
#include <zephyr/mgmt/mcumgr/transport/smp_shell.h>
#ifdef __cplusplus
extern "C" {

2
samples/subsys/mgmt/mcumgr/smp_svr/src/bluetooth.c
View file

@ -8,7 +8,7 @@
#include <zephyr/bluetooth/bluetooth.h>
#include <zephyr/bluetooth/conn.h>
#include <zephyr/bluetooth/gatt.h>
#include <zephyr/mgmt/mcumgr/smp_bt.h>
#include <zephyr/mgmt/mcumgr/transport/smp_bt.h>
#define LOG_LEVEL LOG_LEVEL_DBG
#include <zephyr/logging/log.h>

2
samples/subsys/mgmt/mcumgr/smp_svr/src/udp.c
View file

@ -4,10 +4,10 @@
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr/mgmt/mcumgr/smp_udp.h>
#include <zephyr/net/net_mgmt.h>
#include <zephyr/net/net_event.h>
#include <zephyr/net/net_conn_mgr.h>
#include <zephyr/mgmt/mcumgr/transport/smp_udp.h>
#define LOG_LEVEL LOG_LEVEL_DBG
#include <zephyr/logging/log.h>

2
subsys/mgmt/mcumgr/lib/smp/include/smp/smp.h
View file

@ -26,7 +26,7 @@
#define H_SMP_
#include <zephyr/net/buf.h>
#include <zephyr/mgmt/mcumgr/smp.h>
#include <zephyr/mgmt/mcumgr/transport/smp.h>
#include <zcbor_common.h>
#ifdef __cplusplus

2
subsys/mgmt/mcumgr/lib/smp/src/smp.c
View file

@ -12,7 +12,7 @@
#include <string.h>
#include <zephyr/net/buf.h>
#include <zephyr/mgmt/mcumgr/smp.h>
#include <zephyr/mgmt/mcumgr/transport/smp.h>
#include "mgmt/mgmt.h"
#include <zcbor_common.h>
#include <zcbor_decode.h>

2
subsys/mgmt/mcumgr/smp.c
View file

@ -8,7 +8,7 @@
#include <zephyr/kernel.h>
#include <zephyr/device.h>
#include <zephyr/net/buf.h>
#include <zephyr/mgmt/mcumgr/smp.h>
#include <zephyr/mgmt/mcumgr/transport/smp.h>
#include "smp_reassembly.h"
#include "mgmt/mgmt.h"
#include "smp/smp.h"

2
subsys/mgmt/mcumgr/smp_reassembly.c
View file

@ -7,7 +7,7 @@
#include <zephyr/kernel.h>
#include <zephyr/sys/byteorder.h>
#include <zephyr/net/buf.h>
#include <zephyr/mgmt/mcumgr/smp.h>
#include <zephyr/mgmt/mcumgr/transport/smp.h>
#include <mgmt/mgmt.h>
#include <smp/smp.h>
#include "smp_internal.h"

2
subsys/mgmt/mcumgr/transport/serial_util.c
View file

@ -13,9 +13,9 @@
#include <zephyr/sys/byteorder.h>
#include <zephyr/net/buf.h>
#include <zephyr/sys/base64.h>
#include <zephyr/mgmt/mcumgr/serial.h>
#include "mgmt/mgmt.h"
#include "smp/smp.h"
#include <zephyr/mgmt/mcumgr/transport/serial.h>
static void mcumgr_serial_free_rx_ctxt(struct mcumgr_serial_rx_ctxt *rx_ctxt)
{

7
subsys/mgmt/mcumgr/transport/smp_bt.c
View file

@ -9,17 +9,16 @@
* @brief Bluetooth transport for the mcumgr SMP protocol.
*/
#include <errno.h>
#include <zephyr/kernel.h>
#include <zephyr/init.h>
#include <zephyr/bluetooth/bluetooth.h>
#include <zephyr/bluetooth/uuid.h>
#include <zephyr/bluetooth/gatt.h>
#include <zephyr/mgmt/mcumgr/transport/smp.h>
#include <zephyr/mgmt/mcumgr/transport/smp_bt.h>
#include <errno.h>
#include <zephyr/mgmt/mcumgr/smp_bt.h>
#include <zephyr/mgmt/mcumgr/smp.h>
#include <mgmt/mgmt.h>
#include "smp/smp.h"
#include "../smp_internal.h"

6
subsys/mgmt/mcumgr/transport/smp_dummy.c
View file

@ -20,10 +20,10 @@
#include <zephyr/net/buf.h>
#include <zephyr/sys/base64.h>
#include <zephyr/drivers/console/uart_mcumgr.h>
#include <zephyr/mgmt/mcumgr/transport/smp.h>
#include <zephyr/mgmt/mcumgr/transport/smp_dummy.h>
#include <zephyr/mgmt/mcumgr/transport/serial.h>
#include <mgmt/mgmt.h>
#include <zephyr/mgmt/mcumgr/serial.h>
#include <zephyr/mgmt/mcumgr/smp.h>
#include <zephyr/mgmt/mcumgr/smp_dummy.h>
#include <smp/smp.h>
#include "../smp_internal.h"

10
subsys/mgmt/mcumgr/transport/smp_shell.c
View file

@ -12,15 +12,17 @@
#include <zephyr/kernel.h>
#include <zephyr/init.h>
#include <zephyr/net/buf.h>
#include <zephyr/drivers/uart.h>
#include <zephyr/shell/shell.h>
#include <zephyr/shell/shell_uart.h>
#include <zephyr/drivers/uart.h>
#include <zephyr/mgmt/mcumgr/transport/smp.h>
#include <zephyr/mgmt/mcumgr/transport/serial.h>
#include <zephyr/mgmt/mcumgr/transport/smp_shell.h>
#include <syscalls/uart.h>
#include <string.h>
#include "mgmt/mgmt.h"
#include "smp/smp.h"
#include <zephyr/mgmt/mcumgr/serial.h>
#include <zephyr/mgmt/mcumgr/smp.h>
#include <zephyr/mgmt/mcumgr/smp_shell.h>
#include "../smp_internal.h"
#include <zephyr/logging/log.h>

5
subsys/mgmt/mcumgr/transport/smp_uart.c
View file

@ -13,10 +13,11 @@
#include <zephyr/init.h>
#include <zephyr/net/buf.h>
#include <zephyr/drivers/console/uart_mcumgr.h>
#include <zephyr/mgmt/mcumgr/transport/smp.h>
#include <zephyr/mgmt/mcumgr/transport/serial.h>
#include "mgmt/mgmt.h"
#include "smp/smp.h"
#include <zephyr/mgmt/mcumgr/serial.h>
#include <zephyr/mgmt/mcumgr/smp.h>
#include "../smp_internal.h"
BUILD_ASSERT(CONFIG_MCUMGR_SMP_UART_MTU != 0, "CONFIG_MCUMGR_SMP_UART_MTU must be > 0");

6
subsys/mgmt/mcumgr/transport/smp_udp.c
View file

@ -17,11 +17,13 @@
#else
#include <zephyr/net/socket.h>
#endif
#include <zephyr/mgmt/mcumgr/transport/smp.h>
#include <zephyr/mgmt/mcumgr/transport/smp_udp.h>
#include <errno.h>
#include <errno.h>
#include <mgmt/mgmt.h>
#include "smp/smp.h"
#include <zephyr/mgmt/mcumgr/smp_udp.h>
#include <zephyr/mgmt/mcumgr/smp.h>
#include "../smp_internal.h"
#define LOG_LEVEL CONFIG_MCUMGR_LOG_LEVEL

2
tests/subsys/mgmt/mcumgr/fs_mgmt_hash_supported/src/main.c
View file

@ -9,8 +9,8 @@
#include <zephyr/net/buf.h>
#include <zephyr/net/net_ip.h>
#include <mgmt/mgmt.h>
#include <zephyr/mgmt/mcumgr/smp_dummy.h>
#include <fs_mgmt/fs_mgmt.h>
#include <zephyr/mgmt/mcumgr/transport/smp_dummy.h>
#include <zcbor_common.h>
#include <zcbor_decode.h>
#include <smp_internal.h>

2
tests/subsys/mgmt/mcumgr/os_mgmt_echo/src/main.c
View file

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

2
tests/subsys/mgmt/mcumgr/smp_reassembly/src/main.c
View file

@ -7,7 +7,7 @@
#include <zephyr/ztest.h>
#include <zephyr/sys/byteorder.h>
#include <zephyr/net/buf.h>
#include <zephyr/mgmt/mcumgr/smp.h>
#include <zephyr/mgmt/mcumgr/transport/smp.h>
#include <mgmt/mgmt.h>
#include <smp/smp.h>
#include "../../../../../../subsys/mgmt/mcumgr/smp_reassembly.h"