Organize features

Author: JalonWong

freertos-rust-examples/Cargo.toml

@@ -14,9 +14,7 @@ Create to use FreeRTOS in rust projects. It contains binaries for demos on some
 [target.thumbv7m-none-eabi.dependencies]
     cortex-m = "0.7"
     cortex-m-rt = "0.7"
-    freertos-next = { path = "../freertos-rust", features = [
-        "critical_section_impl",
-    ] }
+    freertos-next = { path = "../freertos-rust", features = ["standard"] }
     stm32f1xx-hal = { version = "0.10", features = [
         "rt",
         "stm32f103",
@@ -35,22 +33,16 @@ Create to use FreeRTOS in rust projects. It contains binaries for demos on some
 [target."thumbv8m.main-none-eabihf".dependencies]
     cortex-m = "0.7"
     cortex-m-rt = "0.7"
-    freertos-next = { path = "../freertos-rust", features = [
-        "critical_section_impl",
-    ] }
+    freertos-next = { path = "../freertos-rust", features = ["standard"] }
     nrf9160-pac = { version = "0.12", features = ["rt"] }
 
 # Example: win
 [target.x86_64-pc-windows-msvc.dependencies]
-    freertos-next = { path = "../freertos-rust", features = [
-        "critical_section_impl",
-    ] }
+    freertos-next = { path = "../freertos-rust", features = ["standard"] }
 
 # Example: linux
 [target.x86_64-unknown-linux-gnu.dependencies]
-    freertos-next = { path = "../freertos-rust", features = [
-        "critical_section_impl",
-    ] }
+    freertos-next = { path = "../freertos-rust", features = ["standard"] }
 
 [build-dependencies]
     freertos-build = { path = "../freertos-cargo-build" }

freertos-rust/Cargo.toml

@@ -18,7 +18,10 @@ The freertos-build crate can be used to build and link FreeRTOS from source insi
     path = "src/lib.rs"
 
 [features]
-    default = ["allocator", "sync", "time", "hooks", "interrupt", "delete_task"]
+    default = ["minimum"]
+
+    minimum = ["allocator", "sync", "time"]
+    standard = ["minimum", "hooks", "delete_task", "critical_section_impl"]
 
     allocator = []
     cpu_clock = []
@@ -27,7 +30,6 @@ The freertos-build crate can be used to build and link FreeRTOS from source insi
     delete_task = []
     hooks = []
     interrupt = []
-    std = ["critical-section/std"]
     sync = ["interrupt"]
     time = ["interrupt"]
 

freertos-rust/src/lib.rs

@@ -81,6 +81,7 @@ mod event_group;
 mod isr;
 #[cfg(feature = "sync")]
 mod mutex;
+#[cfg(cortex_m)]
 mod os_traits_impls;
 #[cfg(feature = "sync")]
 mod queue;
@@ -117,6 +118,8 @@ pub use crate::hooks::*;
 pub use crate::isr::*;
 #[cfg(feature = "sync")]
 pub use crate::mutex::*;
+#[cfg(cortex_m)]
+pub use crate::os_traits_impls::*;
 #[cfg(feature = "sync")]
 pub use crate::queue::*;
 #[cfg(feature = "sync")]
@@ -127,8 +130,6 @@ pub use crate::task::*;
 pub use crate::timers::*;
 #[cfg(any(feature = "time", feature = "sync"))]
 pub use crate::units::*;
-
-pub use crate::os_traits_impls::*;
 #[cfg(feature = "cpu_clock")]
 pub use crate::utils::cpu_clock_hz;
 pub use crate::utils::shim_sanity_check;

freertos-rust/src/os_traits_impls.rs

@@ -349,46 +349,3 @@ mod sys_tick_timeout {
         }
     }
 }
-
-#[cfg(not(cortex_m))]
-pub use other_timeout::*;
-#[cfg(not(cortex_m))]
-mod other_timeout {
-    use super::*;
-
-    #[derive(Clone, Copy)]
-    pub struct FreeRtosTimeoutState {
-        timeout: u32,
-    }
-
-    impl FreeRtosTimeoutState {
-        pub fn new_ns(timeout: u32) -> Self {
-            Self::new(timeout)
-        }
-
-        pub fn new_us(timeout: u32) -> Self {
-            Self::new(timeout)
-        }
-
-        pub fn new_ms(timeout: u32) -> Self {
-            Self::new(timeout)
-        }
-
-        fn new(timeout: u32) -> Self {
-            Self { timeout }
-        }
-    }
-
-    impl TimeoutState for FreeRtosTimeoutState {
-        /// Can be reused without calling `restart()`.
-        #[inline]
-        fn timeout(&mut self) -> bool {
-            true
-        }
-
-        #[inline]
-        fn restart(&mut self) {
-            self.timeout = 0;
-        }
-    }
-}