ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BLE: Fix address type allowed to create a periodic sync.

pull/8998/head
Vincent Coubard 2018-12-07 00:04:29 +00:00
parent df95a1f8bd
commit 698447b622
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
features/FEATURE_BLE/source/generic/GenericGap.cpp
View File

@ -2921,7 +2921,7 @@ ble_error_t GenericGap::createSync(
return BLE_ERROR_NOT_IMPLEMENTED; return BLE_ERROR_NOT_IMPLEMENTED;
} }
if (peerAddressType != peer_address_type_t::PUBLIC || if (peerAddressType != peer_address_type_t::PUBLIC &&
peerAddressType != peer_address_type_t::RANDOM peerAddressType != peer_address_type_t::RANDOM
) { ) {
return BLE_ERROR_INVALID_PARAM; return BLE_ERROR_INVALID_PARAM;

10
features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalGap.cpp
View File

@ -14,6 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
#include <stdio.h>
#include "CordioPalGap.h" #include "CordioPalGap.h"
#include "hci_api.h" #include "hci_api.h"
#include "dm_api.h" #include "dm_api.h"
@ -484,12 +485,14 @@ void Gap::gap_handler(const wsfMsgHdr_t *msg)
break; break;
case DM_PER_ADV_REPORT_IND: { case DM_PER_ADV_REPORT_IND: {
printf("DM_PER_ADV_REPORT_IND\r\n");
if (!handler) { if (!handler) {
break; break;
} }
const hciLePerAdvReportEvt_t *evt = (const hciLePerAdvReportEvt_t *) msg; const hciLePerAdvReportEvt_t *evt = (const hciLePerAdvReportEvt_t *) msg;
printf("preparing for generic gap\r\n");
handler->on_periodic_advertising_report( handler->on_periodic_advertising_report(
evt->syncHandle, evt->syncHandle,
evt->txPower, evt->txPower,
@ -779,7 +782,7 @@ ble_error_t Gap::set_extended_advertising_parameters(
DmAdvConfig( DmAdvConfig(
advertising_handle, advertising_handle,
adv_type, adv_type,
peer_address_type.value(), peer_address_type.value(),
const_cast<uint8_t *>(peer_address.data()) const_cast<uint8_t *>(peer_address.data())
); );
@ -838,7 +841,7 @@ ble_error_t Gap::set_periodic_advertising_data(
{ {
DmPerAdvSetData( DmPerAdvSetData(
advertising_handle, advertising_handle,
fragment_description.value(), HCI_ADV_DATA_OP_COMP_FRAG,
advertising_data_size, advertising_data_size,
const_cast<uint8_t *>(advertising_data) const_cast<uint8_t *>(advertising_data)
); );
@ -981,12 +984,11 @@ ble_error_t Gap::extended_scan_enable(
if (enable) { if (enable) {
uint32_t duration_ms = duration * 10; uint32_t duration_ms = duration * 10;
DmScanModeExt();
DmScanStart( DmScanStart(
scanning_phys.value(), scanning_phys.value(),
DM_DISC_MODE_NONE, DM_DISC_MODE_NONE,
extended_scan_type, extended_scan_type,
filter_duplicates.value(), // TODO: cordio API incomplete ??? filter_duplicates.value(),
duration_ms > 0xFFFF ? 0xFFFF : duration_ms, duration_ms > 0xFFFF ? 0xFFFF : duration_ms,
period period
); );