Skip to content

fix #if in hardware/structs/dma.h #9

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 2 commits into from
Jan 27, 2021
Merged

fix #if in hardware/structs/dma.h #9

merged 2 commits into from
Jan 27, 2021

Conversation

majbthrd
Copy link
Contributor

I suspect the user's intent was to use "PARAM_ASSERTIONS_ENABLED_DMA" (default setting generated on lines 17-18).

Copy link
Contributor

@kilograham kilograham left a comment

Choose a reason for hiding this comment

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

it is correct as is (as that is a macro that checks PARAM_ASSERTIONS_ENABLED_DMA amongst other stuff)

@lurch
Copy link
Contributor

lurch commented Jan 24, 2021

@majbthrd
Copy link
Contributor Author

In that case, let me suggest a different approach. I’ve updated the PR to move these inline functions from:

./src/rp2040/hardware_structs/include/hardware/structs/dma.h

which is a register definition include file where they seem out of place to:

./src/rp2_common/hardware_dma/include/hardware/dma.h

where they are right are home with the DMA driver code that uses them.

@kilograham kilograham changed the base branch from master to develop January 25, 2021 18:50
Copy link
Contributor

@kilograham kilograham left a comment

Choose a reason for hiding this comment

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

Yes this is really where they belong, thanks

Not 100% sure why they were there to begin with - perhaps historical. Worth checking it doesn't break compilation of pico-examples, pico-extras, pico-playground (we're currently working on getting our CI re-setup after our move of everything to public github)

@kilograham kilograham merged commit 78190a5 into raspberrypi:develop Jan 27, 2021
@majbthrd majbthrd deleted the fix_dma_h branch January 29, 2021 14:43
kilograham pushed a commit that referenced this pull request Feb 1, 2021
* fix #if in hardware/structs/dma.h

* move dma driver code from register definitions to dma drivers

Co-authored-by: Peter Lawrence <12226419+majbthrd@users.noreply.github.com>
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.

3 participants