Bluetooth: Mesh: Move testing.h to mesh subsys instead of include

The file is only ever used by mesh and it is even stated in the header of the file that it is internal APIs. The include file has been merged with the host testing.h file as that was mesh specific as well. Similarly the testing.c file was also moved This is part of a process to clean up the file structure of Bluetooth as it's a bit messy, which is evident from the MAINTAINERS.yml file. Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
2024-08-23 12:34:08 +02:00 · 2024-08-23 12:34:08 +02:00 · f1b182b585
commit f1b182b585
parent 87c1e2a40f
12 changed files with 20 additions and 57 deletions
--- a/MAINTAINERS.yml
+++ b/MAINTAINERS.yml
@ -391,7 +391,6 @@ Bluetooth Host:
    - include/zephyr/bluetooth/iso.h
    - include/zephyr/bluetooth/controller.h
    - include/zephyr/bluetooth/mesh.h
-    - include/zephyr/bluetooth/testing.h
    - doc/connectivity/bluetooth/bluetooth-ctlr-arch.rst
    - doc/connectivity/bluetooth/autopts/
    - doc/connectivity/bluetooth/img/ctlr*
@ -449,7 +448,6 @@ Bluetooth Mesh:
    - doc/connectivity/bluetooth/api/mesh/
    - include/zephyr/bluetooth/mesh/
    - include/zephyr/bluetooth/mesh.h
-    - include/zephyr/bluetooth/testing.h
    - samples/bluetooth/mesh*/
    - subsys/bluetooth/mesh/
    - tests/bluetooth/mesh*/
--- a/subsys/bluetooth/host/CMakeLists.txt
+++ b/subsys/bluetooth/host/CMakeLists.txt
@ -8,7 +8,6 @@ add_subdirectory_ifdef(CONFIG_BT_CLASSIC classic)
 zephyr_library_sources_ifdef(CONFIG_BT_HCI_RAW          hci_raw.c hci_common.c)
 zephyr_library_sources_ifdef(CONFIG_BT_MONITOR          monitor.c)
 zephyr_library_sources_ifdef(CONFIG_BT_TINYCRYPT_ECC    hci_ecc.c)
-zephyr_library_sources_ifdef(CONFIG_BT_TESTING          testing.c)
 zephyr_library_sources_ifdef(CONFIG_BT_SETTINGS         settings.c)
 zephyr_library_sources_ifdef(CONFIG_BT_HOST_CCM         aes_ccm.c)
 zephyr_library_sources_ifdef(CONFIG_BT_LONG_WQ          long_wq.c)
--- a/subsys/bluetooth/host/testing.h
+++ b/subsys/bluetooth/host/testing.h
@ -1,23 +0,0 @@
-/**
- * @file testing.h
- * @brief Internal API for Bluetooth testing.
- */
-
-/*
- * Copyright (c) 2017 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#if defined(CONFIG_BT_MESH)
-void bt_test_mesh_net_recv(uint8_t ttl, uint8_t ctl, uint16_t src, uint16_t dst,
-			   const void *payload, size_t payload_len);
-void bt_test_mesh_model_recv(uint16_t src, uint16_t dst, const void *payload,
-			     size_t payload_len);
-void bt_test_mesh_model_bound(uint16_t addr, const struct bt_mesh_model *model,
-			      uint16_t key_idx);
-void bt_test_mesh_model_unbound(uint16_t addr, const struct bt_mesh_model *model,
-				uint16_t key_idx);
-void bt_test_mesh_prov_invalid_bearer(uint8_t opcode);
-void bt_test_mesh_trans_incomp_timer_exp(void);
-#endif /* CONFIG_BT_MESH */
--- a/subsys/bluetooth/mesh/CMakeLists.txt
+++ b/subsys/bluetooth/mesh/CMakeLists.txt
@ -130,3 +130,5 @@ zephyr_library_link_libraries_ifdef(CONFIG_MBEDTLS mbedTLS)
 zephyr_library_include_directories_ifdef(CONFIG_BUILD_WITH_TFM
  $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
 )
+
+zephyr_library_sources_ifdef(CONFIG_BT_TESTING testing.c)
--- a/subsys/bluetooth/mesh/access.c
+++ b/subsys/bluetooth/mesh/access.c
@ -16,7 +16,7 @@

 #include "common/bt_str.h"

-#include "host/testing.h"
+#include "testing.h"

 #include "mesh.h"
 #include "net.h"
--- a/subsys/bluetooth/mesh/cfg_srv.c
+++ b/subsys/bluetooth/mesh/cfg_srv.c
@ -18,7 +18,7 @@

 #include "common/bt_str.h"

