Diff: source/DiscoveredCharacteristic.cpp

Revision:

992:ca834f7ae8ed

Parent:

990:53ac0ac3aa39

Child:

993:4d62b7967c11

diff -r c6c50b28ccd2 -r ca834f7ae8ed source/DiscoveredCharacteristic.cpp
--- a/source/DiscoveredCharacteristic.cpp	Thu Nov 26 14:51:22 2015 +0000
+++ b/source/DiscoveredCharacteristic.cpp	Wed Dec 02 10:29:44 2015 +0000
@@ -31,52 +31,6 @@
     return gattc->read(connHandle, valueHandle, offset);
 }
 
-struct OneShotReadCallback { 
-    static void launch(GattClient* client, Gap::Handle_t connHandle, 
-                       GattAttribute::Handle_t handle, const GattClient::ReadCallback_t& cb) { 
-        OneShotReadCallback* oneShot = new OneShotReadCallback(client, connHandle, handle, cb);
-        oneShot->attach();
-        // delete will be made when this callback is called
-    }
-
-private:
-    OneShotReadCallback(GattClient* client, Gap::Handle_t connHandle, 
-                        GattAttribute::Handle_t handle, const GattClient::ReadCallback_t& cb) : 
-        _client(client),
-        _connHandle(connHandle),
-        _handle(handle), 
-        _callback(cb) { } 
-
-    void attach() { 
-        _client->onDataRead(makeFunctionPointer(this, &OneShotReadCallback::call));
-    }
-
-    void call(const GattReadCallbackParams* params) {
-        // verifiy that it is the right characteristic on the right connection
-        if (params->connHandle == _connHandle && params->handle == _handle) { 
-            _callback(params);
-            _client->onDataRead().detach(makeFunctionPointer(this, &OneShotReadCallback::call));
-            delete this;
-        }
-    }
-
-    GattClient* _client;
-    Gap::Handle_t _connHandle;
-    GattAttribute::Handle_t _handle;
-    GattClient::ReadCallback_t _callback;
-};
-
-ble_error_t DiscoveredCharacteristic::read(uint16_t offset, const GattClient::ReadCallback_t& onRead) const {
-    ble_error_t error = read(offset);
-    if (error) { 
-        return error;
-    }
-
-    OneShotReadCallback::launch(gattc, connHandle, valueHandle, onRead);
-
-    return error;
-}
-
 ble_error_t
 DiscoveredCharacteristic::write(uint16_t length, const uint8_t *value) const
 {
@@ -105,52 +59,6 @@
     return gattc->write(GattClient::GATT_OP_WRITE_CMD, connHandle, valueHandle, length, value);
 }
 
-struct OneShotWriteCallback { 
-    static void launch(GattClient* client, Gap::Handle_t connHandle, 
-                       GattAttribute::Handle_t handle, const GattClient::WriteCallback_t& cb) { 
-        OneShotWriteCallback* oneShot = new OneShotWriteCallback(client, connHandle, handle, cb);
-        oneShot->attach();
-        // delete will be made when this callback is called
-    }
-
-private:
-    OneShotWriteCallback(GattClient* client, Gap::Handle_t connHandle, 
-                        GattAttribute::Handle_t handle, const GattClient::WriteCallback_t& cb) : 
-        _client(client),
-        _connHandle(connHandle),
-        _handle(handle), 
-        _callback(cb) { } 
-
-    void attach() { 
-        _client->onDataWritten(makeFunctionPointer(this, &OneShotWriteCallback::call));
-    }
-
-    void call(const GattWriteCallbackParams* params) {
-        // verifiy that it is the right characteristic on the right connection
-        if (params->connHandle == _connHandle && params->handle == _handle) { 
-            _callback(params);
-            _client->onDataWritten().detach(makeFunctionPointer(this, &OneShotWriteCallback::call));
-            delete this;
-        }
-    }
-
-    GattClient* _client;
-    Gap::Handle_t _connHandle;
-    GattAttribute::Handle_t _handle;
-    GattClient::WriteCallback_t _callback;
-};
-
-ble_error_t DiscoveredCharacteristic::write(uint16_t length, const uint8_t *value, const GattClient::WriteCallback_t& onRead) const {
-    ble_error_t error = write(length, value);
-    if (error) { 
-        return error;
-    }
-
-    OneShotWriteCallback::launch(gattc, connHandle, valueHandle, onRead);
-
-    return error;
-}
-
 ble_error_t
 DiscoveredCharacteristic::discoverDescriptors(DescriptorCallback_t callback, const UUID &matchingUUID) const
 {