Fix, allow (pseudo)unused unsafe

copterust · Oct 20, 2022 · 7567eac · 7567eac
1 parent 7875712
commit 7567eac
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -27,6 +27,7 @@
 
 #![deny(missing_docs)]
 #![deny(warnings)]
+#![allow(unused_unsafe)]
 #![no_std]
 
 #[cfg(feature = "stm32f301")]

diff --git a/src/timer.rs b/src/timer.rs
@@ -288,24 +288,30 @@ macro_rules! tim {
                 fn write_ccr(&mut self, value: u32) {
                     let index = CN::channel_number();
                     let tim = unsafe { &(*$TIMSRC::ptr()) };
-                    unsafe {
-                        match index {
-                            U2::B00 => tim.ccr1.write(|w| w.bits(value)),
-                            U2::B01 => tim.ccr2.write(|w| w.bits(value)),
-                            U2::B10 => tim.ccr3.write(|w| w.bits(value)),
-                            U2::B11 => tim.ccr4.write(|w| w.bits(value)),
-                        }
+                    match index {
+                        U2::B00 => tim.ccr1().write(|w| unsafe {
+                            w.bits(value)
+                        }),
+                        U2::B01 => tim.ccr2().write(|w| unsafe {
+                            w.bits(value)
+                        }),
+                        U2::B10 => tim.ccr3().write(|w| unsafe {
+                            w.bits(value)
+                        }),
+                        U2::B11 => tim.ccr4().write(|w| unsafe {
+                            w.bits(value)
+                        }),
                     }
                 }
 
                 fn read_ccr(&self) -> u32 {
                     let index = CN::channel_number();
                     let tim = unsafe { &(*$TIMSRC::ptr()) };
                     match index {
-                        U2::B00 => tim.ccr1.read().bits(),
-                        U2::B01 => tim.ccr2.read().bits(),
-                        U2::B10 => tim.ccr3.read().bits(),
-                        U2::B11 => tim.ccr4.read().bits(),
+                        U2::B00 => tim.ccr1().read().bits(),
+                        U2::B01 => tim.ccr2().read().bits(),
+                        U2::B10 => tim.ccr3().read().bits(),
+                        U2::B11 => tim.ccr4().read().bits(),
                     }
                 }