Skip to content

Commit b575fd6

Browse files
arkqarkq
committed
Include <ble/Ble.h> instead of specific headers
1 parent 460ece0 commit b575fd6

File tree

87 files changed

+85
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+85
-106
lines changed

‎examples/all-clusters-app/asr/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#pragma once
2020

2121
#include "AppEvent.h"
22-
#include <ble/BLEEndPoint.h>
22+
#include <ble/Ble.h>
2323
#include <lega_rtos_api.h>
2424
#include <platform/CHIPDeviceLayer.h>
2525
#include <stdbool.h>

‎examples/all-clusters-app/infineon/psoc6/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "AppEvent.h"
2727
#include "FreeRTOS.h"
2828
#include "timers.h" // provides FreeRTOS timer support
29-
#include <ble/BLEEndPoint.h>
29+
#include <ble/Ble.h>
3030
#include <platform/CHIPDeviceLayer.h>
3131

3232
// Application-defined error codes in the CHIP_ERROR space.

‎examples/all-clusters-minimal-app/asr/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "AppEvent.h"
2525
#include "FreeRTOS.h"
2626
#include "timers.h" // provides FreeRTOS timer support
27-
#include <ble/BLEEndPoint.h>
27+
#include <ble/Ble.h>
2828
#include <platform/CHIPDeviceLayer.h>
2929

3030
// Application-defined error codes in the CHIP_ERROR space.

‎examples/all-clusters-minimal-app/infineon/psoc6/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "AppEvent.h"
2727
#include "FreeRTOS.h"
2828
#include "timers.h" // provides FreeRTOS timer support
29-
#include <ble/BLEEndPoint.h>
29+
#include <ble/Ble.h>
3030
#include <platform/CHIPDeviceLayer.h>
3131

3232
// Application-defined error codes in the CHIP_ERROR space.

‎examples/chef/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include "AppEvent.h"
3030
#include "BaseApplication.h"
31-
#include <ble/BLEEndPoint.h>
31+
#include <ble/Ble.h>
3232
#include <cmsis_os2.h>
3333
#include <lib/core/CHIPError.h>
3434
#include <platform/CHIPDeviceLayer.h>

‎examples/light-switch-app/asr/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include "FreeRTOS.h"
2727
#include "timers.h" // provides FreeRTOS timer support
28-
#include <ble/BLEEndPoint.h>
28+
#include <ble/Ble.h>
2929
#include <platform/CHIPDeviceLayer.h>
3030

3131
// Application-defined error codes in the CHIP_ERROR space.

‎examples/light-switch-app/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include "AppEvent.h"
3030
#include "BaseApplication.h"
31-
#include <ble/BLEEndPoint.h>
31+
#include <ble/Ble.h>
3232
#include <cmsis_os2.h>
3333
#include <lib/core/CHIPError.h>
3434
#include <platform/CHIPDeviceLayer.h>

‎examples/lighting-app/infineon/psoc6/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "FreeRTOS.h"
2929
#include "timers.h" // provides FreeRTOS timer support
30-
#include <ble/BLEEndPoint.h>
30+
#include <ble/Ble.h>
3131
#include <platform/CHIPDeviceLayer.h>
3232

3333
// Application-defined error codes in the CHIP_ERROR space.

‎examples/lighting-app/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "AppEvent.h"
3030
#include "BaseApplication.h"
3131
#include "LightingManager.h"
32-
#include <ble/BLEEndPoint.h>
32+
#include <ble/Ble.h>
3333
#include <cmsis_os2.h>
3434
#include <lib/core/CHIPError.h>
3535
#include <platform/CHIPDeviceLayer.h>

‎examples/lit-icd-app/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
#include "AppEvent.h"
3030
#include "BaseApplication.h"
31-
#include <ble/BLEEndPoint.h>
31+
#include <ble/Ble.h>
3232
#include <cmsis_os2.h>
3333
#include <lib/core/CHIPError.h>
3434
#include <platform/CHIPDeviceLayer.h>

‎examples/lock-app/asr/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "FreeRTOS.h"
2929
#include "timers.h" // provides FreeRTOS timer support
30-
#include <ble/BLEEndPoint.h>
30+
#include <ble/Ble.h>
3131
#include <platform/CHIPDeviceLayer.h>
3232

