BLE: Add address type in AdvertisementCallbackParams_t.

Author: pan-

features/FEATURE_BLE/ble/Gap.h

@@ -237,7 +237,7 @@ class GapAdvertisingData;
  *    // Initiate the connection procedure
  *    gap.connect(
  *       packet->peerAddr,
- *       BLEProtocol::RANDOM_STATIC,
+ *       packet->addressType,
  *       &connection_parameters,
  *       &scanning_params
  *    );
@@ -608,6 +608,11 @@ class Gap {
          * Pointer to the advertisement packet's data.
          */
         const uint8_t *advertisingData;
+
+        /**
+         * Type of the address received
+         */
+        AddressType_t addressType;
     };
 
     /**
@@ -2349,7 +2354,8 @@ class Gap {
         bool isScanResponse,
         GapAdvertisingParams::AdvertisingType_t type,
         uint8_t advertisingDataLen,
-        const uint8_t *advertisingData
+        const uint8_t *advertisingData,
+        BLEProtocol::AddressType_t addressType
     ) {
         AdvertisementCallbackParams_t params;
         memcpy(params.peerAddr, peerAddr, ADDR_LEN);
@@ -2358,6 +2364,7 @@ class Gap {
         params.type = type;
         params.advertisingDataLen = advertisingDataLen;
         params.advertisingData = advertisingData;
+        params.addressType = addressType;
         onAdvertisementReport.call(&params);
     }
 

features/FEATURE_BLE/source/generic/GenericGap.cpp

@@ -972,7 +972,8 @@ void GenericGap::on_advertising_report(const pal::GapAdvertisingReportEvent& e)
             advertising.type == pal::received_advertising_type_t::SCAN_RESPONSE,
             (GapAdvertisingParams::AdvertisingType_t) advertising.type.value(),
             advertising.data.size(),
-            advertising.data.data()
+            advertising.data.data(),
+            (BLEProtocol::AddressType_t) advertising.address_type.value()
         );
     }
 }

features/FEATURE_BLE/targets/TARGET_ARM_SSG/TARGET_BEETLE/source/ArmBLE.cpp

@@ -332,7 +332,8 @@ static void armHandler(wsfEventMask_t event, wsfMsgHdr_t *pMsg)
                                                                         (scan->scanReport.eventType == DM_ADV_SCAN_RESPONSE) ? true : false,
                                                                         (GapAdvertisingParams::AdvertisingType_t)scan->scanReport.eventType,
                                                                         scan->scanReport.len,
-                                                                        scan->scanReport.pData);
+                                                                        scan->scanReport.pData,
+                                                                        (BLEProtocol::AddressType_t) scan->scanReport.addrType);
                 }
                 break;
             case DM_CONN_OPEN_IND:

features/FEATURE_BLE/targets/TARGET_Maxim/MaximBLE.cpp

@@ -168,7 +168,8 @@ static void maximHandler(wsfEventMask_t event, wsfMsgHdr_t *pMsg)
                                                                         (scanReport->eventType == DM_ADV_SCAN_RESPONSE) ? true : false,
                                                                         (GapAdvertisingParams::AdvertisingType_t)scanReport->eventType,
                                                                         scanReport->len,
-                                                                        scanReport->pData);
+                                                                        scanReport->pData,
+                                                                        (BLEProtocol::AddressType_t) scan->scanReport.addrType);
                 }
                 break;
             case DM_CONN_OPEN_IND:
@@ -281,7 +282,7 @@ ble_error_t MaximBLE::init(BLE::InstanceID_t instanceID, FunctionPointerWithCont
     DmRegister(DmCback);
     DmConnRegister(DM_CLIENT_ID_APP, DmCback);
     AttConnRegister(AppServerConnCback);
-    
+
     /* Reset the device */
     reset_complete = 0;
     DmDevReset();

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/source/btle/btle.cpp

@@ -220,7 +220,8 @@ static void btle_handler(ble_evt_t *p_ble_evt)
                                            advReport->scan_rsp,
                                            static_cast<GapAdvertisingParams::AdvertisingType_t>(advReport->type),
                                            advReport->dlen,
-                                           advReport->data);
+                                           advReport->data,
+                                           static_cast<BLEProtocol::AddressType_t>(advReport->peer_addr.addr_type));
             break;
         }
 

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle.cpp

@@ -287,7 +287,8 @@ static void btle_handler(ble_evt_t *p_ble_evt)
                                            advReport->scan_rsp,
                                            static_cast<GapAdvertisingParams::AdvertisingType_t>(advReport->type),
                                            advReport->dlen,
-                                           advReport->data);
+                                           advReport->data,
+                                           static_cast<BLEProtocol::AddressType_t>(advReport->peer_addr.addr_type));
             break;
         }