File tree Expand file tree Collapse file tree 3 files changed +7
-5
lines changed Expand file tree Collapse file tree 3 files changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -8,12 +8,13 @@ license = "MIT OR Apache-2.0"
8
8
name = " cortex-m"
9
9
readme = " README.md"
10
10
repository = " https://github.com/japaric/cortex-m"
11
- version = " 0.5.8 "
11
+ version = " 0.5.9 "
12
12
13
13
[dependencies ]
14
14
aligned = " 0.2.0"
15
15
bare-metal = " 0.2.0"
16
16
volatile-register = " 0.2.0"
17
+ cortex_m_0_6 = { package = " cortex-m" , version = " 0.6.0" }
17
18
18
19
[features ]
19
20
cm7-r0p1 = []
Original file line number Diff line number Diff line change 37
37
extern crate aligned;
38
38
extern crate bare_metal;
39
39
extern crate volatile_register;
40
+ extern crate cortex_m_0_6;
40
41
41
42
#[ macro_use]
42
43
mod macros;
Original file line number Diff line number Diff line change @@ -147,10 +147,10 @@ pub struct Peripherals {
147
147
pub TPIU : TPIU ,
148
148
}
149
149
150
- // NOTE `no_mangle` is used here to prevent linking different minor versions of this crate as that
151
- // would let you `take` the core peripherals more than once (one per minor version)
152
- # [ no_mangle ]
153
- static mut CORE_PERIPHERALS : bool = false ;
150
+ // Re-use the CORE_PERIPHERALS static from cortex-m v0.6.0 to allow interoperation
151
+ extern "C" {
152
+ static mut CORE_PERIPHERALS : bool ;
153
+ }
154
154
155
155
impl Peripherals {
156
156
/// Returns all the core peripherals *once*
You can’t perform that action at this time.
0 commit comments