Merge pull request #5313 from pan-/ble-cordio-pal-gap

Cordio: Pal Gap implementation

Author: cmonr

features/FEATURE_BLE/ble/generic/GenericGap.h

@@ -282,7 +282,6 @@ class GenericGap : public ::Gap {
     pal::Gap &_pal_gap;
     pal::GenericAccessService &_gap_service;
     BLEProtocol::AddressType_t _address_type;
-    pal::address_t _address;
     pal::initiator_policy_t _initiator_policy_mode;
     pal::scanning_filter_policy_t _scanning_filter_policy;
     pal::advertising_filter_policy_t _advertising_filter_policy;

features/FEATURE_BLE/source/generic/GenericGap.cpp

@@ -376,7 +376,6 @@ GenericGap::GenericGap(
     _pal_gap(pal_gap),
     _gap_service(generic_access_service),
     _address_type(BLEProtocol::AddressType::PUBLIC),
-    _address(),
     _initiator_policy_mode(pal::initiator_policy_t::NO_FILTER),
     _scanning_filter_policy(pal::scanning_filter_policy_t::NO_FILTER),
     _advertising_filter_policy(pal::advertising_filter_policy_t::NO_FILTER),
@@ -416,7 +415,6 @@ ble_error_t GenericGap::setAddress(
             }
 
             _address_type = type;
-            _address = pal::address_t(address, true);
             return BLE_ERROR_NONE;
         }
 
@@ -439,7 +437,14 @@ ble_error_t GenericGap::getAddress(
     BLEProtocol::AddressBytes_t address
 ) {
     *type = _address_type;
-    memcpy(address, _address.data(), _address.size());
+    pal::address_t address_value;
+    if (_address_type == BLEProtocol::AddressType::PUBLIC) {
+        address_value = _pal_gap.get_device_address();
+    } else {
+        address_value = _pal_gap.get_random_address();
+    }
+
+    memcpy(address, address_value.data(), address_value.size());
     return BLE_ERROR_NONE;
 }
 
@@ -990,14 +995,20 @@ void GenericGap::on_connection_complete(const pal::GapConnectionCompleteEvent& e
             e.connection_latency,
             e.supervision_timeout
         };
+        pal::address_t address;
+        if (_address_type == BLEProtocol::AddressType::PUBLIC) {
+            address = _pal_gap.get_device_address();
+        } else {
+            address = _pal_gap.get_random_address();
+        }
 
         processConnectionEvent(
             e.connection_handle,
             e.role.value() == e.role.MASTER ? ::Gap::CENTRAL : ::Gap::PERIPHERAL,
             (BLEProtocol::AddressType_t) e.peer_address_type.value(),
             e.peer_address.data(),
             _address_type,
-            _address.data(),
+            address.data(),
             &connection_params
         );
     } else {

features/FEATURE_BLE/targets/TARGET_CORDIO/CordioBLE.h

@@ -22,12 +22,15 @@
 #include "ble/BLEInstanceBase.h"
 
 #include "CordioHCIDriver.h"
-#include "CordioGap.h"
 #include "CordioGattServer.h"
 #include "CordioSecurityManager.h"
 #include "CordioPalAttClient.h"
 #include "ble/pal/AttClientToGattClientAdapter.h"
 #include "ble/generic/GenericGattClient.h"
+#include "CordioPalGap.h"
+#include "CordioPalGenericAccessService.h"
+#include "ble/generic/GenericGap.h"
+#include "ble/pal/SimpleEventQueue.h"
 
 namespace ble {
 namespace vendor {
@@ -81,12 +84,12 @@ class BLE : public ::BLEInstanceBase {
     /**
      * @see BLEInstanceBase::getGap
      */
-    virtual Gap& getGap();
+    virtual ::Gap& getGap();
 
     /**
      * @see BLEInstanceBase::getGap
      */
-    virtual const Gap& getGap() const;
+    virtual const ::Gap& getGap() const;
 
     /**
      * @see BLEInstanceBase::getGattServer
@@ -143,6 +146,7 @@ class BLE : public ::BLEInstanceBase {
     } initialization_status;
 
     ::BLE::InstanceID_t instanceID;
+    mutable pal::SimpleEventQueue _event_queue;
 };
 
 } // namespace cordio