Skip to content

Commit ac5f677

Browse files
bors[bot]rajivr
andcommitted
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 <[email protected]> Co-authored-by: Rajiv Ranganath <[email protected]>
2 parents 04ee333 + 733e6d6 commit ac5f677

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/peripheral/scb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pub struct RegisterBlock {
4848
pub shpr: [RW<u32>; 2],
4949

5050
/// System Handler Control and State
51-
pub shcrs: RW<u32>,
51+
pub shcsr: RW<u32>,
5252

5353
/// Configurable Fault Status (not present on Cortex-M0 variants)
5454
#[cfg(not(armv6m))]

src/peripheral/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ fn scb() {
121121
assert_eq!(address(&scb.scr), 0xE000_ED10);
122122
assert_eq!(address(&scb.ccr), 0xE000_ED14);
123123
assert_eq!(address(&scb.shpr), 0xE000_ED18);
124-
assert_eq!(address(&scb.shcrs), 0xE000_ED24);
124+
assert_eq!(address(&scb.shcsr), 0xE000_ED24);
125125
assert_eq!(address(&scb.cfsr), 0xE000_ED28);
126126
assert_eq!(address(&scb.hfsr), 0xE000_ED2C);
127127
assert_eq!(address(&scb.dfsr), 0xE000_ED30);

0 commit comments

Comments
 (0)