extend
Fork of BLE_API by
Diff: source/BLE.cpp
- Revision:
- 860:0d41e4eb3d0a
- Parent:
- 858:38a4963a455e
- Child:
- 861:2afa79e3ed0a
--- a/source/BLE.cpp Mon Nov 02 09:09:07 2015 +0000 +++ b/source/BLE.cpp Mon Nov 02 09:09:07 2015 +0000 @@ -15,16 +15,15 @@ */ #include "ble/BLE.h" -#include "ble/BLEInstanceBase.h" #if defined(TARGET_OTA_ENABLED) #include "ble/services/DFUService.h" #endif ble_error_t -BLE::init(BLE::InitializationCompleteCallback_t callback) +BLE::init() { - ble_error_t err = transport->init(instanceID, callback); + ble_error_t err = transport->init(); if (err != BLE_ERROR_NONE) { return err; } @@ -106,7 +105,7 @@ return badSingleton; } -BLE::BLE(InstanceID_t instanceIDIn) : instanceID(instanceIDIn), transport() +BLE::BLE(InstanceID_t instanceID) : transport() { static BLEInstanceBase *transportInstances[NUM_INSTANCES]; @@ -118,113 +117,4 @@ } else { transport = NULL; } -} - -bool BLE::hasInitialized(void) const -{ - if (!transport) { - error("bad handle to underlying transport"); - } - - return transport->hasInitialized(); -} - -ble_error_t BLE::shutdown(void) -{ - clearAdvertisingPayload(); - if (!transport) { - error("bad handle to underlying transport"); - } - - return transport->shutdown(); -} - -const char *BLE::getVersion(void) -{ - if (!transport) { - error("bad handle to underlying transport"); - } - - return transport->getVersion(); -} - -const Gap &BLE::gap() const -{ - if (!transport) { - error("bad handle to underlying transport"); - } - - return transport->getGap(); -} - -Gap &BLE::gap() -{ - if (!transport) { - error("bad handle to underlying transport"); - } - - return transport->getGap(); -} - -const GattServer& BLE::gattServer() const -{ - if (!transport) { - error("bad handle to underlying transport"); - } - - return transport->getGattServer(); -} - -GattServer& BLE::gattServer() -{ - if (!transport) { - error("bad handle to underlying transport"); - } - - return transport->getGattServer(); -} - -const GattClient& BLE::gattClient() const -{ - if (!transport) { - error("bad handle to underlying transport"); - } - - return transport->getGattClient(); -} - -GattClient& BLE::gattClient() -{ - if (!transport) { - error("bad handle to underlying transport"); - } - - return transport->getGattClient(); -} - -const SecurityManager& BLE::securityManager() const -{ - if (!transport) { - error("bad handle to underlying transport"); - } - - return transport->getSecurityManager(); -} - -SecurityManager& BLE::securityManager() -{ - if (!transport) { - error("bad handle to underlying transport"); - } - - return transport->getSecurityManager(); -} - -void BLE::waitForEvent(void) -{ - if (!transport) { - error("bad handle to underlying transport"); - } - - transport->waitForEvent(); } \ No newline at end of file