BLE: Move BleInstanceBase.h into source.

2020-08-21 17:11:19 +01:00 · 2020-08-21 17:11:19 +01:00 · a45325995b
parent c2a09abee8
commit a45325995b
15 changed files with 11 additions and 16 deletions
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/driver/CordioHCIDriver.cpp
@ -18,7 +18,6 @@
 #include <string.h>

 #include "ble/BLE.h"
-#include "ble/internal/BLEInstanceBase.h"
 #include "ble/Gap.h"
 #include "CordioHCIDriver.h"
 #include "hci_api.h"
@ -98,7 +97,7 @@ buf_pool_desc_t CordioHCIDriver::get_default_buffer_pool_description()

 void CordioHCIDriver::set_random_static_address(const ble::address_t& address)
 {
-    ble_error_t err = BLEInstanceBase::deviceInstance().getGap().setRandomStaticAddress(address);
+    ble_error_t err = BLE::Instance().gap().setRandomStaticAddress(address);
    MBED_ASSERT(err == BLE_ERROR_NONE);
 }

--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/BLEInstanceBaseImpl.h
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/include/ble/internal/BLEInstanceBaseImpl.h
@ -21,7 +21,7 @@

 #include "ble/BLE.h"
 #include "ble/common/ble/blecommon.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"

 #include "CordioHCIDriver.h"
 #include "ble/GattServer.h"
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/BLEInstanceBaseImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/BLEInstanceBaseImpl.cpp
@ -41,7 +41,7 @@
 #include "ble/internal/PalSecurityManager.h"
 #include "ble/internal/PalGap.h"
 #include "ble/internal/PalSigningMonitor.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"
 #include "CordioHCIDriver.h"
 #include "source/generic/GattServerImpl.h"

--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalAttClientImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalAttClientImpl.cpp
@ -21,7 +21,7 @@
 #include "ble/internal/PalSimpleAttServerMessage.h"
 #include "ble/internal/PalGap.h"
 #include "ble/internal/PalGattClient.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"

 #include "att_api.h"
 #include "att_defs.h"
--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalEventQueueImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalEventQueueImpl.cpp
@ -17,7 +17,7 @@
 */

 #include "ble/internal/PalEventQueue.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"

 namespace ble {

--- a/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSigningMonitorImpl.cpp
+++ b/connectivity/FEATURE_BLE/libraries/TARGET_CORDIO/source/PalSigningMonitorImpl.cpp
@ -17,7 +17,7 @@
 */

 #include "ble/internal/PalSigningMonitor.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"

 namespace ble {

--- a/connectivity/FEATURE_BLE/source/BLE.cpp
+++ b/connectivity/FEATURE_BLE/source/BLE.cpp
@ -18,7 +18,7 @@

 #include <stdio.h>
 #include "platform/mbed_critical.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "BLEInstanceBase.h"

 #if defined(TARGET_OTA_ENABLED)
 #include "services/DFUService.h"
@ -28,7 +28,7 @@
 #include <mbed_toolchain.h>

 #include "ble/BLE.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "BLEInstanceBase.h"

 static const char *error_strings[] = {
    "BLE_ERROR_NONE: No error",
--- a/connectivity/FEATURE_BLE/include/ble/internal/BLEInstanceBase.h
+++ b/connectivity/FEATURE_BLE/include/ble/internal/BLEInstanceBase.h
--- a/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/GapImpl.cpp
@ -21,7 +21,7 @@

 #include "GapImpl.h"
 #include "ble/Gap.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"
 #include "ble/Gap.h"
 #include "ble/SecurityManager.h"
 #include "ble/internal/PalGap.h"
--- a/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/GattClientImpl.cpp
@ -28,7 +28,7 @@
 #include "ble/common/ble/DiscoveredService.h"
 #include "ble/common/ble/DiscoveredCharacteristic.h"
 #include "ble/common/ble/blecommon.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"
 #include "ble/SecurityManager.h"
 #include <algorithm>

--- a/connectivity/FEATURE_BLE/source/generic/GattServerImpl.cpp
+++ b/connectivity/FEATURE_BLE/source/generic/GattServerImpl.cpp
@ -19,7 +19,7 @@
 #include "BLERoles.h"
 #include <algorithm>
 #include "GattServerImpl.h"
-#include "ble/internal/BLEInstanceBase.h"
+#include "source/BLEInstanceBase.h"
 #include "wsf_types.h"
 #include "att_api.h"

--- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/BlueNrgMsHCIDriver.cpp
+++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_BlueNRG_MS/BlueNrgMsHCIDriver.cpp
@ -27,7 +27,6 @@
 #include "platform/mbed_wait_api.h"

 // FEATURE_BLE/targets/TARGET_CORDIO
-#include "BLEInstanceBase.h"
 #include "CordioHCIDriver.h"
 #include "CordioHCITransportDriver.h"
 #include "hci_api.h"
--- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/HCIDriver.cpp
+++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/HCIDriver.cpp
@ -16,7 +16,6 @@
 */

 #include <stdio.h>
-#include "BLEInstanceBase.h"
 #include "CordioHCIDriver.h"
 #include "hci_api.h"
 #include "hci_cmd.h"
--- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_PSOC6/cy_bt_cordio_cfg.cpp
+++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_PSOC6/cy_bt_cordio_cfg.cpp
@ -24,7 +24,6 @@
 *******************************************************************************/

 #include <stdio.h>
-#include "BLEInstanceBase.h"
 #include "CordioHCIDriver.h"
 #include "hci_api.h"
 #include "hci_cmd.h"
--- a/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp
+++ b/connectivity/drivers/ble/FEATURE_BLE/TARGET_STM32WB/HCIDriver.cpp
@ -18,7 +18,6 @@

 #include <stdio.h>
 #include "ble/common/ble/blecommon.h"
-#include "BLEInstanceBase.h"
 #include "CordioHCIDriver.h"
 #include "CordioHCITransportDriver.h"
 #include "mbed.h"