diff options
| author |  bors[bot] <bors[bot]@users.noreply.github.com>
| 2019-03-12 21:01:45 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com>
| 2019-03-12 21:01:45 +0000 |
| commit | ac5f677f575847c428767ee553fbd0289794262d (patch) | |
| tree | 1853765dd538b42ae168fa056fca2e1a17898383 /src | |
| parent | 04ee333b63e10d1471e4c4c07c523b8ab111577b (diff) | |
| parent | 733e6d6f1bbd99346d74f8d23310065335f4f04c (diff) | |
| download | cortex-m-ac5f677f575847c428767ee553fbd0289794262d.tar.gz cortex-m-ac5f677f575847c428767ee553fbd0289794262d.tar.zst cortex-m-ac5f677f575847c428767ee553fbd0289794262d.zip | |
Merge #97
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 <rajiv.ranganath@gmail.com>
Co-authored-by: Rajiv Ranganath <rajiv.ranganath@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/peripheral/scb.rs | 2 | ||||
| -rw-r--r-- | src/peripheral/test.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/peripheral/scb.rs b/src/peripheral/scb.rs index 4bf9270..c82e098 100644 --- a/src/peripheral/scb.rs +++ b/src/peripheral/scb.rs @@ -48,7 +48,7 @@ pub struct RegisterBlock { pub shpr: [RW<u32>; 2], /// System Handler Control and State - pub shcrs: RW<u32>, + pub shcsr: RW<u32>, /// Configurable Fault Status (not present on Cortex-M0 variants) #[cfg(not(armv6m))] diff --git a/src/peripheral/test.rs b/src/peripheral/test.rs index cc3e292..1f75818 100644 --- a/src/peripheral/test.rs +++ b/src/peripheral/test.rs @@ -121,7 +121,7 @@ fn scb() { assert_eq!(address(&scb.scr), 0xE000_ED10); assert_eq!(address(&scb.ccr), 0xE000_ED14); assert_eq!(address(&scb.shpr), 0xE000_ED18); - assert_eq!(address(&scb.shcrs), 0xE000_ED24); + assert_eq!(address(&scb.shcsr), 0xE000_ED24); assert_eq!(address(&scb.cfsr), 0xE000_ED28); assert_eq!(address(&scb.hfsr), 0xE000_ED2C); assert_eq!(address(&scb.dfsr), 0xE000_ED30); |