Fix compile warnings.

Author: qwandor

examples/nvmc-demo/src/main.rs

@@ -6,7 +6,7 @@
 #[cfg(feature = "52840")]
 use nrf52840_hal as hal;
 
-use core::convert::TryInto;
+use core::{convert::TryInto, ptr::addr_of_mut};
 use embedded_storage::nor_flash::NorFlash;
 use embedded_storage::nor_flash::ReadNorFlash;
 use hal::nvmc::Nvmc;
@@ -33,7 +33,7 @@ fn main() -> ! {
     let p = hal::pac::Peripherals::take().unwrap();
 
     #[cfg(feature = "52840")]
-    let mut nvmc = Nvmc::new(p.NVMC, unsafe { &mut CONFIG });
+    let mut nvmc = Nvmc::new(p.NVMC, unsafe { addr_of_mut!(CONFIG).as_mut().unwrap() });
 
     erase_if_needed(&mut nvmc, LAST_PAGE);
 

nrf-hal-common/src/pwm.rs

@@ -14,9 +14,9 @@ use crate::{
     time::*,
 };
 use core::{
-    cell::Cell,
     convert::Infallible,
     ops::Deref,
+    ptr::addr_of_mut,
     sync::atomic::{compiler_fence, Ordering},
 };
 use embedded_dma::*;
@@ -299,7 +299,7 @@ where
     // Internal helper function that returns 15 bit duty cycle value.
     #[inline(always)]
     fn duty_on_value(&self, index: usize) -> u16 {
-        let val = T::buffer().get()[index];
+        let val = unsafe { (*T::buffer())[index] };
         let is_inverted = (val >> 15) & 1 == 0;
         match is_inverted {
             false => val,
@@ -310,7 +310,7 @@ where
     // Internal helper function that returns 15 bit inverted duty cycle value.
     #[inline(always)]
     fn duty_off_value(&self, index: usize) -> u16 {
-        let val = T::buffer().get()[index];
+        let val = unsafe { (*T::buffer())[index] };
         let is_inverted = (val >> 15) & 1 == 0;
         match is_inverted {
             false => self.max_duty() - val,
@@ -321,31 +321,33 @@ where
     /// Sets duty cycle (15 bit) for all PWM channels.
     /// Will replace any ongoing sequence playback.
     pub fn set_duty_on_common(&self, duty: u16) {
-        let mut buffer = T::buffer().get();
-        buffer.copy_from_slice(&[duty.min(self.max_duty()) & 0x7FFF; 4][..]);
-        T::buffer().set(buffer);
+        let buffer = T::buffer();
+        unsafe {
+            *buffer = [duty.min(self.max_duty()) & 0x7FFF; 4];
+        }
         self.one_shot();
         self.set_load_mode(LoadMode::Common);
         self.pwm
             .seq0
             .ptr
-            .write(|w| unsafe { w.bits(T::buffer().as_ptr() as u32) });
+            .write(|w| unsafe { w.bits(buffer as u32) });
         self.pwm.seq0.cnt.write(|w| unsafe { w.bits(1) });
         self.start_seq(Seq::Seq0);
     }
 
     /// Sets inverted duty cycle (15 bit) for all PWM channels.
     /// Will replace any ongoing sequence playback.
     pub fn set_duty_off_common(&self, duty: u16) {
-        let mut buffer = T::buffer().get();
-        buffer.copy_from_slice(&[duty.min(self.max_duty()) | 0x8000; 4][..]);
-        T::buffer().set(buffer);
+        let buffer = T::buffer();
+        unsafe {
+            *buffer = [duty.min(self.max_duty()) | 0x8000; 4];
+        }
         self.one_shot();
         self.set_load_mode(LoadMode::Common);
         self.pwm
             .seq0
             .ptr
-            .write(|w| unsafe { w.bits(T::buffer().as_ptr() as u32) });
+            .write(|w| unsafe { w.bits(buffer as u32) });
         self.pwm.seq0.cnt.write(|w| unsafe { w.bits(1) });
         self.start_seq(Seq::Seq0);
     }
@@ -365,31 +367,33 @@ where
     /// Sets duty cycle (15 bit) for a PWM group.
     /// Will replace any ongoing sequence playback.
     pub fn set_duty_on_group(&self, group: Group, duty: u16) {
-        let mut buffer = T::buffer().get();
-        buffer[usize::from(group)] = duty.min(self.max_duty()) & 0x7FFF;
-        T::buffer().set(buffer);
+        let buffer = T::buffer();
+        unsafe {
+            (*buffer)[usize::from(group)] = duty.min(self.max_duty()) & 0x7FFF;
+        }
         self.one_shot();
         self.set_load_mode(LoadMode::Grouped);
         self.pwm
             .seq0
             .ptr
-            .write(|w| unsafe { w.bits(T::buffer().as_ptr() as u32) });
+            .write(|w| unsafe { w.bits(buffer as u32) });
         self.pwm.seq0.cnt.write(|w| unsafe { w.bits(2) });
         self.start_seq(Seq::Seq0);
     }
 
     /// Sets inverted duty cycle (15 bit) for a PWM group.
     /// Will replace any ongoing sequence playback.
     pub fn set_duty_off_group(&self, group: Group, duty: u16) {
-        let mut buffer = T::buffer().get();
-        buffer[usize::from(group)] = duty.min(self.max_duty()) | 0x8000;
-        T::buffer().set(buffer);
+        let buffer = T::buffer();
+        unsafe {
+            (*buffer)[usize::from(group)] = duty.min(self.max_duty()) | 0x8000;
+        }
         self.one_shot();
         self.set_load_mode(LoadMode::Grouped);
         self.pwm
             .seq0
             .ptr
-            .write(|w| unsafe { w.bits(T::buffer().as_ptr() as u32) });
+            .write(|w| unsafe { w.bits(buffer as u32) });
         self.pwm.seq0.cnt.write(|w| unsafe { w.bits(2) });
         self.start_seq(Seq::Seq0);
     }
@@ -409,31 +413,33 @@ where
     /// Sets duty cycle (15 bit) for a PWM channel.
     /// Will replace any ongoing sequence playback and the other channels will return to their previously set value.
     pub fn set_duty_on(&self, channel: Channel, duty: u16) {
-        let mut buffer = T::buffer().get();
-        buffer[usize::from(channel)] = duty.min(self.max_duty()) & 0x7FFF;
-        T::buffer().set(buffer);
+        let buffer = T::buffer();
+        unsafe {
+            (*buffer)[usize::from(channel)] = duty.min(self.max_duty()) & 0x7FFF;
+        }
         self.one_shot();
         self.set_load_mode(LoadMode::Individual);
         self.pwm
             .seq0
             .ptr
-            .write(|w| unsafe { w.bits(T::buffer().as_ptr() as u32) });
+            .write(|w| unsafe { w.bits(buffer as u32) });
         self.pwm.seq0.cnt.write(|w| unsafe { w.bits(4) });
         self.start_seq(Seq::Seq0);
     }
 
     /// Sets inverted duty cycle (15 bit) for a PWM channel.
     /// Will replace any ongoing sequence playback and the other channels will return to their previously set value.
     pub fn set_duty_off(&self, channel: Channel, duty: u16) {
-        let mut buffer = T::buffer().get();
-        buffer[usize::from(channel)] = duty.min(self.max_duty()) | 0x8000;
-        T::buffer().set(buffer);
+        let buffer = T::buffer();
+        unsafe {
+            (*buffer)[usize::from(channel)] = duty.min(self.max_duty()) | 0x8000;
+        }
         self.one_shot();
         self.set_load_mode(LoadMode::Individual);
         self.pwm
             .seq0
             .ptr
-            .write(|w| unsafe { w.bits(T::buffer().as_ptr() as u32) });
+            .write(|w| unsafe { w.bits(buffer as u32) });
         self.pwm.seq0.cnt.write(|w| unsafe { w.bits(4) });
         self.start_seq(Seq::Seq0);
     }
@@ -1185,24 +1191,24 @@ pub trait Instance: sealed::Sealed + Deref<Target = RegisterBlock> {
     const INTERRUPT: Interrupt;
 
     /// Provides access to the associated internal duty buffer for the instance.
-    fn buffer() -> &'static Cell<[u16; 4]>;
+    fn buffer() -> *mut [u16; 4];
 }
 
 // Internal static duty buffers. One per instance.
-static mut BUF0: Cell<[u16; 4]> = Cell::new([0; 4]);
+static mut BUF0: [u16; 4] = [0; 4];
 #[cfg(not(any(feature = "52810", feature = "52811")))]
-static mut BUF1: Cell<[u16; 4]> = Cell::new([0; 4]);
+static mut BUF1: [u16; 4] = [0; 4];
 #[cfg(not(any(feature = "52810", feature = "52811")))]
-static mut BUF2: Cell<[u16; 4]> = Cell::new([0; 4]);
+static mut BUF2: [u16; 4] = [0; 4];
 #[cfg(not(any(feature = "52810", feature = "52811", feature = "52832")))]
-static mut BUF3: Cell<[u16; 4]> = Cell::new([0; 4]);
+static mut BUF3: [u16; 4] = [0; 4];
 
 #[cfg(not(any(feature = "9160", feature = "5340-app")))]
 impl Instance for crate::pac::PWM0 {
     const INTERRUPT: Interrupt = Interrupt::PWM0;
     #[inline(always)]
-    fn buffer() -> &'static Cell<[u16; 4]> {
-        unsafe { &BUF0 }
+    fn buffer() -> *mut [u16; 4] {
+        unsafe { addr_of_mut!(BUF0) }
     }
 }
 
@@ -1214,8 +1220,8 @@ impl Instance for crate::pac::PWM0 {
 )))]
 impl Instance for crate::pac::PWM1 {
     const INTERRUPT: Interrupt = Interrupt::PWM1;
-    fn buffer() -> &'static Cell<[u16; 4]> {
-        unsafe { &BUF1 }
+    fn buffer() -> *mut [u16; 4] {
+        unsafe { addr_of_mut!(BUF1) }
     }
 }
 
@@ -1227,8 +1233,8 @@ impl Instance for crate::pac::PWM1 {
 )))]
 impl Instance for crate::pac::PWM2 {
     const INTERRUPT: Interrupt = Interrupt::PWM2;
-    fn buffer() -> &'static Cell<[u16; 4]> {
-        unsafe { &BUF2 }
+    fn buffer() -> *mut [u16; 4] {
+        unsafe { addr_of_mut!(BUF2) }
     }
 }
 
