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

modules: hal: nordic: Define NRFX_ASSERT as __ASSERT_NO_MSG #22869

Closed

Conversation

anangl
Copy link
Member

@anangl anangl commented Feb 17, 2020

Update hal_nordic's revision, so that NRFX_ASSERT uses __ASSERT_NO_MSG
directly, not through the assert macro that comes from from libc,
as the definition of the latter might be different when some specific
libc version is used, and this could generate troubles.

Replace also uses of assert() with __ASSERT_NO_MSG() in nrfx driver
shims that use this macro without including the corresponding header
file (i.e. that implicitly rely on assert.h being included from
nrfx_glue.h, which is no longer the case).

Signed-off-by: Andrzej Głąbek andrzej.glabek@nordicsemi.no


zephyrproject-rtos/hal_nordic#24 needs to be merged first.

Fixes #22541

@anangl anangl added Enhancement Changes/Updates/Additions to existing features platform: nRF Nordic nRFx labels Feb 17, 2020
@anangl anangl added area: Modules Blocked Blocked by another PR or issue DNM This PR should not be merged (Do Not Merge) labels Feb 17, 2020
@anangl anangl force-pushed the correct_nrfx_asssert branch from 3431c7b to 682eb71 Compare February 17, 2020 10:58
@anangl anangl requested a review from tbursztyka as a code owner February 17, 2020 10:58
@anangl anangl removed the request for review from tbursztyka February 17, 2020 10:58
@anangl anangl force-pushed the correct_nrfx_asssert branch from 682eb71 to e8d8690 Compare February 17, 2020 10:59
@zephyrbot zephyrbot added area: PWM Pulse Width Modulation area: I2C area: SPI SPI bus labels Feb 17, 2020
@anangl anangl force-pushed the correct_nrfx_asssert branch from e8d8690 to 1f8226d Compare February 18, 2020 06:29
@anangl
Copy link
Member Author

anangl commented Feb 18, 2020

Updated hal_nordic's SHA.

@anangl anangl removed Blocked Blocked by another PR or issue DNM This PR should not be merged (Do Not Merge) labels Feb 18, 2020
Update hal_nordic's revision, so that NRFX_ASSERT uses __ASSERT_NO_MSG
directly, not through the assert macro that comes from from libc,
as the definition of the latter might be different when some specific
libc version is used, and this could generate troubles.

Replace also uses of assert() with __ASSERT_NO_MSG() in nrfx driver
shims that use this macro without including the corresponding header
file (i.e. that implicitly rely on assert.h being included from
nrfx_glue.h, which is no longer the case).

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
@anangl anangl force-pushed the correct_nrfx_asssert branch from 1f8226d to e75953e Compare February 27, 2020 10:57
@anangl
Copy link
Member Author

anangl commented Feb 27, 2020

Rebased on master.

@anangl
Copy link
Member Author

anangl commented Mar 10, 2020

Closing this one, as the changes it brings are included in #23125.

@anangl anangl closed this Mar 10, 2020
@anangl anangl deleted the correct_nrfx_asssert branch March 11, 2020 07:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: I2C area: Modules area: PWM Pulse Width Modulation area: SPI SPI bus Enhancement Changes/Updates/Additions to existing features platform: nRF Nordic nRFx
Projects
None yet
Development

Successfully merging this pull request may close these issues.

hal_nordic: nrf_glue.h change mapped assert function
4 participants