Skip to content

nordic: Clean up nrfx inclusions #19304

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

Merged
merged 3 commits into from
Sep 24, 2019

Conversation

anangl
Copy link
Member

@anangl anangl commented Sep 20, 2019

A set of commits intended to clean up inclusions of nrfx files.

nordic: Use hal/ in all inclusions of nrfx HAL header files

Header files of nrfx HALs are not supposed to be included directly
but only with their names prepended with the hal/ directory (so that
an inclusion of an nrfx HAL header clearly differs from an inclusion
of an nrfx driver header).

soc: nordic: Include <nrfx.h> instead of <nrf.h> from <soc.h>

This change is done so that there is no need to additionaly include
<nrfx.h> before <soc/nrfx_coredep.h> (what might be a bit surprising)
and so that <nrfx_config.h> doesn't need to be include separately for
nRF SoCs requiring a special mapping of peripheral accessing symbols.

This commit removes also no longer needed inclusions and updates
the hal_nordic module with required minor correction of nrfx_glue.h.

soc: nordic: Get rid of nrf_common.h

This file contains redundant definitions of a bunch of nRF IRQ numbers
(not all, however) that only generates confusion, as enumeration values
provided by MDK can be used instead.


Requires zephyrproject-rtos/hal_nordic#5 to go in first.

@anangl anangl added Blocked Blocked by another PR or issue DNM This PR should not be merged (Do Not Merge) labels Sep 20, 2019
@anangl
Copy link
Member Author

anangl commented Sep 23, 2019

Removed no longer existing directory include from soc/arm/nordic_nrf/CMakeLists.txt.

@ioannisg ioannisg self-assigned this Sep 23, 2019
@anangl anangl force-pushed the clean_up_nrfx_inclusions branch from e15cfc3 to d2f5217 Compare September 23, 2019 09:04
@anangl
Copy link
Member Author

anangl commented Sep 23, 2019

Updated west.yml with the proper revision of the hal_nordic module as zephyrproject-rtos/hal_nordic#5 has been merged.

@anangl anangl removed Blocked Blocked by another PR or issue DNM This PR should not be merged (Do Not Merge) labels Sep 23, 2019
Copy link
Member

@ioannisg ioannisg left a comment

Choose a reason for hiding this comment

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

This seems to lead to build errors, now, possibly due to #17189 being merged, so it needs at least a rebase

Header files of nrfx HALs are not supposed to be included directly
but only with their names prepended with the hal/ directory (so that
an inclusion of an nrfx HAL header clearly differs from an inclusion
of an nrfx driver header).

Signed-off-by: Andrzej Głąbek <[email protected]>
@anangl anangl force-pushed the clean_up_nrfx_inclusions branch from d2f5217 to c1abc59 Compare September 24, 2019 07:54
@anangl
Copy link
Member Author

anangl commented Sep 24, 2019

This seems to lead to build errors, now, possibly due to #17189 being merged, so it needs at least a rebase

Rebased.

@anangl anangl force-pushed the clean_up_nrfx_inclusions branch from c1abc59 to c5a3716 Compare September 24, 2019 10:04
@anangl anangl added Blocked Blocked by another PR or issue DNM This PR should not be merged (Do Not Merge) labels Sep 24, 2019
@anangl
Copy link
Member Author

anangl commented Sep 24, 2019

Blocked by zephyrproject-rtos/hal_nordic#7 which contains the fix for failing builds.

This change is done so that there is no need to additionaly include
<nrfx.h> before <soc/nrfx_coredep.h> (what might be a bit surprising)
and so that <nrfx_config.h> doesn't need to be include separately for
nRF SoCs requiring a special mapping of peripheral accessing symbols.

This commit removes also no longer needed inclusions and updates
the hal_nordic module with required minor correction of nrfx_glue.h.

Signed-off-by: Andrzej Głąbek <[email protected]>
This file contains redundant definitions of a bunch of nRF IRQ numbers
(not all, however) that only generates confusion, as enumeration values
provided by MDK can be used instead.

Signed-off-by: Andrzej Głąbek <[email protected]>
@anangl anangl force-pushed the clean_up_nrfx_inclusions branch from c5a3716 to eb3fcd5 Compare September 24, 2019 12:32
@anangl anangl removed Blocked Blocked by another PR or issue DNM This PR should not be merged (Do Not Merge) labels Sep 24, 2019
@anangl
Copy link
Member Author

anangl commented Sep 24, 2019

Updated west.yml as zephyrproject-rtos/hal_nordic#7 got merged.

@ioannisg ioannisg added this to the v2.1.0 milestone Sep 24, 2019
@ioannisg ioannisg merged commit 3575437 into zephyrproject-rtos:master Sep 24, 2019
@anangl anangl deleted the clean_up_nrfx_inclusions branch September 24, 2019 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: API Changes to public APIs area: Bluetooth area: Boards area: Modules area: Samples Samples area: Sensors Sensors area: Timer Timer Enhancement Changes/Updates/Additions to existing features platform: nRF Nordic nRFx
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants