Merge pull request #703 from stm32-rs/ptr

as_ptr

Author: burrbull

CHANGELOG.md

@@ -7,15 +7,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
-- Added an example to show how to do DMA with UART (Rx only) [#698]
-- Updated `synopsys-usb-otg` to `0.4.0`
 ### Added
 
  - Added an example to show how to do DMA with UART (Rx only) [#698]
 
 ### Changed
 
  - bump embedded-hal to `1.0-rc2`
+ - Use `as_ptr` for register address casting
+ - Updated `synopsys-usb-otg` to `0.4.0`
 
 ### Fixed
 

src/adc.rs

@@ -848,7 +848,7 @@ macro_rules! adc {
 
                 /// Returns the address of the ADC data register. Primarily useful for configuring DMA.
                 pub fn data_register_address(&mut self) -> u32 {
-                    &self.adc_reg.dr as *const _ as u32
+                    self.adc_reg.dr.as_ptr() as u32
                 }
 
                 /// Configure a channel for sampling.
@@ -1017,7 +1017,7 @@ macro_rules! adc {
             unsafe impl PeriAddress for Adc<pac::$adc_type> {
                 #[inline(always)]
                 fn address(&self) -> u32 {
-                    &self.adc_reg.dr as *const _ as u32
+                    self.adc_reg.dr.as_ptr() as u32
                 }
 
                 type MemSize = u16;

src/dma/traits.rs

@@ -288,7 +288,7 @@ macro_rules! address {
             unsafe impl PeriAddress for $peripheral {
                 #[inline(always)]
                 fn address(&self) -> u32 {
-                    &self.$register as *const _ as u32
+                    self.$register.as_ptr() as u32
                 }
 
                 type MemSize = $size;
@@ -384,14 +384,14 @@ pub struct AES_OUT(());
 #[cfg(feature = "aes")]
 unsafe impl PeriAddress for AES_IN {
     fn address(&self) -> u32 {
-        unsafe { &(*pac::AES::ptr()).dinr as *const _ as u32 }
+        unsafe { (*pac::AES::ptr()).dinr.as_ptr() as u32 }
     }
     type MemSize = u32;
 }
 #[cfg(feature = "aes")]
 unsafe impl PeriAddress for AES_OUT {
     fn address(&self) -> u32 {
-        unsafe { &(*pac::AES::ptr()).doutr as *const _ as u32 }
+        unsafe { (*pac::AES::ptr()).doutr.as_ptr() as u32 }
     }
     type MemSize = u32;
 }
@@ -404,14 +404,14 @@ pub struct CRYP_OUT(());
 #[cfg(feature = "cryp")]
 unsafe impl PeriAddress for CRYP_IN {
     fn address(&self) -> u32 {
-        unsafe { &(*pac::CRYP::ptr()).din as *const _ as u32 }
+        unsafe { (*pac::CRYP::ptr()).din.as_ptr() as u32 }
     }
     type MemSize = u32;
 }
 #[cfg(feature = "cryp")]
 unsafe impl PeriAddress for CRYP_OUT {
     fn address(&self) -> u32 {
-        unsafe { &(*pac::CRYP::ptr()).dout as *const _ as u32 }
+        unsafe { (*pac::CRYP::ptr()).dout.as_ptr() as u32 }
     }
     type MemSize = u32;
 }

src/dma/traits/f4.rs

@@ -390,7 +390,7 @@ mod dfsdm1 {
     unsafe impl<const F: u8> PeriAddress for FLT<DFSDM1, F> {
         #[inline(always)]
         fn address(&self) -> u32 {
-            unsafe { &(*DFSDM1::ptr()).flt[F as usize].rdatar as *const _ as u32 }
+            unsafe { (*DFSDM1::ptr()).flt[F as usize].rdatar.as_ptr() as u32 }
         }
 
         type MemSize = u32;
@@ -412,7 +412,7 @@ dma_map!(
 unsafe impl<const F: u8> PeriAddress for FLT<pac::DFSDM2, F> {
     #[inline(always)]
     fn address(&self) -> u32 {
-        unsafe { &(*DFSDM2::ptr()).flt[F as usize].rdatar as *const _ as u32 }
+        unsafe { (*DFSDM2::ptr()).flt[F as usize].rdatar.as_ptr() as u32 }
     }
 
     type MemSize = u32;
@@ -484,7 +484,7 @@ mod sai1 {
     unsafe impl<const C: u8> PeriAddress for SAICH<SAI1, C> {
         #[inline(always)]
         fn address(&self) -> u32 {
-            unsafe { &(*SAI1::ptr()).ch[C as usize].dr as *const _ as u32 }
+            unsafe { (*SAI1::ptr()).ch[C as usize].dr.as_ptr() as u32 }
         }
 
         type MemSize = u32;
@@ -501,7 +501,7 @@ dma_map!(
 unsafe impl<const C: u8> PeriAddress for SAICH<pac::SAI2, C> {
     #[inline(always)]
     fn address(&self) -> u32 {
-        unsafe { &(*pac::SAI2::ptr()).ch[C as usize].dr as *const _ as u32 }
+        unsafe { (*pac::SAI2::ptr()).ch[C as usize].dr.as_ptr() as u32 }
     }
 
     type MemSize = u32;

src/i2c/dma.rs

@@ -890,7 +890,7 @@ pub struct Rx<I2C> {
 unsafe impl<I2C: Instance> PeriAddress for Rx<I2C> {
     #[inline(always)]
     fn address(&self) -> u32 {
-        unsafe { &(*I2C::ptr()).dr as *const _ as u32 }
+        unsafe { (*I2C::ptr()).dr.as_ptr() as u32 }
     }
 
     type MemSize = u8;
@@ -899,7 +899,7 @@ unsafe impl<I2C: Instance> PeriAddress for Rx<I2C> {
 unsafe impl<I2C: Instance> PeriAddress for Tx<I2C> {
     #[inline(always)]
     fn address(&self) -> u32 {
-        unsafe { &(*I2C::ptr()).dr as *const _ as u32 }
+        unsafe { (*I2C::ptr()).dr.as_ptr() as u32 }
     }
 
     type MemSize = u8;

src/rtc.rs

@@ -589,9 +589,9 @@ impl<CS> Rtc<CS> {
 
         // TODO: remove unsafe after PAC update
         let tr = &self.regs.tstr;
-        let tr = unsafe { (*(tr as *const _ as *const TR)).read() };
+        let tr = unsafe { (*(tr.as_ptr() as *const TR)).read() };
         let dr = &self.regs.tsdr;
-        let dr = unsafe { (*(dr as *const _ as *const DR)).read() };
+        let dr = unsafe { (*(dr.as_ptr() as *const DR)).read() };
         let dry = self.regs.dr.read();
         let seconds = decode_seconds(&tr);
         let minutes = decode_minutes(&tr);

src/serial/uart_impls.rs

@@ -315,7 +315,7 @@ macro_rules! uartCommon {
             }
 
             fn peri_address(&self) -> u32 {
-                &self.dr as *const _ as u32
+                self.dr.as_ptr() as u32
             }
         }
     };

src/spi.rs

@@ -899,7 +899,7 @@ impl<SPI: Instance> DmaBuilder<SPI> {
 unsafe impl<SPI: Instance> PeriAddress for Rx<SPI> {
     #[inline(always)]
     fn address(&self) -> u32 {
-        unsafe { &(*SPI::ptr()).dr as *const _ as u32 }
+        unsafe { (*SPI::ptr()).dr.as_ptr() as u32 }
     }
 
     type MemSize = u8;
@@ -913,7 +913,7 @@ unsafe impl<SPI, STREAM, const CHANNEL: u8> DMASet<STREAM, CHANNEL, PeripheralTo
 unsafe impl<SPI: Instance> PeriAddress for Tx<SPI> {
     #[inline(always)]
     fn address(&self) -> u32 {
-        unsafe { &(*SPI::ptr()).dr as *const _ as u32 }
+        unsafe { (*SPI::ptr()).dr.as_ptr() as u32 }
     }
 
     type MemSize = u8;

src/timer.rs

@@ -567,7 +567,7 @@ macro_rules! hal {
             unsafe impl<const C: u8> PeriAddress for CCR<$TIM, C> {
                 #[inline(always)]
                 fn address(&self) -> u32 {
-                    &self.0.ccr[C as usize] as *const _ as u32
+                    self.0.ccr[C as usize].as_ptr() as u32
                 }
 
                 type MemSize = $bits;
@@ -589,7 +589,7 @@ macro_rules! with_dmar {
         unsafe impl PeriAddress for DMAR<$TIM> {
             #[inline(always)]
             fn address(&self) -> u32 {
-                &self.0.dmar as *const _ as u32
+                self.0.dmar.as_ptr() as u32
             }
 
             type MemSize = $memsize;