split peri_address

Author: burrbull

src/i2c.rs

@@ -108,6 +108,16 @@ pub trait Instance:
 {
     #[doc(hidden)]
     fn ptr() -> *const i2c1::RegisterBlock;
+    #[doc(hidden)]
+    #[inline(always)]
+    fn tx_peri_address() -> u32 {
+        unsafe { (*Self::ptr()).dr().as_ptr() as u32 }
+    }
+    #[doc(hidden)]
+    #[inline(always)]
+    fn rx_peri_address() -> u32 {
+        unsafe { (*Self::ptr()).dr().as_ptr() as u32 }
+    }
 }
 
 // Implemented by all I2C instances

src/i2c/dma.rs

@@ -902,7 +902,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 }
+        I2C::rx_peri_address()
     }
 
     type MemSize = u8;
@@ -911,7 +911,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 }
+        I2C::tx_peri_address()
     }
 
     type MemSize = u8;

src/serial.rs

@@ -277,10 +277,6 @@ macro_rules! halUsart {
                 });
             }
 
-            fn peri_address() -> u32 {
-                unsafe { (*(<$USART>::ptr() as *const Self::RegisterBlock)).peri_address() }
-            }
-
             unsafe fn steal() -> Self {
                 Self::steal()
             }

src/serial/dma.rs

@@ -594,7 +594,7 @@ where
 {
     #[inline(always)]
     fn address(&self) -> u32 {
-        <Serial_ as Instance>::peri_address()
+        <Serial_ as Instance>::rx_peri_address()
     }
 
     type MemSize = u8;
@@ -606,7 +606,7 @@ where
 {
     #[inline(always)]
     fn address(&self) -> u32 {
-        <Serial_ as Instance>::peri_address()
+        <Serial_ as Instance>::tx_peri_address()
     }
 
     type MemSize = u8;

src/serial/uart_impls.rs

@@ -37,7 +37,15 @@ pub trait Instance:
     #[doc(hidden)]
     fn set_stopbits(&self, bits: config::StopBits);
     #[doc(hidden)]
-    fn peri_address() -> u32;
+    #[inline(always)]
+    fn tx_peri_address() -> u32 {
+        unsafe { &*Self::ptr() }.tx_peri_address()
+    }
+    #[doc(hidden)]
+    #[inline(always)]
+    fn rx_peri_address() -> u32 {
+        unsafe { &*Self::ptr() }.rx_peri_address()
+    }
     #[doc(hidden)]
     unsafe fn steal() -> Self;
 }
@@ -144,8 +152,11 @@ pub trait RegisterBlockImpl: crate::Sealed {
         self.listen_event(Some(Event::TxEmpty.into()), None)
     }
 
-    // PeriAddress
-    fn peri_address(&self) -> u32;
+    // PeriAddress for transfer data
+    fn tx_peri_address(&self) -> u32;
+
+    // PeriAddress for receive data
+    fn rx_peri_address(&self) -> u32;
 }
 
 macro_rules! uartCommon {
@@ -257,7 +268,11 @@ macro_rules! uartCommon {
             });
         }
 
-        fn peri_address(&self) -> u32 {
+        fn tx_peri_address(&self) -> u32 {
+            self.dr().as_ptr() as u32
+        }
+
+        fn rx_peri_address(&self) -> u32 {
             self.dr().as_ptr() as u32
         }
     };
@@ -706,7 +721,7 @@ impl<UART: Instance, WORD> Serial<UART, WORD> {
 unsafe impl<UART: Instance> PeriAddress for Rx<UART, u8> {
     #[inline(always)]
     fn address(&self) -> u32 {
-        self.usart.peri_address()
+        self.usart.rx_peri_address()
     }
 
     type MemSize = u8;
@@ -722,7 +737,7 @@ where
 unsafe impl<UART: Instance> PeriAddress for Tx<UART, u8> {
     #[inline(always)]
     fn address(&self) -> u32 {
-        self.usart.peri_address()
+        self.usart.tx_peri_address()
     }
 
     type MemSize = u8;

src/spi.rs

@@ -204,6 +204,11 @@ pub trait Instance:
 {
     #[doc(hidden)]
     fn ptr() -> *const spi1::RegisterBlock;
+    #[doc(hidden)]
+    #[inline(always)]
+    fn peri_address() -> u32 {
+        unsafe { &*Self::ptr() }.dr().as_ptr() as u32
+    }
 }
 
 // Implemented by all SPI instances
@@ -900,7 +905,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 }
+        SPI::peri_address()
     }
 
     type MemSize = u8;
@@ -914,7 +919,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 }
+        SPI::peri_address()
     }
 
     type MemSize = u8;

src/uart.rs

@@ -52,10 +52,6 @@ macro_rules! halUart {
                 });
             }
 
-            fn peri_address() -> u32 {
-                unsafe { (*Self::ptr()).peri_address() }
-            }
-
             unsafe fn steal() -> Self {
                 Self::steal()
             }