porting: fix npl to allow NimBLE version bump in RIOT #1249
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
haukepetersen
force-pushed
the
fix_npl_riot
branch
from
643ff77 to
6f77746
Compare
|
Style check summaryOur coding style is here!porting/nimble/include/os/os_mbuf.h@@ -133,7 +133,7 @@
/** Get a packet header pointer given an mbuf pointer */
#define OS_MBUF_PKTHDR(__om) ((struct os_mbuf_pkthdr *)(uintptr_t) \
- (void *)((uint8_t *)&(__om)->om_data + sizeof(struct os_mbuf)))
+ (void *)((uint8_t *)&(__om)->om_data + sizeof(struct os_mbuf)))
/** Given a mbuf packet header pointer, return a pointer to the mbuf */
#define OS_MBUF_PKTHDR_TO_MBUF(__hdr) \ |
sjanc
approved these changes
May 16, 2022
|
I assume CI will be fixed once RIOT PR goes in too? |
|
I guess so, should be building again as soon as the version in RIOT is updated with RIOT-OS/RIOT#18029 |
haukepetersen
force-pushed
the
fix_npl_riot
branch
from
6f77746 to
07112fb
Compare
|
rebased and tried again to fix the style issue pointed out by the style check... Will squash once the style check is happy :-) |
haukepetersen
force-pushed
the
fix_npl_riot
branch
from
07112fb to
8fd7345
Compare
|
squashed, will merge as soon as we have RIOT-OS/RIOT#18029 sorted out - shouldn't be long... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is a collection of small fixes to NimBLEs porting layer to allow bumping the NimBLE version in RIOT to the newest NimBLE master.
The main changes are composed of:
nimble_port.cby adapting to the changes in the transport structurehal_system.h, as this file is required by the NimBLE controller nownrf52_clock_x()functions inble_phy.calso for the RIOT portos_mbuf.hdirectly (instead of needing to patch the file in RIOT, which we did so far)