Merge pull request #14111 from paul-szczepanek-arm/ble-fix-ext

BLE: fix scanning/advertising when extended features are available but disabled on host
pull/14100/head
Martin Kojtal 2021-01-05 13:28:13 +00:00 committed by GitHub
commit e1d1753726
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions

View File

@ -1209,7 +1209,11 @@ ble_error_t PalGap::periodic_advertising_enable(
uint16_t PalGap::get_maximum_advertising_data_length() uint16_t PalGap::get_maximum_advertising_data_length()
{ {
#if BLE_FEATURE_EXTENDED_ADVERTISING
return HciGetMaxAdvDataLen(); return HciGetMaxAdvDataLen();
#else
return HCI_ADV_DATA_LEN;
#endif // BLE_FEATURE_EXTENDED_ADVERTISING
} }

View File

@ -326,8 +326,10 @@ void NRFCordioHCIDriver::do_terminate()
void NRFCordioHCIDriver::start_reset_sequence() void NRFCordioHCIDriver::start_reset_sequence()
{ {
#if BLE_FEATURE_EXTENDED_ADVERTISING
// Make sure extended adv is init // Make sure extended adv is init
DmExtAdvInit(); DmExtAdvInit();
#endif // BLE_FEATURE_EXTENDED_ADVERTISING
CordioHCIDriver::start_reset_sequence(); CordioHCIDriver::start_reset_sequence();
} }