shunpei kataoka / 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 Shuta Nakamae

Files at this revision

API Documentation at this revision

Revision 622:5b9728d28fdc, committed 2016-04-08

Comitter:
vcoubard
Date:
Fri Apr 08 11:05:56 2016 +0100
Parent:
621:1d79da5c393e
Child:
623:0caf9fde8607
Commit message:
Synchronized with git rev 3427ed2d
Author: Vincent Coubard
Merge pull request #113 from ARMmbed/master

Sync develop against master

Changed in this revision

source/nRF5xGap.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/source/nRF5xGap.cpp	Fri Apr 08 11:05:55 2016 +0100
+++ b/source/nRF5xGap.cpp	Fri Apr 08 11:05:56 2016 +0100
@@ -681,7 +681,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;
         }
@@ -898,7 +898,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])) {