ble_mesh: Clean up included header files

2025-08-21 08:49:25 +00:00 · 2020-01-08 13:58:36 +08:00
parent db3fa3a100
commit 787ee04a5d
108 changed files with 128 additions and 535 deletions
--- a/components/bt/esp_ble_mesh/mesh_models/client/client_common.c
+++ b/components/bt/esp_ble_mesh/mesh_models/client/client_common.c
@@ -15,16 +15,10 @@
 #include <string.h>
 #include <errno.h>

-#include "osi/allocator.h"
-#include "osi/mutex.h"
-
-#include "mesh_access.h"
-#include "mesh_buf.h"
-#include "mesh_slist.h"
-#include "mesh_main.h"
-
 #include "mesh.h"
+#include "mesh_main.h"
 #include "client_common.h"
+#include "mesh_common.h"

 static bt_mesh_client_node_t *bt_mesh_client_pick_node(sys_slist_t *list, u16_t tx_dst)
 {
--- a/components/bt/esp_ble_mesh/mesh_models/client/generic_client.c
+++ b/components/bt/esp_ble_mesh/mesh_models/client/generic_client.c
@@ -14,19 +14,8 @@

 #include <string.h>
 #include <errno.h>
-#include <stdbool.h>

-#include "osi/allocator.h"
-#include "osi/mutex.h"
-#include "sdkconfig.h"
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-
-#include "mesh.h"
 #include "model_opcode.h"
-#include "mesh_common.h"
 #include "generic_client.h"

 #include "btc_ble_mesh_generic_model.h"
--- a/components/bt/esp_ble_mesh/mesh_models/client/include/generic_client.h
+++ b/components/bt/esp_ble_mesh/mesh_models/client/include/generic_client.h
@@ -19,9 +19,6 @@
 #ifndef _GENERIC_CLIENT_H_
 #define _GENERIC_CLIENT_H_

-#include "mesh_access.h"
-#include "mesh_kernel.h"
-
 #include "client_common.h"

 /* Generic client model common structure */
--- a/components/bt/esp_ble_mesh/mesh_models/client/include/lighting_client.h
+++ b/components/bt/esp_ble_mesh/mesh_models/client/include/lighting_client.h
@@ -19,9 +19,6 @@
 #ifndef _LIGHTING_CLIENT_H_
 #define _LIGHTING_CLIENT_H_

-#include "mesh_access.h"
-#include "mesh_kernel.h"
-
 #include "client_common.h"

 /* Light client model common structure */
--- a/components/bt/esp_ble_mesh/mesh_models/client/include/sensor_client.h
+++ b/components/bt/esp_ble_mesh/mesh_models/client/include/sensor_client.h
@@ -19,9 +19,6 @@
 #ifndef _SENSOR_CLIENT_H_
 #define _SENSOR_CLIENT_H_

-#include "mesh_access.h"
-#include "mesh_kernel.h"
-
 #include "client_common.h"

 /* Sensor Client Model Context */
--- a/components/bt/esp_ble_mesh/mesh_models/client/include/time_scene_client.h
+++ b/components/bt/esp_ble_mesh/mesh_models/client/include/time_scene_client.h
@@ -19,9 +19,6 @@
 #ifndef _TIME_SCENE_CLIENT_H_
 #define _TIME_SCENE_CLIENT_H_

-#include "mesh_access.h"
-#include "mesh_kernel.h"
-
 #include "client_common.h"

 /* Time scene client model common structure */
--- a/components/bt/esp_ble_mesh/mesh_models/client/lighting_client.c
+++ b/components/bt/esp_ble_mesh/mesh_models/client/lighting_client.c
@@ -14,19 +14,8 @@

 #include <string.h>
 #include <errno.h>
-#include <stdbool.h>

-#include "osi/allocator.h"
-#include "osi/mutex.h"
-#include "sdkconfig.h"
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-
-#include "mesh.h"
 #include "model_opcode.h"
-#include "mesh_common.h"
 #include "lighting_client.h"

 #include "btc_ble_mesh_lighting_model.h"
--- a/components/bt/esp_ble_mesh/mesh_models/client/sensor_client.c
+++ b/components/bt/esp_ble_mesh/mesh_models/client/sensor_client.c
@@ -14,19 +14,8 @@

 #include <string.h>
 #include <errno.h>
-#include <stdbool.h>

-#include "osi/allocator.h"
-#include "osi/mutex.h"
-#include "sdkconfig.h"
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-
-#include "mesh.h"
 #include "model_opcode.h"
-#include "mesh_common.h"
 #include "sensor_client.h"

 #include "btc_ble_mesh_sensor_model.h"
--- a/components/bt/esp_ble_mesh/mesh_models/client/time_scene_client.c
+++ b/components/bt/esp_ble_mesh/mesh_models/client/time_scene_client.c
@@ -14,19 +14,8 @@

 #include <string.h>
 #include <errno.h>
-#include <stdbool.h>

-#include "osi/allocator.h"
-#include "osi/mutex.h"
-#include "sdkconfig.h"
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-
-#include "mesh.h"
 #include "model_opcode.h"
-#include "mesh_common.h"
 #include "time_scene_client.h"

 #include "btc_ble_mesh_time_scene_model.h"
--- a/components/bt/esp_ble_mesh/mesh_models/common/include/model_opcode.h
+++ b/components/bt/esp_ble_mesh/mesh_models/common/include/model_opcode.h
@@ -15,7 +15,7 @@
 #ifndef _MODEL_OPCODE_H_
 #define _MODEL_OPCODE_H_

-#include "mesh_main.h"
+#include "mesh_access.h"

 /* Generic OnOff Message Opcode */
 #define BLE_MESH_MODEL_OP_GEN_ONOFF_GET                          BLE_MESH_MODEL_OP_2(0x82, 0x01)
--- a/components/bt/esp_ble_mesh/mesh_models/server/device_property.c
+++ b/components/bt/esp_ble_mesh/mesh_models/server/device_property.c
@@ -12,11 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <string.h>
-#include <stdint.h>
-
-#include "mesh_types.h"
-
 #include "server_common.h"
 #include "device_property.h"

--- a/components/bt/esp_ble_mesh/mesh_models/server/generic_server.c
+++ b/components/bt/esp_ble_mesh/mesh_models/server/generic_server.c
@@ -6,24 +6,11 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <string.h>
-#include <stdlib.h>
-#include <stdbool.h>
 #include <errno.h>

-#include "osi/mutex.h"
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-#include "mesh_common.h"
-#include "mesh.h"
 #include "access.h"
-#include "model_opcode.h"
 #include "transport.h"
-
-#include "server_common.h"
-#include "state_binding.h"
+#include "model_opcode.h"
 #include "state_transition.h"
 #include "device_property.h"

--- a/components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h
+++ b/components/bt/esp_ble_mesh/mesh_models/server/include/server_common.h
@@ -17,10 +17,7 @@

 #include <string.h>
 #include <stdint.h>
-
-#include "mesh_buf.h"
 #include "mesh_access.h"
-#include "mesh_kernel.h"

 #define BLE_MESH_SERVER_RSP_MAX_LEN         384

--- a/components/bt/esp_ble_mesh/mesh_models/server/include/state_binding.h
+++ b/components/bt/esp_ble_mesh/mesh_models/server/include/state_binding.h
@@ -9,6 +9,8 @@
 #ifndef _STATE_BINDING_H_
 #define _STATE_BINDING_H_

+#include "mesh_access.h"
+
 typedef enum {
    GENERIC_ONOFF_STATE,
    GENERIC_LEVEL_STATE,
--- a/components/bt/esp_ble_mesh/mesh_models/server/include/state_transition.h
+++ b/components/bt/esp_ble_mesh/mesh_models/server/include/state_transition.h
@@ -11,6 +11,7 @@

 #include "server_common.h"
 #include "generic_server.h"
+#include "sensor_server.h"
 #include "lighting_server.h"
 #include "time_scene_server.h"

--- a/components/bt/esp_ble_mesh/mesh_models/server/include/time_scene_server.h
+++ b/components/bt/esp_ble_mesh/mesh_models/server/include/time_scene_server.h
@@ -15,8 +15,6 @@
 #ifndef _TIME_SCENE_SERVER_H_
 #define _TIME_SCENE_SERVER_H_

-#include "mesh_slist.h"
-#include "mesh_kernel.h"
 #include "server_common.h"

 /**
--- a/components/bt/esp_ble_mesh/mesh_models/server/lighting_server.c
+++ b/components/bt/esp_ble_mesh/mesh_models/server/lighting_server.c
@@ -6,21 +6,11 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <string.h>
-#include <stdbool.h>
 #include <errno.h>

-#include "osi/mutex.h"
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-#include "mesh.h"
 #include "access.h"
+#include "transport.h"
 #include "model_opcode.h"
-
-#include "server_common.h"
-#include "state_binding.h"
 #include "state_transition.h"
 #include "device_property.h"

--- a/components/bt/esp_ble_mesh/mesh_models/server/sensor_server.c
+++ b/components/bt/esp_ble_mesh/mesh_models/server/sensor_server.c
@@ -12,22 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <string.h>
-#include <stdbool.h>
 #include <errno.h>

-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-#include "mesh.h"
 #include "access.h"
-#include "model_opcode.h"
 #include "transport.h"
-
-#include "server_common.h"
-#include "state_binding.h"
+#include "model_opcode.h"
 #include "state_transition.h"
-#include "sensor_server.h"
 #include "device_property.h"

 #include "btc_ble_mesh_sensor_model.h"
--- a/components/bt/esp_ble_mesh/mesh_models/server/server_common.c
+++ b/components/bt/esp_ble_mesh/mesh_models/server/server_common.c
@@ -12,22 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <string.h>
 #include <errno.h>
-#include <stdbool.h>

-#include "osi/allocator.h"
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
 #include "mesh.h"
 #include "access.h"
-#include "model_opcode.h"
-
-#include "server_common.h"
-#include "state_binding.h"
-#include "state_transition.h"
+#include "mesh_common.h"
+#include "generic_server.h"
+#include "lighting_server.h"

 /**
 * According to Mesh Model Spec:
--- a/components/bt/esp_ble_mesh/mesh_models/server/state_binding.c
+++ b/components/bt/esp_ble_mesh/mesh_models/server/state_binding.c
@@ -6,22 +6,11 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <string.h>
-#include <stdint.h>
 #include <errno.h>
-#include <stdbool.h>
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-#include "mesh.h"

 #include "model_opcode.h"
-#include "server_common.h"
 #include "state_binding.h"
 #include "state_transition.h"
-#include "generic_server.h"
-#include "lighting_server.h"

 #define MINDIFF (2.25e-308)

--- a/components/bt/esp_ble_mesh/mesh_models/server/state_transition.c
+++ b/components/bt/esp_ble_mesh/mesh_models/server/state_transition.c
@@ -6,22 +6,8 @@
 * SPDX-License-Identifier: Apache-2.0
 */

-#include <string.h>
-#include <errno.h>
-#include <stdbool.h>
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-#include "mesh.h"
 #include "model_opcode.h"
-
-#include "server_common.h"
-#include "state_binding.h"
 #include "state_transition.h"
-#include "generic_server.h"
-#include "lighting_server.h"
-#include "time_scene_server.h"

 #include "btc_ble_mesh_generic_model.h"
 #include "btc_ble_mesh_lighting_model.h"
--- a/components/bt/esp_ble_mesh/mesh_models/server/time_scene_server.c
+++ b/components/bt/esp_ble_mesh/mesh_models/server/time_scene_server.c
@@ -12,24 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-#include <string.h>
-#include <stdbool.h>
 #include <errno.h>

-#include "osi/mutex.h"
-
-#include "mesh_types.h"
-#include "mesh_kernel.h"
-#include "mesh_trace.h"
-#include "mesh.h"
 #include "access.h"
-#include "model_opcode.h"
 #include "transport.h"
-
-#include "server_common.h"
-#include "state_binding.h"
+#include "model_opcode.h"
 #include "state_transition.h"
-#include "time_scene_server.h"

 #include "btc_ble_mesh_time_scene_model.h"