Skip to content

Commit d1be3bf

Browse files
committed
Rename RTFM feature to RTIC, leaving RTFM in for now for backwards compatibility
1 parent 00a30da commit d1be3bf

File tree

994 files changed

+1209
-1207
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

994 files changed

+1209
-1207
lines changed

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ cortex-m-rt = { version = "0.6.12", optional = true }
3030
[features]
3131
rt = ["cortex-m-rt/device"]
3232
inline-asm = ["external_cortex_m/inline-asm"]
33-
rtfm = []
33+
rtic = []
34+
rtfm = ["rtic"]
3435
default = []
3536
nosync = []
3637
doc = []

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildall:
1717
cargo check --features `basename $$device .yaml` || break 0;\
1818
cargo check --features `basename $$device .yaml`,nosync || break 0;\
1919
cargo check --features `basename $$device .yaml`,rt || break 0;\
20-
cargo check --features `basename $$device .yaml`,rtfm || break 0;\
20+
cargo check --features `basename $$device .yaml`,rtic || break 0;\
2121
done
2222

2323
doc:

README.md

Lines changed: 1 addition & 1 deletion

src/cortex_m/armv6m/cpuid.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ impl ::core::ops::Deref for Instance {
108108
unsafe { &*(self.addr as *const _) }
109109
}
110110
}
111-
#[cfg(feature = "rtfm")]
111+
#[cfg(feature = "rtic")]
112112
unsafe impl Send for Instance {}
113113

114114
/// Access functions for the CPUID peripheral instance

src/cortex_m/armv6m/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pub use super::instances::dcb;
55
pub use super::instances::dwt;
66
pub use super::instances::syst;
77

8-
#[cfg(all(feature = "rtfm", not(feature = "nosync")))]
8+
#[cfg(all(feature = "rtic", not(feature = "nosync")))]
99
#[allow(non_snake_case)]
1010
pub struct Peripherals {
1111
pub CPUID: cpuid::Instance,
@@ -14,11 +14,11 @@ pub struct Peripherals {
1414
pub SYST: syst::Instance,
1515
}
1616

17-
#[cfg(all(feature = "rtfm", feature = "nosync"))]
17+
#[cfg(all(feature = "rtic", feature = "nosync"))]
1818
#[allow(non_snake_case)]
1919
pub struct Peripherals {}
2020

21-
#[cfg(all(feature = "rtfm", not(feature = "nosync")))]
21+
#[cfg(all(feature = "rtic", not(feature = "nosync")))]
2222
impl Peripherals {
2323
pub unsafe fn steal() -> Self {
2424
Peripherals {
@@ -30,7 +30,7 @@ impl Peripherals {
3030
}
3131
}
3232

33-
#[cfg(all(feature = "rtfm", feature = "nosync"))]
33+
#[cfg(all(feature = "rtic", feature = "nosync"))]
3434
impl Peripherals {
3535
pub fn steal() -> Self {
3636
Peripherals {}

src/cortex_m/armv7em/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub use super::instances::itm;
99
pub use super::instances::syst;
1010
pub use super::instances::tpiu;
1111

12-
#[cfg(all(feature = "rtfm", not(feature = "nosync")))]
12+
#[cfg(all(feature = "rtic", not(feature = "nosync")))]
1313
#[allow(non_snake_case)]
1414
pub struct Peripherals {
1515
pub CPB: cpb::Instance,
@@ -22,11 +22,11 @@ pub struct Peripherals {
2222
pub TPIU: tpiu::Instance,
2323
}
2424

25-
#[cfg(all(feature = "rtfm", feature = "nosync"))]
25+
#[cfg(all(feature = "rtic", feature = "nosync"))]
2626
#[allow(non_snake_case)]
2727
pub struct Peripherals {}
2828

29-
#[cfg(all(feature = "rtfm", not(feature = "nosync")))]
29+
#[cfg(all(feature = "rtic", not(feature = "nosync")))]
3030
impl Peripherals {
3131
pub unsafe fn steal() -> Self {
3232
Peripherals {
@@ -42,7 +42,7 @@ impl Peripherals {
4242
}
4343
}
4444

45-
#[cfg(all(feature = "rtfm", feature = "nosync"))]
45+
#[cfg(all(feature = "rtic", feature = "nosync"))]
4646
impl Peripherals {
4747
pub fn steal() -> Self {
4848
Peripherals {}

src/cortex_m/armv7m/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub use super::instances::itm;
99
pub use super::instances::syst;
1010
pub use super::instances::tpiu;
1111

12-
#[cfg(all(feature = "rtfm", not(feature = "nosync")))]
12+
#[cfg(all(feature = "rtic", not(feature = "nosync")))]
1313
#[allow(non_snake_case)]
1414
pub struct Peripherals {
1515
pub CPB: cpb::Instance,
@@ -22,11 +22,11 @@ pub struct Peripherals {
2222
pub TPIU: tpiu::Instance,
2323
}
2424

25-
#[cfg(all(feature = "rtfm", feature = "nosync"))]
25+
#[cfg(all(feature = "rtic", feature = "nosync"))]
2626
#[allow(non_snake_case)]
2727
pub struct Peripherals {}
2828

29-
#[cfg(all(feature = "rtfm", not(feature = "nosync")))]
29+
#[cfg(all(feature = "rtic", not(feature = "nosync")))]
3030
impl Peripherals {
3131
pub unsafe fn steal() -> Self {
3232
Peripherals {
@@ -42,7 +42,7 @@ impl Peripherals {
4242
}
4343
}
4444

45-
#[cfg(all(feature = "rtfm", feature = "nosync"))]
45+
#[cfg(all(feature = "rtic", feature = "nosync"))]
4646
impl Peripherals {
4747
pub fn steal() -> Self {
4848
Peripherals {}

src/cortex_m/peripherals/cpb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,5 +119,5 @@ impl ::core::ops::Deref for Instance {
119119
unsafe { &*(self.addr as *const _) }
120120
}
121121
}
122-
#[cfg(feature = "rtfm")]
122+
#[cfg(feature = "rtic")]
123123
unsafe impl Send for Instance {}

src/cortex_m/peripherals/cpuid.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,5 +233,5 @@ impl ::core::ops::Deref for Instance {
233233
unsafe { &*(self.addr as *const _) }
234234
}
235235
}
236-
#[cfg(feature = "rtfm")]
236+
#[cfg(feature = "rtic")]
237237
unsafe impl Send for Instance {}

src/cortex_m/peripherals/dcb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,5 +52,5 @@ impl ::core::ops::Deref for Instance {
5252
unsafe { &*(self.addr as *const _) }
5353
}
5454
}
55-
#[cfg(feature = "rtfm")]
55+
#[cfg(feature = "rtic")]
5656
unsafe impl Send for Instance {}

0 commit comments

Comments
 (0)