Revision 621:3ff30bef1afc, committed 2016-04-08

Comitter:

LancasterUniversity

Date:

Fri Apr 08 00:26:29 2016 +0100

Parent:

619:24d3dc3f0796

Child:

622:b84f72a53341

Commit message:

Synchronized with git rev c5ce428d
Author: Vincent Coubard
Fix access to enum member

Changed in this revision

--- a/source/nRF5xGap.cpp	Thu Apr 07 00:51:57 2016 +0000
+++ b/source/nRF5xGap.cpp	Fri Apr 08 00:26:29 2016 +0100
@@ -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])) {