Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Telink] Fix crash during boot on latest Zephyr #26163

Merged
merged 1 commit into from
Apr 20, 2023
Merged

[Telink] Fix crash during boot on latest Zephyr #26163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions src/platform/telink/BLEManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,17 +273,6 @@ inline CHIP_ERROR BLEManagerImpl::PrepareAdvertisingRequest(void)
mAdvertisingRequest.advertisingData = Span<bt_data>(advertisingData);
mAdvertisingRequest.scanResponseData = nameSize ? Span<bt_data>(scanResponseData) : Span<bt_data>{};

mAdvertisingRequest.onStarted = [](int rc) {
if (rc == 0)
{
ChipLogProgress(DeviceLayer, "CHIPoBLE advertising started");
}
else
{
ChipLogError(DeviceLayer, "Failed to start CHIPoBLE advertising: %d", rc);
}
};

return CHIP_NO_ERROR;
}

Expand Down Expand Up @@ -339,7 +328,13 @@ CHIP_ERROR BLEManagerImpl::StartAdvertising(void)
#endif

// Request advertising
ReturnErrorOnFailure(BLEAdvertisingArbiter::InsertRequest(mAdvertisingRequest));
ReturnErrorOnFailure(System::MapErrorZephyr(bt_le_adv_stop()));
const bt_le_adv_param params = BT_LE_ADV_PARAM_INIT(mAdvertisingRequest.options, mAdvertisingRequest.minInterval,
mAdvertisingRequest.maxInterval, nullptr);
ReturnErrorOnFailure(System::MapErrorZephyr(
bt_le_adv_start(&params, mAdvertisingRequest.advertisingData.data(), mAdvertisingRequest.advertisingData.size(),
mAdvertisingRequest.scanResponseData.data(), mAdvertisingRequest.scanResponseData.size())));
ChipLogProgress(DeviceLayer, "CHIPoBLE advertising started");

// Transition to the Advertising state...
if (!mFlags.Has(Flags::kAdvertising))
Expand Down Expand Up @@ -375,7 +370,7 @@ CHIP_ERROR BLEManagerImpl::StopAdvertising(void)
return CHIP_ERROR_INCORRECT_STATE;
}

BLEAdvertisingArbiter::CancelRequest(mAdvertisingRequest);
ReturnErrorOnFailure(System::MapErrorZephyr(bt_le_adv_stop()));

// Transition to the not Advertising state...
if (mFlags.Has(Flags::kAdvertising))
Expand Down