Skip to content

Rename shcrs to shcsr in scb::RegisterBlock #97

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 1 commit into from
Mar 12, 2019

Conversation

rajivr
Copy link
Contributor

@rajivr rajivr commented Jul 13, 2018

Commit c290aa4e introduced shcrs field to scb::RegisterBlock.

In CMSIS, this field is shcsr.

https://github.com/ARM-software/CMSIS_5/blob/5.3.0/CMSIS/Core/Include/core_cm4.h#L449

This patch changes shcrs to shcsr.

Signed-off-by: Rajiv Ranganath [email protected]

Commit `c290aa4e` introduced `shcrs` field to `scb::RegisterBlock`. 

In CMSIS, this field is `shcsr`.

https://github.com/ARM-software/CMSIS_5/blob/5.3.0/CMSIS/Core/Include/core_cm4.h#L449

This patch changes `shcrs` to `shcsr`.

Signed-off-by: Rajiv Ranganath <[email protected]>
@gkelly
Copy link
Contributor

gkelly commented Jul 27, 2018

It looks like it's a typo in the top-level SCB description of the Cortex-M4 docs. The details page properly calls is SHCSR. The Cortex-M3 docs don't have the same issue. Good catch.

@japaric japaric modified the milestones: RC1, v0.6.0 Aug 3, 2018
Copy link
Member

@japaric japaric left a comment

Choose a reason for hiding this comment

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

Thanks for the PR @rajivr. This LGTM but as it is a breaking change we'll hold off merging it until we are ready for the next major release.

@adamgreig adamgreig mentioned this pull request Jan 28, 2019
@Disasm Disasm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-bors Currently approved, waiting to merge. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 20, 2019
@adamgreig
Copy link
Member

Merging in preparation of releasing 0.6.0.

bors r+

bors bot added a commit that referenced this pull request Mar 12, 2019
97: Rename `shcrs` to `shcsr` in `scb::RegisterBlock` r=adamgreig a=rajivr

Commit `c290aa4e` introduced `shcrs` field to `scb::RegisterBlock`. 

In CMSIS, this field is `shcsr`.

https://github.com/ARM-software/CMSIS_5/blob/5.3.0/CMSIS/Core/Include/core_cm4.h#L449

This patch changes `shcrs` to `shcsr`.

Signed-off-by: Rajiv Ranganath <[email protected]>

106: Stir register and debugger check r=adamgreig a=thenewwazoo

Adds support for requesting an interrupt via the STIR register and checking whether a debugger is attached.

127: Cortex M0(+) DWT fixes r=adamgreig a=korken89

The current DWT setup has a lot of registers that are not available in Cortex-M0(+), fixes are added here.



Co-authored-by: Rajiv Ranganath <[email protected]>
Co-authored-by: Brandon Matthews <[email protected]>
Co-authored-by: Brandon Matthews <[email protected]>
Co-authored-by: Emil Fresk <[email protected]>
@bors
Copy link
Contributor

bors bot commented Mar 12, 2019

Build failed (retrying...)

bors bot added a commit that referenced this pull request Mar 12, 2019
97: Rename `shcrs` to `shcsr` in `scb::RegisterBlock` r=adamgreig a=rajivr

Commit `c290aa4e` introduced `shcrs` field to `scb::RegisterBlock`. 

In CMSIS, this field is `shcsr`.

https://github.com/ARM-software/CMSIS_5/blob/5.3.0/CMSIS/Core/Include/core_cm4.h#L449

This patch changes `shcrs` to `shcsr`.

Signed-off-by: Rajiv Ranganath <[email protected]>

Co-authored-by: Rajiv Ranganath <[email protected]>
@bors
Copy link
Contributor

bors bot commented Mar 12, 2019

Build succeeded

@bors bors bot merged commit 733e6d6 into rust-embedded:master Mar 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Currently approved, waiting to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants