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.

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

mynewt: fix assert #1494

Merged
merged 1 commit into from May 12, 2023
Merged

mynewt: fix assert #1494

merged 1 commit into from May 12, 2023

Conversation

bvdberg
Copy link
Contributor

@bvdberg bvdberg commented May 8, 2023

The assert only works on MyNewt since the ev field does not exist in other versions of ble_npl_event

Copy link
Contributor

@sjanc sjanc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

commit title should be "nimble/ll: Fix ports build"

otherwise looks ok to me

@bvdberg bvdberg force-pushed the fix_assert branch 2 times, most recently from 8094aba to b2008f3 Compare May 9, 2023 07:04
@bvdberg
Copy link
Contributor Author

bvdberg commented May 11, 2023

renamed commit

Copy link
Contributor

@sjanc sjanc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, there is ble_npl_event_is_queued() which should be used instead

@bvdberg
Copy link
Contributor Author

bvdberg commented May 11, 2023

does that also work on MyNewt?
so
BLE_LL_ASSERT(!ble_npl_event_is_queued(&sm->sync_ev_end));
or put in #else of #if MYNEWT
?

@sjanc
Copy link
Contributor

sjanc commented May 11, 2023

yes, it does work so no need for #ifdef

The assert only works on MyNewt
@bvdberg
Copy link
Contributor Author

bvdberg commented May 12, 2023

changed so your suggestion

@andrzej-kaczmarek andrzej-kaczmarek merged commit 46fdbee into apache:master May 12, 2023
8 checks passed
@bvdberg bvdberg deleted the fix_assert branch May 15, 2023 08:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants