diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt index 106224f97..281dc1bf7 100644 --- a/components/bt/CMakeLists.txt +++ b/components/bt/CMakeLists.txt @@ -350,7 +350,7 @@ if(CONFIG_BT_ENABLED) "esp_ble_mesh/mesh_common/mesh_atomic.c" "esp_ble_mesh/mesh_common/mesh_buf.c" "esp_ble_mesh/mesh_common/mesh_common.c" - "esp_ble_mesh/mesh_common/mesh_kernel.c" + "esp_ble_mesh/mesh_common/mesh_timer.c" "esp_ble_mesh/mesh_common/mesh_util.c" "esp_ble_mesh/mesh_core/storage/settings_nvs.c" "esp_ble_mesh/mesh_core/access.c" diff --git a/components/bt/esp_ble_mesh/mesh_common/include/mesh_kernel.h b/components/bt/esp_ble_mesh/mesh_common/include/mesh_timer.h similarity index 98% rename from components/bt/esp_ble_mesh/mesh_common/include/mesh_kernel.h rename to components/bt/esp_ble_mesh/mesh_common/include/mesh_timer.h index fbe6d271e..94ca1ec67 100644 --- a/components/bt/esp_ble_mesh/mesh_common/include/mesh_kernel.h +++ b/components/bt/esp_ble_mesh/mesh_common/include/mesh_timer.h @@ -5,8 +5,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -#ifndef _BLE_MESH_KERNEL_H_ -#define _BLE_MESH_KERNEL_H_ +#ifndef _BLE_MESH_TIMER_H_ +#define _BLE_MESH_TIMER_H_ #include "mesh_types.h" #include "mesh_slist.h" @@ -284,5 +284,5 @@ void bt_mesh_k_deinit(void); } #endif -#endif /* _BLE_MESH_KERNEL_H_ */ +#endif /* _BLE_MESH_TIMER_H_ */ diff --git a/components/bt/esp_ble_mesh/mesh_common/mesh_atomic.c b/components/bt/esp_ble_mesh/mesh_common/mesh_atomic.c index 5dce0b53b..96bb70e8f 100644 --- a/components/bt/esp_ble_mesh/mesh_common/mesh_atomic.c +++ b/components/bt/esp_ble_mesh/mesh_common/mesh_atomic.c @@ -19,7 +19,7 @@ */ #include "mesh_atomic.h" -#include "mesh_kernel.h" +#include "mesh_timer.h" #ifndef CONFIG_ATOMIC_OPERATIONS_BUILTIN diff --git a/components/bt/esp_ble_mesh/mesh_common/mesh_buf.c b/components/bt/esp_ble_mesh/mesh_common/mesh_buf.c index 01b6300e1..b75d315de 100644 --- a/components/bt/esp_ble_mesh/mesh_common/mesh_buf.c +++ b/components/bt/esp_ble_mesh/mesh_common/mesh_buf.c @@ -9,7 +9,7 @@ #include "mesh_buf.h" #include "mesh_trace.h" -#include "mesh_kernel.h" +#include "mesh_timer.h" int net_buf_id(struct net_buf *buf) { diff --git a/components/bt/esp_ble_mesh/mesh_common/mesh_kernel.c b/components/bt/esp_ble_mesh/mesh_common/mesh_timer.c similarity index 100% rename from components/bt/esp_ble_mesh/mesh_common/mesh_kernel.c rename to components/bt/esp_ble_mesh/mesh_common/mesh_timer.c diff --git a/components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h b/components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h index bfe35fa67..63bce38b7 100644 --- a/components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h +++ b/components/bt/esp_ble_mesh/mesh_core/include/mesh_access.h @@ -14,7 +14,7 @@ #include "mesh_types.h" #include "mesh_util.h" #include "mesh_buf.h" -#include "mesh_kernel.h" +#include "mesh_timer.h" /** * @brief Bluetooth Mesh Access Layer