improve Ptr trait

Author: burrbull

src/i2c/dma.rs

@@ -934,7 +934,7 @@ pub struct Rx<I2C> {
 unsafe impl<I2C: Instance> PeriAddress for Rx<I2C> {
     #[inline(always)]
     fn address(&self) -> u32 {
-        unsafe { (*I2C::ptr()).dr().as_ptr() as u32 }
+        unsafe { (*I2C::PTR).dr().as_ptr() as u32 }
     }
 
     type MemSize = u8;
@@ -943,7 +943,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_ptr() as u32 }
+        unsafe { (*I2C::PTR).dr().as_ptr() as u32 }
     }
 
     type MemSize = u8;

src/lib.rs

@@ -210,15 +210,18 @@ impl<RB, const A: usize> Sealed for Periph<RB, A> {}
 pub trait Ptr: Sealed {
     /// RegisterBlock structure
     type RB;
+    /// Pointer to the register block
+    const PTR: *const Self::RB;
     /// Return the pointer to the register block
-    fn ptr() -> *const Self::RB;
+    #[inline(always)]
+    fn ptr() -> *const Self::RB {
+        Self::PTR
+    }
 }
 
 impl<RB, const A: usize> Ptr for Periph<RB, A> {
     type RB = RB;
-    fn ptr() -> *const Self::RB {
-        Self::ptr()
-    }
+    const PTR: *const Self::RB = Self::PTR;
 }
 
 pub trait Steal: Sealed {
@@ -239,6 +242,7 @@ pub trait Steal: Sealed {
 }
 
 impl<RB, const A: usize> Steal for Periph<RB, A> {
+    #[inline(always)]
     unsafe fn steal() -> Self {
         Self::steal()
     }

src/serial.rs

@@ -139,7 +139,7 @@ pub trait Instance:
     #[doc(hidden)]
     #[inline(always)]
     fn peri_address() -> u32 {
-        unsafe { &*Self::ptr() }.peri_address()
+        unsafe { &*Self::PTR }.peri_address()
     }
 }
 

src/spi.rs

@@ -957,7 +957,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_ptr() as u32 }
+        unsafe { (*SPI::PTR).dr().as_ptr() as u32 }
     }
 
     type MemSize = u8;
@@ -971,7 +971,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_ptr() as u32 }
+        unsafe { (*SPI::PTR).dr().as_ptr() as u32 }
     }
 
     type MemSize = u8;