chengkai15 commented on PR #3977:
URL: https://github.com/apache/nuttx-apps/pull/3977#issuecomment-6907258390

   Rebased both PRs onto the latest master (apps cf52652, nuttx d9b891b2be), as 
requested in apache/nuttx#21479.
   
   One change was needed in the porting layer. apache/nuttx@2ca5d1c142 
("include/atomic: add atomic_ptr_t type and operations") adds `atomic_ptr_t` 
and the `atomic_ptr_*()` macros to `<nuttx/atomic.h>`. Zephyr also defines 
`atomic_ptr_t` (`typedef void *atomic_ptr_t` in `zephyr/sys/atomic_types.h`) 
and functions with the same names, so zblue no longer compiled.
   
   `port/include/zblue_prefix.h` already handles `atomic_t` and `atomic64_t` 
this way; `atomic_ptr_t` now gets the same treatment:
   
   - `atomic_ptr_t` is renamed to `nx_atomic_ptr_t` while `<nuttx/atomic.h>` is 
included;
   - the `atomic_ptr_*()` macros are removed afterwards.
   
   With a NuttX tree that predates 2ca5d1c142 the change has no effect. The fix 
is squashed into the first commit ("Add Zephyr kernel porting layer"); the 
other five commits are unchanged.
   
   Verified: `checkpatch.sh -g` on both PRs; clean builds of `sim:zblue` with 
Make and CMake.
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to