3333
// Application-defined error codes in the CHIP_ERROR space.

‎examples/lock-app/esp32/main/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include <lock/BoltLockManager.h>
2525

2626
#include "freertos/FreeRTOS.h"
27-
#include <ble/BLEEndPoint.h>
27+
#include <ble/Ble.h>
2828
#include <lib/support/CodeUtils.h>
2929
#include <platform/CHIPDeviceLayer.h>
3030

‎examples/lock-app/infineon/psoc6/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "FreeRTOS.h"
2929
#include "timers.h" // provides FreeRTOS timer support
30-
#include <ble/BLEEndPoint.h>
30+
#include <ble/Ble.h>
3131
#include <platform/CHIPDeviceLayer.h>
3232

3333
// Application-defined error codes in the CHIP_ERROR space.

‎examples/lock-app/qpg/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#include "FreeRTOS.h"
2929
#include "timers.h" // provides FreeRTOS timer support
30-
#include <ble/BLEEndPoint.h>
30+
#include <ble/Ble.h>
3131
#include <lib/core/CHIPError.h>
3232
#include <platform/CHIPDeviceLayer.h>
3333

‎examples/lock-app/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "AppEvent.h"
3030
#include "BaseApplication.h"
3131
#include "LockManager.h"
32-
#include <ble/BLEEndPoint.h>
32+
#include <ble/Ble.h>
3333
#include <cmsis_os2.h>
3434
#include <lib/core/CHIPError.h>
3535
#include <platform/CHIPDeviceLayer.h>

‎examples/platform/silabs/BaseApplication.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <app/clusters/identify-server/identify-server.h>
3131
#include <app/server/AppDelegate.h>
3232
#include <app/util/config.h>
33-
#include <ble/BLEEndPoint.h>
33+
#include <ble/Ble.h>
3434
#include <cmsis_os2.h>
3535
#include <lib/core/CHIPError.h>
3636
#include <platform/CHIPDeviceEvent.h>

‎examples/pump-app/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "AppEvent.h"
3030
#include "BaseApplication.h"
3131
#include "PumpManager.h"
32-
#include <ble/BLEEndPoint.h>
32+
#include <ble/Ble.h>
3333
#include <cmsis_os2.h>
3434
#include <lib/core/CHIPError.h>
3535
#include <platform/CHIPDeviceLayer.h>

‎examples/smoke-co-alarm-app/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "AppEvent.h"
2828
#include "BaseApplication.h"
2929
#include "SmokeCoAlarmManager.h"
30-
#include <ble/BLEEndPoint.h>
30+
#include <ble/Ble.h>
3131
#include <cmsis_os2.h>
3232
#include <lib/core/CHIPError.h>
3333
#include <platform/CHIPDeviceLayer.h>

‎examples/temperature-measurement-app/asr/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "AppEvent.h"
2525
#include "FreeRTOS.h"
2626
#include "timers.h" // provides FreeRTOS timer support
27-
#include <ble/BLEEndPoint.h>
27+
#include <ble/Ble.h>
2828
#include <platform/CHIPDeviceLayer.h>
2929

3030
// Application-defined error codes in the CHIP_ERROR space.

‎examples/thermostat/asr/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "SensorManager.h"
2727
#include "TemperatureManager.h"
2828
#include "timers.h" // provides FreeRTOS timer support
29-
#include <ble/BLEEndPoint.h>
29+
#include <ble/Ble.h>
3030
#include <platform/CHIPDeviceLayer.h>
3131

3232
#include <FreeRTOS.h>

‎examples/thermostat/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "BaseApplication.h"
3535
#include "SensorManager.h"
3636
#include "TemperatureManager.h"
37-
#include <ble/BLEEndPoint.h>
37+
#include <ble/Ble.h>
3838
#include <cmsis_os2.h>
3939
#include <lib/core/CHIPError.h>
4040
#include <platform/CHIPDeviceLayer.h>

‎examples/window-app/silabs/include/AppTask.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <stdint.h>
2828

