From 529af2b0f44df7ec39ba5ae1b3eeee408519a5fc Mon Sep 17 00:00:00 2001 From: Senthil Ramakrishnan Date: Fri, 17 Aug 2018 23:13:59 -0500 Subject: [PATCH] Changes to error code names --- features/FEATURE_BLE/source/BLE.cpp | 28 ++++++++++++++-------------- platform/mbed_error.h | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/features/FEATURE_BLE/source/BLE.cpp b/features/FEATURE_BLE/source/BLE.cpp index 6d7d214c62..e6212e0e9c 100644 --- a/features/FEATURE_BLE/source/BLE.cpp +++ b/features/FEATURE_BLE/source/BLE.cpp @@ -141,7 +141,7 @@ BLE::initImplementation(FunctionPointerWithContexthasInitialized(); @@ -200,7 +200,7 @@ bool BLE::hasInitialized(void) const ble_error_t BLE::shutdown(void) { if (!transport) { - MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BAD_TRANSPORT_HANDLE), "bad handle to underlying transport"); + MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BACKEND_NOT_INITIALIZED), "bad handle to underlying transport"); } event_signaled = false; @@ -210,7 +210,7 @@ ble_error_t BLE::shutdown(void) const char *BLE::getVersion(void) { if (!transport) { - MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BAD_TRANSPORT_HANDLE), "bad handle to underlying transport"); + MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BACKEND_NOT_INITIALIZED), "bad handle to underlying transport"); } return transport->getVersion(); @@ -219,7 +219,7 @@ const char *BLE::getVersion(void) const Gap &BLE::gap() const { if (!transport) { - MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BAD_TRANSPORT_HANDLE), "bad handle to underlying transport"); + MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BACKEND_NOT_INITIALIZED), "bad handle to underlying transport"); } return transport->getGap(); @@ -228,7 +228,7 @@ const Gap &BLE::gap() const Gap &BLE::gap() { if (!transport) { - MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BAD_TRANSPORT_HANDLE), "bad handle to underlying transport"); + MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BACKEND_NOT_INITIALIZED), "bad handle to underlying transport"); } return transport->getGap(); @@ -237,7 +237,7 @@ Gap &BLE::gap() const GattServer& BLE::gattServer() const { if (!transport) { - MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BAD_TRANSPORT_HANDLE), "bad handle to underlying transport"); + MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BACKEND_NOT_INITIALIZED), "bad handle to underlying transport"); } return transport->getGattServer(); @@ -246,7 +246,7 @@ const GattServer& BLE::gattServer() const GattServer& BLE::gattServer() { if (!transport) { - MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BAD_TRANSPORT_HANDLE), "bad handle to underlying transport"); + MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BACKEND_NOT_INITIALIZED), "bad handle to underlying transport"); } return transport->getGattServer(); @@ -255,7 +255,7 @@ GattServer& BLE::gattServer() const GattClient& BLE::gattClient() const { if (!transport) { - MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BAD_TRANSPORT_HANDLE), "bad handle to underlying transport"); + MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BACKEND_NOT_INITIALIZED), "bad handle to underlying transport"); } return transport->getGattClient(); @@ -264,7 +264,7 @@ const GattClient& BLE::gattClient() const GattClient& BLE::gattClient() { if (!transport) { - MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BAD_TRANSPORT_HANDLE), "bad handle to underlying transport"); + MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BACKEND_NOT_INITIALIZED), "bad handle to underlying transport"); } return transport->getGattClient(); @@ -273,7 +273,7 @@ GattClient& BLE::gattClient() const SecurityManager& BLE::securityManager() const { if (!transport) { - MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BAD_TRANSPORT_HANDLE), "bad handle to underlying transport"); + MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BACKEND_NOT_INITIALIZED), "bad handle to underlying transport"); } return transport->getSecurityManager(); @@ -282,7 +282,7 @@ const SecurityManager& BLE::securityManager() const SecurityManager& BLE::securityManager() { if (!transport) { - MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BAD_TRANSPORT_HANDLE), "bad handle to underlying transport"); + MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BACKEND_NOT_INITIALIZED), "bad handle to underlying transport"); } return transport->getSecurityManager(); @@ -291,7 +291,7 @@ SecurityManager& BLE::securityManager() void BLE::waitForEvent(void) { if (!transport) { - MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BAD_TRANSPORT_HANDLE), "bad handle to underlying transport"); + MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BACKEND_NOT_INITIALIZED), "bad handle to underlying transport"); } transport->waitForEvent(); @@ -304,7 +304,7 @@ void BLE::processEvents() } if (!transport) { - MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BAD_TRANSPORT_HANDLE), "bad handle to underlying transport"); + MBED_ERROR(MBED_MAKE_ERROR(MBED_MODULE_BLE, MBED_ERROR_CODE_BLE_BACKEND_NOT_INITIALIZED), "bad handle to underlying transport"); } event_signaled = false; diff --git a/platform/mbed_error.h b/platform/mbed_error.h index ed9b2ad733..18d02d62e8 100644 --- a/platform/mbed_error.h +++ b/platform/mbed_error.h @@ -778,8 +778,8 @@ typedef enum _mbed_error_code { MBED_DEFINE_SYSTEM_ERROR(BUSFAULT_EXCEPTION, 63), /* 319 BusFault exception */ MBED_DEFINE_SYSTEM_ERROR(USAGEFAULT_EXCEPTION, 64), /* 320 UsageFault exception*/ MBED_DEFINE_SYSTEM_ERROR(BLE_NO_FRAME_INITIALIZED, 65), /* 321 BLE No frame initialized */ - MBED_DEFINE_SYSTEM_ERROR(BLE_NOT_IMPLEMENTED, 66), /* 322 BLE Not implemented */ - MBED_DEFINE_SYSTEM_ERROR(BLE_BAD_TRANSPORT_HANDLE, 67), /* 323 BLE Bad transport handle */ + MBED_DEFINE_SYSTEM_ERROR(BLE_BACKEND_CREATION_FAILED, 66), /* 322 BLE Backend creation failed */ + MBED_DEFINE_SYSTEM_ERROR(BLE_BACKEND_NOT_INITIALIZED, 67), /* 323 BLE Backend not initialized */ //Everytime you add a new system error code, you must update //Error documentation under Handbook to capture the info on