From 6df7846bbb5bb8a5682d1513a6e74b398d20298e Mon Sep 17 00:00:00 2001 From: Vincent Coubard Date: Mon, 24 Aug 2020 15:51:06 +0100 Subject: [PATCH] BLE: Remove cordio namespace --- .../source/cordio/include/ble/internal/PalAttClientImpl.h | 4 ++-- .../FEATURE_BLE/source/cordio/source/BLEInstanceBaseImpl.cpp | 4 ++-- .../FEATURE_BLE/source/cordio/source/PalAttClientImpl.cpp | 4 ++-- .../source/cordio/source/PalSecurityManagerImpl.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/connectivity/FEATURE_BLE/source/cordio/include/ble/internal/PalAttClientImpl.h b/connectivity/FEATURE_BLE/source/cordio/include/ble/internal/PalAttClientImpl.h index eaf6b43f00..5f1ae5d29c 100644 --- a/connectivity/FEATURE_BLE/source/cordio/include/ble/internal/PalAttClientImpl.h +++ b/connectivity/FEATURE_BLE/source/cordio/include/ble/internal/PalAttClientImpl.h @@ -24,7 +24,7 @@ #include "source/pal/PalAttClient.h" namespace ble { -namespace cordio { +namespace impl { class PalAttClient final : public ble::PalAttClient { @@ -474,7 +474,7 @@ private: mbed::Callback _transaction_timeout_cb; }; -} // namespace cordio +} // namespace impl } // namespace ble #endif /* IMPL_PAL_ATT_CLIENT_ */ diff --git a/connectivity/FEATURE_BLE/source/cordio/source/BLEInstanceBaseImpl.cpp b/connectivity/FEATURE_BLE/source/cordio/source/BLEInstanceBaseImpl.cpp index ff7de0f9d3..82c98bb1ea 100644 --- a/connectivity/FEATURE_BLE/source/cordio/source/BLEInstanceBaseImpl.cpp +++ b/connectivity/FEATURE_BLE/source/cordio/source/BLEInstanceBaseImpl.cpp @@ -257,7 +257,7 @@ ble::GattClient &BLEInstanceBase::getGattClient() PalGattClient &BLEInstanceBase::getPalGattClient() { - static PalAttClientToGattClient pal_gatt_client(cordio::PalAttClient::get_client()); + static PalAttClientToGattClient pal_gatt_client(impl::PalAttClient::get_client()); return pal_gatt_client; } @@ -598,7 +598,7 @@ void BLEInstanceBase::stack_setup() #if BLE_FEATURE_ATT #if BLE_FEATURE_GATT_CLIENT - AttRegister((attCback_t) cordio::PalAttClient::att_client_handler); + AttRegister((attCback_t) impl::PalAttClient::att_client_handler); #else AttRegister((attCback_t) ble::GattServer::att_cb); #endif // BLE_FEATURE_GATT_CLIENT diff --git a/connectivity/FEATURE_BLE/source/cordio/source/PalAttClientImpl.cpp b/connectivity/FEATURE_BLE/source/cordio/source/PalAttClientImpl.cpp index bf5ce62521..a1e4ca1f58 100644 --- a/connectivity/FEATURE_BLE/source/cordio/source/PalAttClientImpl.cpp +++ b/connectivity/FEATURE_BLE/source/cordio/source/PalAttClientImpl.cpp @@ -27,7 +27,7 @@ #include "att_defs.h" namespace ble { -namespace cordio { +namespace impl { PalAttClient::PalAttClient() : _local_sign_counter(0) { @@ -451,5 +451,5 @@ void PalAttClient::att_client_handler(const attEvt_t *event) #endif // BLE_FEATURE_GATT_SERVER } -} // namespace cordio +} // namespace impl } // ble diff --git a/connectivity/FEATURE_BLE/source/cordio/source/PalSecurityManagerImpl.cpp b/connectivity/FEATURE_BLE/source/cordio/source/PalSecurityManagerImpl.cpp index 2000114771..59aa223af1 100644 --- a/connectivity/FEATURE_BLE/source/cordio/source/PalSecurityManagerImpl.cpp +++ b/connectivity/FEATURE_BLE/source/cordio/source/PalSecurityManagerImpl.cpp @@ -364,7 +364,7 @@ ble_error_t PalSecurityManager::set_csrk( _csrk = csrk; DmSecSetLocalCsrk(_csrk.data()); // extra set the sign counter used by the client - cordio::PalAttClient::get_client().set_sign_counter(sign_counter); + impl::PalAttClient::get_client().set_sign_counter(sign_counter); return BLE_ERROR_NONE; }