2929
#include "BaseApplication.h"
30-
#include <ble/BLEEndPoint.h>
30+
#include <ble/Ble.h>
3131
#include <cmsis_os2.h>
3232
#include <lib/core/CHIPError.h>
3333
#include <platform/CHIPDeviceLayer.h>

‎src/app/server/Server.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <app/util/ember-compatibility-functions.h>
2828

2929
#if CONFIG_NETWORK_LAYER_BLE
30-
#include <ble/BLEEndPoint.h>
30+
#include <ble/Ble.h>
3131
#endif
3232
#include <inet/IPAddress.h>
3333
#include <inet/InetError.h>

‎src/controller/CHIPDeviceController.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#include <tracing/macros.h>
6262

6363
#if CONFIG_NETWORK_LAYER_BLE
64-
#include <ble/BleLayer.h>
64+
#include <ble/Ble.h>
6565
#include <transport/raw/BLE.h>
6666
#endif
6767

‎src/controller/CHIPDeviceController.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
#endif
7373

7474
#if CONFIG_NETWORK_LAYER_BLE
75-
#include <ble/BleLayer.h>
75+
#include <ble/Ble.h>
7676
#endif
7777
#include <controller/DeviceDiscoveryDelegate.h>
7878

‎src/controller/CHIPDeviceControllerSystemState.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
#endif
5050

5151
#if CONFIG_NETWORK_LAYER_BLE
52-
#include <ble/BleLayer.h>
52+
#include <ble/Ble.h>
5353
#include <transport/raw/BLE.h>
5454
#endif
5555

‎src/controller/SetUpCodePairer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include <setup_payload/QRCodeSetupPayloadParser.h>
3737

3838
#if CONFIG_NETWORK_LAYER_BLE
39-
#include <ble/BleLayer.h>
39+
#include <ble/Ble.h>
4040
#endif // CONFIG_NETWORK_BLE
4141

4242
#include <controller/DeviceDiscoveryDelegate.h>

‎src/controller/java/CHIPDeviceController-JNI.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <app/ReadClient.h>
3838
#include <app/WriteClient.h>
3939
#include <atomic>
40-
#include <ble/BleUUID.h>
40+
#include <ble/Ble.h>
4141
#include <controller/CHIPDeviceController.h>
4242
#include <controller/CommissioningWindowOpener.h>
4343
#include <controller/java/GroupDeviceProxy.h>

‎src/controller/python/chip/ble/LinuxImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <cstdint>
2020
#include <memory>
2121

22-
#include <ble/CHIPBleServiceData.h>
22+
#include <ble/Ble.h>
2323
#include <lib/core/CHIPError.h>
2424
#include <lib/support/CodeUtils.h>
2525
#include <platform/CHIPDeviceLayer.h>

‎src/controller/python/chip/ble/darwin/Scanning.mm

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#include <ble/BleUUID.h>
2-
#include <ble/CHIPBleServiceData.h>
1+
#include <ble/Ble.h>
32
#include <lib/support/CHIPMem.h>
43
#include <lib/support/logging/CHIPLogging.h>
54
#include <platform/Darwin/UUIDHelper.h>

‎src/include/platform/CHIPDeviceEvent.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ typedef void (*AsyncWorkFunct)(intptr_t arg);
369369
#include CHIPDEVICEPLATFORMEVENT_HEADER
370370
#endif // defined(CHIP_DEVICE_LAYER_TARGET)
371371

372-
#include <ble/BleConfig.h>
372+
#include <ble/Ble.h>
373373
#include <inet/InetInterface.h>
374374
#include <lib/support/LambdaBridge.h>
375375
#include <system/SystemEvent.h>

‎src/include/platform/internal/GenericConfigurationManagerImpl.ipp

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define GENERIC_CONFIGURATION_MANAGER_IMPL_CPP
2828

2929
#include <FirmwareBuildTime.h>
30-
#include <ble/CHIPBleServiceData.h>
30+
#include <ble/Ble.h>
3131
#include <crypto/CHIPCryptoPAL.h>
3232
#include <crypto/RandUtils.h>
3333
#include <inttypes.h>

‎src/lib/core/CHIPCore.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@
2929

