Commit f1b182b5 authored by Emil Gydesen's avatar Emil Gydesen Committed by Anas Nashif
Browse files

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: default avatarEmil Gydesen <emil.gydesen@nordicsemi.no>
parent 87c1e2a4

MAINTAINERS.yml

+0 −2
Original line number Diff line number Diff line
@@ -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*/

subsys/bluetooth/host/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -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)

subsys/bluetooth/host/testing.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/**

 * @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 */

subsys/bluetooth/mesh/CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -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)

subsys/bluetooth/mesh/access.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#include "common/bt_str.h"



#include "host/testing.h"

#include "testing.h"



#include "mesh.h"

#include "net.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE