Toyomasa Watarai / nRF51822

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   nrf51-sdk

Fork of nRF51822 by Nordic Semiconductor

Diff: btle/btle_discovery.cpp

Revision:
240:75b69581d1dd
Parent:
239:693a1f145b5a
Child:
242:73fc02cc20b1
diff -r 693a1f145b5a -r 75b69581d1dd btle/btle_discovery.cpp
--- a/btle/btle_discovery.cpp	Fri Jun 19 15:55:21 2015 +0100
+++ b/btle/btle_discovery.cpp	Fri Jun 19 15:55:21 2015 +0100
@@ -5,12 +5,6 @@
 #include "btle_discovery.h"
 #include "ble_err.h"
 
-ServiceDiscovery *ServiceDiscovery::getSingleton(void) {
-    static ServiceDiscovery discoverySingleton;
-
-    return &discoverySingleton;
-}
-
 ble_error_t
 ServiceDiscovery::launch(Gap::Handle_t connectionHandle, ServiceCallback_t sc, CharacteristicCallback_t cc)
 {
@@ -62,7 +56,7 @@
 }
 
 void
-ServiceDiscovery::setupDiscoveredServices(const ble_gattc_evt_prim_srvc_disc_rsp_t *response)
+NordicServiceDiscovery::setupDiscoveredServices(const ble_gattc_evt_prim_srvc_disc_rsp_t *response)
 {
     currSrvInd = 0;
     srvCount   = response->count;
@@ -80,7 +74,7 @@
 }
 
 void
-ServiceDiscovery::setupDiscoveredCharacteristics(const ble_gattc_evt_char_disc_rsp_t *response)
+NordicServiceDiscovery::setupDiscoveredCharacteristics(const ble_gattc_evt_char_disc_rsp_t *response)
 {
     currCharInd = 0;
     charCount   = response->count;