Oscar Ariza / nRF51822

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 616:1751e2e2637a, committed 2016-01-12

Comitter:
vcoubard
Date:
Tue Jan 12 19:58:03 2016 +0000
Parent:
615:cf574a4ebbcc
Commit message:
Synchronized with git rev 78b4ea55
Author: Vincent Coubard
Merge pull request #106 from ARMmbed/develop

merge version

Changed in this revision

source/nRF5xGap.cpp Show annotated file Show diff for this revision Revisions of this file 
diff -r cf574a4ebbcc -r 1751e2e2637a source/nRF5xGap.cpp
--- a/source/nRF5xGap.cpp	Tue Jan 12 19:58:02 2016 +0000
+++ b/source/nRF5xGap.cpp	Tue Jan 12 19:58:03 2016 +0000
@@ -686,7 +686,7 @@
 
     /* Test for invalid parameters before we change the internal state */
     for (uint8_t i = 0; i < whitelistIn.size; ++i) {
-        if (whitelistIn.addresses[i].type == BLEProtocol::AddressType_t::RANDOM_PRIVATE_NON_RESOLVABLE) {
+        if (whitelistIn.addresses[i].type == BLEProtocol::AddressType::RANDOM_PRIVATE_NON_RESOLVABLE) {
             /* This is not allowed because it is completely meaningless */
             return BLE_ERROR_INVALID_PARAM;
         }
@@ -903,7 +903,7 @@
     whitelist.irk_count  = 0;
     whitelist.addr_count = 0;
     for (uint8_t i = 0; i < whitelistAddressesSize; ++i) {
-        if (whitelistAddresses[i].addr_type == BLEProtocol::AddressType_t::RANDOM_PRIVATE_RESOLVABLE) {
+        if (whitelistAddresses[i].addr_type == BLEProtocol::AddressType::RANDOM_PRIVATE_RESOLVABLE) {
             /* Test if there is a matching IRK for this private resolvable address */
             for (uint8_t j = 0; j < whitelistFromBondTable.irk_count; ++j) {
                 if (securityManager.matchAddressAndIrk(&whitelistAddresses[i], whitelistFromBondTable.pp_irks[j])) {