ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #10302 from paul-szczepanek-arm/fix-service-order 

BLE: force mandatory services to have lowest handles
pull/10317/head
Martin Kojtal 2019-04-04 10:23:30 +02:00 committed by GitHub
parent d1da622797 20d6cd9cc5
commit 46dc15e2cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/FEATURE_BLE/targets/TARGET_CORDIO/CordioGattServer.h
View File

@ -185,6 +185,8 @@ public:
private:
void add_default_services();
static uint16_t compute_attributes_count(GattService& service);
void insert_service_attribute(
@ -280,6 +282,8 @@ private:
uint16_t currentHandle;
bool default_services_added;
private:
GattServer();

16
features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioGattServer.cpp
View File

@ -71,12 +71,21 @@ void GattServer::initialize()
#if BLE_FEATURE_SECURITY
AttsAuthorRegister(atts_auth_cb);
#endif
add_generic_access_service();
add_generic_attribute_service();
add_default_services();
}
void GattServer::add_default_services()
{
if (!default_services_added) {
default_services_added = true;
add_generic_access_service();
add_generic_attribute_service();
}
}
ble_error_t GattServer::addService_(GattService &service)
{
add_default_services();
// create and fill the service structure
internal_service_t *att_service = new internal_service_t;
att_service->attGroup.pNext = NULL;
@ -1344,7 +1353,8 @@ GattServer::GattServer() :
generic_attribute_service(),
registered_service(NULL),
allocated_blocks(NULL),
currentHandle(0)
currentHandle(0),
default_services_added(false)
{
}