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

Merge pull request #96 from andresag01/fix_shutdown 

Fix shutdown of Gap instance to avoid NULL refs
master
Vincent Coubard 2015-12-22 17:03:37 +00:00
parent bb283199db 22082c54ae
commit b8ed9fdbf7
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/nRF5xn.cpp
View File

@ -53,8 +53,7 @@ nRF5xn& nRF5xn::Instance(BLE::InstanceID_t instanceId)
nRF5xn::nRF5xn(void) :
initialized(false),
instanceID(BLE::DEFAULT_INSTANCE),
_gapInstance(),
gapInstance(NULL),
gapInstance(),
gattServerInstance(NULL),
gattClientInstance(NULL),
securityManagerInstance(NULL)
@ -194,7 +193,7 @@ ble_error_t nRF5xn::shutdown(void)
#endif
/* Gap instance is always present */
error = gapInstance->reset();
error = gapInstance.reset();
if (error != BLE_ERROR_NONE) {
return error;
}

20
source/nRF5xn.h
View File

@ -53,10 +53,7 @@ public:
* statically.
*/
virtual Gap &getGap() {
if (gapInstance == NULL) {
gapInstance = &_gapInstance;
}
return *gapInstance;
return gapInstance;
};
/**
@ -116,10 +113,7 @@ public:
* internal pointer has been declared mutable.
*/
virtual const Gap &getGap() const {
if (gapInstance == NULL) {
gapInstance = &_gapInstance;
}
return *gapInstance;
return gapInstance;
};
/**
@ -166,15 +160,11 @@ private:
BLE::InstanceID_t instanceID;
private:
mutable nRF5xGap _gapInstance; /**< Gap instance whose reference is returned from a call to
* getGap(). Unlike the GattClient, GattServer and
* SecurityManager, Gap is always needed in a BLE application. */
mutable nRF5xGap gapInstance; /**< Gap instance whose reference is returned from a call to
* getGap(). Unlike the GattClient, GattServer and
* SecurityManager, Gap is always needed in a BLE application. */
private:
mutable nRF5xGap *gapInstance; /**< Pointer to the Gap object instance.
* If NULL, then Gap has not been initialized.
* The pointer has been declared as 'mutable' so that
* it can be assigned inside a 'const' function. */
mutable nRF5xGattServer *gattServerInstance; /**< Pointer to the GattServer object instance.
* If NULL, then GattServer has not been initialized.
* The pointer has been declared as 'mutable' so that