Schoumi
/
nrf51822
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename to ServiceUUIDDiscoveryQueue

master
Rohit Grover 2015-05-27 10:17:23 +01:00
parent 9c2636cf5c
commit 30b9f534cd
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
btle/btle_discovery.cpp
View File

@ -107,7 +107,7 @@ NordicServiceDiscovery::launchCharacteristicDiscovery(Gap::Handle_t connectionHa
}
void
NordicServiceDiscovery::ServiceIndicesNeedingUUIDDiscovery::triggerFirst(void)
NordicServiceDiscovery::ServiceUUIDDiscoveryQueue::triggerFirst(void)
{
while (numIndices) { /* loop until a call to char_value_by_uuid_read() succeeds or we run out of pending indices. */
parentDiscoveryObject->state = DISCOVER_SERVICE_UUIDS;
@ -152,10 +152,10 @@ NordicServiceDiscovery::processDiscoverUUIDResponse(const ble_gattc_evt_char_val
uuid[i] = response->handle_value[0].p_value[UUID::LENGTH_OF_LONG_UUID - 1 - i];
}
unsigned serviceIndex = serviceIndicesNeedingUUIDDiscovery.dequeue();
unsigned serviceIndex = serviceUUIDDiscoveryQueue.dequeue();
services[serviceIndex].setupLongUUID(uuid);
serviceIndicesNeedingUUIDDiscovery.triggerFirst();
serviceUUIDDiscoveryQueue.triggerFirst();
}
}
}
@ -171,10 +171,10 @@ NordicServiceDiscovery::setupDiscoveredServices(const ble_gattc_evt_prim_srvc_di
numServices = BLE_DB_DISCOVERY_MAX_SRV;
}
serviceIndicesNeedingUUIDDiscovery.reset();
serviceUUIDDiscoveryQueue.reset();
for (unsigned serviceIndex = 0; serviceIndex < numServices; serviceIndex++) {
if (response->services[serviceIndex].uuid.type == BLE_UUID_TYPE_UNKNOWN) {
serviceIndicesNeedingUUIDDiscovery.enqueue(serviceIndex);
serviceUUIDDiscoveryQueue.enqueue(serviceIndex);
services[serviceIndex].setup(response->services[serviceIndex].handle_range.start_handle,
response->services[serviceIndex].handle_range.end_handle);
} else {
@ -185,8 +185,8 @@ NordicServiceDiscovery::setupDiscoveredServices(const ble_gattc_evt_prim_srvc_di
}
/* Trigger discovery of service UUID if necessary. */
if (serviceIndicesNeedingUUIDDiscovery.getCount()) {
serviceIndicesNeedingUUIDDiscovery.triggerFirst();
if (serviceUUIDDiscoveryQueue.getCount()) {
serviceUUIDDiscoveryQueue.triggerFirst();
}
}

10
btle/btle_discovery.h
View File

@ -40,7 +40,7 @@ public:
state(INACTIVE),
services(),
characteristics(),
serviceIndicesNeedingUUIDDiscovery(this),
serviceUUIDDiscoveryQueue(this),
onTerminationCallback(NULL) {
/* empty */
}
@ -112,9 +112,9 @@ private:
* A datatype to contain service-indices for which long UUIDs need to be
* discovered using read_val_by_uuid().
*/
class ServiceIndicesNeedingUUIDDiscovery {
class ServiceUUIDDiscoveryQueue {
public:
ServiceIndicesNeedingUUIDDiscovery(NordicServiceDiscovery *parent) :
ServiceUUIDDiscoveryQueue(NordicServiceDiscovery *parent) :
numIndices(0),
serviceIndices(),
parentDiscoveryObject(parent) {
@ -165,7 +165,7 @@ private:
NordicServiceDiscovery *parentDiscoveryObject;
};
friend class ServiceIndicesNeedingUUIDDiscovery;
friend class ServiceUUIDDiscoveryQueue;
private:
friend void bleGattcEventHandler(const ble_evt_t *p_ble_evt);
@ -189,7 +189,7 @@ private:
* This is intended for internal use during service discovery. */
DiscoveredCharacteristic characteristics[BLE_DB_DISCOVERY_MAX_CHAR_PER_SRV];
ServiceIndicesNeedingUUIDDiscovery serviceIndicesNeedingUUIDDiscovery;
ServiceUUIDDiscoveryQueue serviceUUIDDiscoveryQueue;
TerminationCallback_t onTerminationCallback;
};