-#include "host/testing.h"
+#include "testing.h"

 #include "mesh.h"
 #include "net.h"
--- a/subsys/bluetooth/mesh/pb_adv.c
+++ b/subsys/bluetooth/mesh/pb_adv.c
@ -9,7 +9,7 @@
 #include <zephyr/bluetooth/conn.h>
 #include <zephyr/bluetooth/mesh.h>
 #include <zephyr/net/buf.h>
-#include "host/testing.h"
+#include "testing.h"
 #include "net.h"
 #include "crypto.h"
 #include "beacon.h"
--- a/subsys/bluetooth/mesh/testing.c
+++ b/subsys/bluetooth/mesh/testing.c
@ -7,8 +7,6 @@
 #include <zephyr/kernel.h>
 #include <stddef.h>

-#include <zephyr/bluetooth/testing.h>
-
 #if defined(CONFIG_BT_MESH)
 #include "mesh/net.h"
 #include "mesh/lpn.h"
--- a/include/zephyr/bluetooth/testing.h
+++ b/include/zephyr/bluetooth/testing.h
@ -8,26 +8,14 @@
 *
 * SPDX-License-Identifier: Apache-2.0
 */
-#ifndef ZEPHYR_INCLUDE_BLUETOOTH_TESTING_H_
-#define ZEPHYR_INCLUDE_BLUETOOTH_TESTING_H_

 #include <stdint.h>
+#include <zephyr/sys/slist.h>

 #if defined(CONFIG_BT_MESH)
 #include <zephyr/bluetooth/mesh.h>
 #endif /* CONFIG_BT_MESH */

-/**
- * @brief Bluetooth testing
- * @defgroup bt_test_cb Bluetooth testing callbacks
- * @ingroup bluetooth
- * @{
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /** @brief Bluetooth Testing callbacks structure.
 *
 *  Callback structure to be used for Bluetooth testing purposes.
@ -95,12 +83,15 @@ int bt_test_mesh_lpn_group_remove(uint16_t *groups, size_t groups_count);
 */
 int bt_test_mesh_rpl_clear(void);

-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* ZEPHYR_INCLUDE_BLUETOOTH_TESTING_H_ */
+#if defined(CONFIG_BT_MESH)
+void bt_test_mesh_net_recv(uint8_t ttl, uint8_t ctl, uint16_t src, uint16_t dst,
+			   const void *payload, size_t payload_len);
+void bt_test_mesh_model_recv(uint16_t src, uint16_t dst, const void *payload,
+			     size_t payload_len);
+void bt_test_mesh_model_bound(uint16_t addr, const struct bt_mesh_model *model,
+			      uint16_t key_idx);
+void bt_test_mesh_model_unbound(uint16_t addr, const struct bt_mesh_model *model,
+				uint16_t key_idx);
+void bt_test_mesh_prov_invalid_bearer(uint8_t opcode);
+void bt_test_mesh_trans_incomp_timer_exp(void);
+#endif /* CONFIG_BT_MESH */
--- a/subsys/bluetooth/mesh/transport.c
+++ b/subsys/bluetooth/mesh/transport.c
@ -19,8 +19,6 @@

 #include "common/bt_str.h"

-#include "host/testing.h"
-
 #include "crypto.h"
 #include "mesh.h"
 #include "net.h"
@ -33,6 +31,7 @@
 #include "sar_cfg_internal.h"
 #include "settings.h"
 #include "heartbeat.h"
+#include "testing.h"
 #include "transport.h"
 #include "va.h"

--- a/tests/bluetooth/tester/src/audio/btp_vcp.c
+++ b/tests/bluetooth/tester/src/audio/btp_vcp.c
@ -10,7 +10,6 @@
 #include <stdint.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/bluetooth/bluetooth.h>
-#include <zephyr/bluetooth/testing.h>
 #include <zephyr/bluetooth/audio/vcp.h>
 #include <zephyr/bluetooth/audio/aics.h>
 #include <zephyr/bluetooth/audio/vocs.h>
--- a/tests/bluetooth/tester/src/btp_mesh.c
+++ b/tests/bluetooth/tester/src/btp_mesh.c
@ -9,7 +9,6 @@
 #include <assert.h>
 #include <errno.h>
 #include <zephyr/bluetooth/mesh.h>
-#include <zephyr/bluetooth/testing.h>
 #include <zephyr/bluetooth/mesh/cfg.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/settings/settings.h>
@ -18,6 +17,7 @@
 #include <sar_cfg_internal.h>
 #include <string.h>
 #include "mesh/access.h"
+#include "mesh/testing.h"

 #include <zephyr/logging/log.h>
 #define LOG_MODULE_NAME bttester_mesh