fix: compiler warnings

hpmicro · Nov 25, 2024 · 34e929c · 34e929c
1 parent 295f3d2
commit 34e929c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/examples/hpm5300evk/src/bin/embassy_tmpl.rs b/examples/hpm5300evk/src/bin/embassy_tmpl.rs
@@ -31,7 +31,7 @@ async fn blink(pin: AnyPin) {
 
 macro_rules! println {
     ($($arg:tt)*) => {
-        let _ = writeln!(unsafe {UART.as_mut().unwrap()}, $($arg)*);
+        let _ = writeln!(unsafe {(&mut *(&raw mut UART)).as_mut().unwrap()}, $($arg)*);
     };
 }
 

diff --git a/examples/hpm5300evk/src/bin/mcan.rs b/examples/hpm5300evk/src/bin/mcan.rs
@@ -63,7 +63,7 @@ static mut LINE_INTERRUPTS: Option<OwnedInterruptSet<peripherals::MCAN3>> = None
 static mut UART: Option<hal::uart::Uart<'static, Blocking>> = None;
 macro_rules! println {
     ($($arg:tt)*) => {
-        let _ = writeln!(unsafe {UART.as_mut().unwrap()}, $($arg)*);
+        let _ = writeln!(unsafe {(&mut *(&raw mut UART)).as_mut().unwrap()}, $($arg)*);
     };
 }
 

diff --git a/examples/hpm5300evk/src/bin/mcan_mi_motor.rs b/examples/hpm5300evk/src/bin/mcan_mi_motor.rs
@@ -87,7 +87,7 @@ static CAN_RX_WAKER: AtomicWaker = AtomicWaker::new();
 static mut UART: Option<hal::uart::Uart<'static, Blocking>> = None;
 macro_rules! println {
     ($($arg:tt)*) => {
-        let _ = writeln!(unsafe {UART.as_mut().unwrap()}, $($arg)*);
+        let _ = writeln!(unsafe {(&mut *(&raw mut UART)).as_mut().unwrap()}, $($arg)*);
     };
 }
 

diff --git a/examples/hpm5300evk/src/bin/raw_pwm_in.rs b/examples/hpm5300evk/src/bin/raw_pwm_in.rs
@@ -20,7 +20,7 @@ const BANNER: &str = include_str!("../../../assets/BANNER");
 
 macro_rules! println {
     ($($arg:tt)*) => {
-        let _ = writeln!(unsafe {UART.as_mut().unwrap()}, $($arg)*);
+        let _ = writeln!(unsafe {(&mut *(&raw mut UART)).as_mut().unwrap()}, $($arg)*);
     };
 }
 

diff --git a/examples/hpm5300evk/src/bin/raw_pwm_out.rs b/examples/hpm5300evk/src/bin/raw_pwm_out.rs
@@ -17,14 +17,14 @@ use {defmt_rtt as _, hpm_hal as hal};
 const BOARD_NAME: &str = "HPM5300EVK";
 const BANNER: &str = include_str!("../../../assets/BANNER");
 
+static mut UART: Option<hal::uart::Uart<'static, Blocking>> = None;
+
 macro_rules! println {
     ($($arg:tt)*) => {
-        let _ = writeln!(unsafe {UART.as_mut().unwrap()}, $($arg)*);
+        let _ = writeln!(unsafe {(&mut *(&raw mut UART)).as_mut().unwrap()}, $($arg)*);
     };
 }
 
-static mut UART: Option<hal::uart::Uart<'static, Blocking>> = None;
-
 #[hal::entry]
 fn main() -> ! {
     let mut config = hal::Config::default();

diff --git a/src/dac.rs b/src/dac.rs
@@ -417,7 +417,7 @@ impl<'d> Dac<'d, Buffered> {
 }
 
 // - MARK: Info and State
-
+#[allow(unused)]
 struct State {
     waker: AtomicWaker,
 }
@@ -429,6 +429,7 @@ impl State {
     }
 }
 
+#[allow(unused)]
 struct Info {
     regs: crate::pac::dac::Dac,
     interrupt: interrupt::Interrupt,

diff --git a/src/usb/bus.rs b/src/usb/bus.rs
@@ -245,6 +245,7 @@ impl<T: Instance> Bus<T> {
     }
 
     /// Get port speed: 00: full speed, 01: low speed, 10: high speed, 11: undefined
+    #[allow(unused)]
     pub(crate) fn get_port_speed(&mut self) -> u8 {
         let r = T::info().regs;