3030
#include <system/SystemLayer.h>
3131

32-
#include <ble/BleConfig.h>
33-
3432
#if CONFIG_NETWORK_LAYER_BLE
35-
#include <ble/BleLayer.h>
33+
#include <ble/Ble.h>
3634
#endif // CONFIG_NETWORK_LAYER_BLE
3735

3836
#define CHIP_CORE_IDENTITY "chip-core"

‎src/platform/ASR/BLEAppSvc.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ extern "C" {
3939
}
4040
#endif
4141
#include "BLEAppSvc.h"
42-
#include <ble/CHIPBleServiceData.h>
42+
#include <ble/Ble.h>
4343
#include <platform/ConfigurationManager.h>
4444
#include <platform/internal/BLEManager.h>
4545
using namespace chip::DeviceLayer;

‎src/platform/ASR/BLEManagerImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
2424

2525
#include "BLEAppSvc.h"
26-
#include <ble/CHIPBleServiceData.h>
26+
#include <ble/Ble.h>
2727
#include <lib/support/CodeUtils.h>
2828
#include <lib/support/logging/CHIPLogging.h>
2929
#include <platform/DeviceInstanceInfoProvider.h>

‎src/platform/Ameba/BLEManagerImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <setup_payload/AdditionalDataPayloadGenerator.h>
3131

3232
#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
33-
#include <ble/CHIPBleServiceData.h>
33+
#include <ble/Ble.h>
3434

3535
#include "stdio.h"
3636
#include "timers.h"

‎src/platform/Beken/BLEManagerImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include <setup_payload/AdditionalDataPayloadGenerator.h>
3131

3232
#if CHIP_DEVICE_CONFIG_ENABLE_CHIPOBLE
33-
#include <ble/CHIPBleServiceData.h>
33+
#include <ble/Ble.h>
3434
#if CHIP_ENABLE_ADDITIONAL_DATA_ADVERTISING
3535
#include <setup_payload/AdditionalDataPayloadGenerator.h>
3636
#endif

‎src/platform/Darwin/BLEManagerImpl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
#include <platform/internal/CHIPDeviceLayerInternal.h>
2525

26-
#include <ble/CHIPBleServiceData.h>
26+
#include <ble/Ble.h>
2727
#include <lib/core/Global.h>
2828
#include <lib/support/logging/CHIPLogging.h>
2929
#include <platform/Darwin/BleApplicationDelegate.h>

‎src/platform/Darwin/BleApplicationDelegate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#pragma once
1919

20-
#include <ble/BleApplicationDelegate.h>
20+
#include <ble/Ble.h>
2121

2222
namespace chip {
2323
namespace DeviceLayer {

‎src/platform/Darwin/BleApplicationDelegateImpl.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
2525
#endif
2626

27-
#include <ble/BleConfig.h>
27+
#include <ble/Ble.h>
2828
#include <platform/Darwin/BleApplicationDelegate.h>
2929

3030
using namespace ::chip;

‎src/platform/Darwin/BleConnectionDelegate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#pragma once
1919

20-
#include <ble/BleConnectionDelegate.h>
20+
#include <ble/Ble.h>
2121

2222
namespace chip {
2323
namespace DeviceLayer {

‎src/platform/Darwin/BleConnectionDelegateImpl.mm

+1-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@
2525
#error This file must be compiled with ARC. Use -fobjc-arc flag (or convert project to ARC).
2626
#endif
2727

28-
#include <ble/BleConfig.h>
29-
#include <ble/BleError.h>
30-
#include <ble/BleLayer.h>
31-
#include <ble/BleUUID.h>
28+
#include <ble/Ble.h>
3229
#include <lib/support/logging/CHIPLogging.h>
3330
#include <platform/CHIPDeviceLayer.h>
3431
#include <platform/Darwin/BleConnectionDelegate.h>

‎src/platform/Darwin/BlePlatformDelegate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#pragma once
1919

20-
#include <ble/BlePlatformDelegate.h>
20+
#include <ble/Ble.h>
2121
#include <system/SystemPacketBuffer.h>
2222

2323
using ::chip::Ble::ChipBleUUID;

0 commit comments

Comments
 (0)