Diff: source/nRF5xGap.h

Revision:

604:0f5c8725146c

Parent:

600:0978b5626451

Child:

615:65ea2acfc6a2

diff -r b1616eaf8206 -r 0f5c8725146c source/nRF5xGap.h
--- a/source/nRF5xGap.h	Mon Jan 11 10:19:37 2016 +0000
+++ b/source/nRF5xGap.h	Mon Jan 11 10:19:38 2016 +0000
@@ -133,11 +133,6 @@
     /* Internal representation of a whitelist */
     uint8_t         whitelistAddressesSize;
     ble_gap_addr_t  whitelistAddresses[YOTTA_CFG_WHITELIST_MAX_SIZE];
-    ble_gap_addr_t *whitelistAddressPtrs[YOTTA_CFG_WHITELIST_MAX_SIZE];
-    ble_gap_irk_t  *whitelistIrkPtrs[YOTTA_CFG_IRK_TABLE_MAX_SIZE];
-
-    /* Structure used by the SoftDevice to represent a whitelist together with IRK table */
-    ble_gap_whitelist_t whitelist;
 
     /*
      * An internal function used to populate the ble_gap_whitelist_t that will be used by
@@ -145,7 +140,7 @@
      * API the whitelist is just a collection of keys, but for the stack it also includes
      * the IRK table.
      */
-    ble_error_t generateStackWhitelist(void);
+    ble_error_t generateStackWhitelist(ble_gap_whitelist_t &whitelist);
 
 private:
     bool    radioNotificationCallbackParam; /* parameter to be passed into the Timeout-generated radio notification callback. */
@@ -239,15 +234,9 @@
 
     nRF5xGap() :
         advertisingPolicyMode(Gap::ADV_POLICY_IGNORE_WHITELIST),
-        scanningPolicyMode(Gap::SCAN_POLICY_IGNORE_WHITELIST) {
+        scanningPolicyMode(Gap::SCAN_POLICY_IGNORE_WHITELIST),
+        whitelistAddressesSize(0) {
         m_connectionHandle = BLE_CONN_HANDLE_INVALID;
-
-        /* Reset the whitelist */
-        whitelist.addr_count   = 0;
-        whitelist.irk_count    = 0;
-        whitelist.pp_irks      = whitelistIrkPtrs;
-        whitelist.pp_addrs     = whitelistAddressPtrs;
-        whitelistAddressesSize = 0;
     }
 
     nRF5xGap(nRF5xGap const &);