Merge pull request tock#3935 from wprzytula/re-export-interrupt-mask

arch/cortex-m3: re-export interrupt mask
alevy · Mar 23, 2024 · 22ddb0b · 22ddb0b
2 parents 6179d3a + 0a33e7a
commit 22ddb0b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/arch/cortex-m3/src/lib.rs b/arch/cortex-m3/src/lib.rs
@@ -15,6 +15,7 @@ pub mod mpu {
 }
 
 pub use cortexm::initialize_ram_jump_to_main;
+pub use cortexm::interrupt_mask;
 pub use cortexm::nvic;
 pub use cortexm::scb;
 pub use cortexm::support;

diff --git a/kernel/src/hil/time.rs b/kernel/src/hil/time.rs
@@ -55,7 +55,7 @@ pub trait Ticks: Clone + Copy + From<u32> + fmt::Debug + Ord + PartialOrd + Eq {
     /// Returns the half the maximum value of this type, which should be (2^width-1).
     fn half_max_value() -> Self;
 
-    /// Coverts the specified val into this type if it fits otherwise the
+    /// Converts the specified val into this type if it fits otherwise the
     /// `max_value()` is returned
     fn from_or_max(val: u64) -> Self;