nordic
Fork of nRF51822 by
Diff: source/nRF5xServiceDiscovery.h
- Revision:
- 572:bbf6410b6a89
- Parent:
- 571:f162898cb6c4
- Child:
- 576:7023a8204a1b
diff -r f162898cb6c4 -r bbf6410b6a89 source/nRF5xServiceDiscovery.h --- a/source/nRF5xServiceDiscovery.h Mon Jan 11 10:19:21 2016 +0000 +++ b/source/nRF5xServiceDiscovery.h Mon Jan 11 10:19:22 2016 +0000 @@ -99,34 +99,6 @@ onTerminationCallback = callback; } - /** - * @brief Clear nRF5xServiceDiscovery's state. - * - * @return - * BLE_ERROR_NONE if successful. - */ - virtual ble_error_t reset(void) { - /* Clear all state that is from the parent, including private members */ - if (ServiceDiscovery::reset() != BLE_ERROR_NONE) { - return BLE_ERROR_INVALID_STATE; - } - - /* Clear derived class members */ - serviceIndex = 0; - numServices = 0; - characteristicIndex = 0; - numCharacteristics = 0; - - state = INACTIVE; - - serviceUUIDDiscoveryQueue.reset(); - charUUIDDiscoveryQueue.reset(); - - onTerminationCallback = NULL; - - return BLE_ERROR_NONE; - } - private: ble_error_t launchCharacteristicDiscovery(Gap::Handle_t connectionHandle, Gap::Handle_t startHandle, Gap::Handle_t endHandle);