@@ -1241,41 +1247,41 @@ impl Instance for crate::pac::PWM2 {
 )))]
 impl Instance for crate::pac::PWM3 {
     const INTERRUPT: Interrupt = Interrupt::PWM3;
-    fn buffer() -> &'static Cell<[u16; 4]> {
-        unsafe { &BUF3 }
+    fn buffer() -> *mut [u16; 4] {
+        unsafe { addr_of_mut!(BUF3) }
     }
 }
 
 #[cfg(any(feature = "9160", feature = "5340-app"))]
 impl Instance for crate::pac::PWM0_NS {
     const INTERRUPT: Interrupt = Interrupt::PWM0;
     #[inline(always)]
-    fn buffer() -> &'static Cell<[u16; 4]> {
-        unsafe { &BUF0 }
+    fn buffer() -> *mut [u16; 4] {
+        unsafe { addr_of_mut!(BUF0) }
     }
 }
 
 #[cfg(any(feature = "9160", feature = "5340-app"))]
 impl Instance for crate::pac::PWM1_NS {
     const INTERRUPT: Interrupt = Interrupt::PWM1;
-    fn buffer() -> &'static Cell<[u16; 4]> {
-        unsafe { &BUF1 }
+    fn buffer() -> *mut [u16; 4] {
+        unsafe { addr_of_mut!(BUF1) }
     }
 }
 
 #[cfg(any(feature = "9160", feature = "5340-app"))]
 impl Instance for crate::pac::PWM2_NS {
     const INTERRUPT: Interrupt = Interrupt::PWM2;
-    fn buffer() -> &'static Cell<[u16; 4]> {
-        unsafe { &BUF2 }
+    fn buffer() -> *mut [u16; 4] {
+        unsafe { addr_of_mut!(BUF2) }
     }
 }
 
 #[cfg(any(feature = "9160", feature = "5340-app"))]
 impl Instance for crate::pac::PWM3_NS {
     const INTERRUPT: Interrupt = Interrupt::PWM3;
-    fn buffer() -> &'static Cell<[u16; 4]> {
-        unsafe { &BUF3 }
+    fn buffer() -> *mut [u16; 4] {
+        unsafe { addr_of_mut!(BUF3) }
     }
 }
 mod sealed {

nrf52840-hal-tests/tests/nvmc.rs

@@ -5,6 +5,7 @@ use defmt_rtt as _;
 use nrf52840_hal as _;
 use panic_probe as _;
 
+use core::ptr::addr_of_mut;
 use embedded_storage::nor_flash::{NorFlash, ReadNorFlash};
 use nrf52840_hal::{nvmc::Nvmc, pac};
 
@@ -32,7 +33,7 @@ mod tests {
         let p = unwrap!(pac::Peripherals::take());
 
         State {
-            nvmc: Nvmc::new(p.NVMC, unsafe { &mut CONFIG }),
+            nvmc: Nvmc::new(p.NVMC, unsafe { addr_of_mut!(CONFIG).as_mut().unwrap() }),
         }
     }