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

add default services first

pull/10302/head
paul-szczepanek-arm 2019-04-03 12:14:06 +01:00
parent 0066ba9b0d
commit 20d6cd9cc5
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: private:
void add_default_services();
static uint16_t compute_attributes_count(GattService& service); static uint16_t compute_attributes_count(GattService& service);
void insert_service_attribute( void insert_service_attribute(
@ -280,6 +282,8 @@ private:
uint16_t currentHandle; uint16_t currentHandle;
bool default_services_added;
private: private:
GattServer(); GattServer();

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

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