Revision 301:59e7404a4ea3, committed 2015-06-19

Comitter:

rgrover1

Date:

Fri Jun 19 15:55:29 2015 +0100

Parent:

300:fcc5bbc48739

Child:

302:507e99065379

Commit message:

Synchronized with git rev ecb6f20d
Author: Rohit Grover
rename to parentDiscoveryObject.

Changed in this revision

--- a/btle/btle_discovery.cpp	Fri Jun 19 15:55:28 2015 +0100
+++ b/btle/btle_discovery.cpp	Fri Jun 19 15:55:29 2015 +0100
@@ -110,7 +110,7 @@
 NordicServiceDiscovery::ServiceIndicesNeedingUUIDDiscovery::triggerFirst(void)
 {
     while (numIndices) { /* loop until a call to char_value_by_uuid_read() succeeds or we run out of pending indices. */
-        parentContainer->state = DISCOVER_SERVICE_UUIDS;
+        parentDiscoveryObject->state = DISCOVER_SERVICE_UUIDS;
 
         unsigned serviceIndex = getFirst();
         ble_uuid_t uuid = {
@@ -118,10 +118,10 @@
             .type = BLE_UUID_TYPE_BLE,
         };
         ble_gattc_handle_range_t handleRange = {
-            .start_handle = parentContainer->services[serviceIndex].getStartHandle(),
-            .end_handle   = parentContainer->services[serviceIndex].getEndHandle(),
+            .start_handle = parentDiscoveryObject->services[serviceIndex].getStartHandle(),
+            .end_handle   = parentDiscoveryObject->services[serviceIndex].getEndHandle(),
         };
-        if (sd_ble_gattc_char_value_by_uuid_read(parentContainer->connHandle, &uuid, &handleRange) == NRF_SUCCESS) {
+        if (sd_ble_gattc_char_value_by_uuid_read(parentDiscoveryObject->connHandle, &uuid, &handleRange) == NRF_SUCCESS) {
             return;
         }
 
@@ -131,8 +131,8 @@
     }
 
     /* Switch back to service discovery upon exhausting the service-indices pending UUID discovery. */
-    if (parentContainer->state == DISCOVER_SERVICE_UUIDS) {
-        parentContainer->state = SERVICE_DISCOVERY_ACTIVE;
+    if (parentDiscoveryObject->state == DISCOVER_SERVICE_UUIDS) {
+        parentDiscoveryObject->state = SERVICE_DISCOVERY_ACTIVE;
     }
 }
 

--- a/btle/btle_discovery.h	Fri Jun 19 15:55:28 2015 +0100
+++ b/btle/btle_discovery.h	Fri Jun 19 15:55:29 2015 +0100
@@ -117,7 +117,7 @@
         ServiceIndicesNeedingUUIDDiscovery(NordicServiceDiscovery *parent) :
             numIndices(0),
             serviceIndices(),
-            parentContainer(parent) {
+            parentDiscoveryObject(parent) {
             /* empty */
         }
 
@@ -160,7 +160,7 @@
         size_t numIndices;
         int    serviceIndices[BLE_DB_DISCOVERY_MAX_SRV];
 
-        NordicServiceDiscovery *parentContainer;
+        NordicServiceDiscovery *parentDiscoveryObject;
     };
     friend class ServiceIndicesNeedingUUIDDiscovery;